osmo-gsm-tester[master]: jenkins: fix: recent change broke jenkins build
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3022 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6aca4c53a796312248a189b815dfc1198a173ed9 Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Neels HofmeyrGerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: No
[MERGED] osmo-gsm-tester[master]: jenkins: fix: recent change broke jenkins build
Neels Hofmeyr has submitted this change and it was merged. Change subject: jenkins: fix: recent change broke jenkins build .. jenkins: fix: recent change broke jenkins build Recent commit 851802b927ccfcb061a2774fdc5de12141426b5c introduces a build branch, which works fine, but only on the first run. A second run in the same repos can't delete the branch git is currently on. I've had enough of git being impossibly difficult in UI to simply checkout a hash or a branch now. Completely wipe out the git repository and clone a fresh one every time. Unfortunately, 'git clone -b' doesn't allow passing a commit hash, so we still need to do a clone-then-checkout dance. At least now we know it will work the same on every run. Change-Id: I6aca4c53a796312248a189b815dfc1198a173ed9 --- M contrib/jenkins-build-common.sh 1 file changed, 6 insertions(+), 7 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/jenkins-build-common.sh b/contrib/jenkins-build-common.sh index 779f965..895cd63 100644 --- a/contrib/jenkins-build-common.sh +++ b/contrib/jenkins-build-common.sh @@ -73,18 +73,17 @@ fi cd "$base" - if [ ! -d "$repo" ]; then -git clone "$git_url/$repo" "$repo" - fi - cd "$repo" - git fetch origin + rm -rf "$repo" + git clone "$git_url/$repo" "$repo" - # Figure out whether we need to prepend origin/ to find branches in upstream + cd "$repo" + + # Figure out whether we need to prepend origin/ to find branches in upstream. + # Doing this allows using git hashes instead of a branch name. if git rev-parse "origin/$branch"; then branch="origin/$branch" fi - git branch -D build_branch || true git checkout -b build_branch "$branch" rm -rf * git reset --hard "$branch" -- To view, visit https://gerrit.osmocom.org/3022 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6aca4c53a796312248a189b815dfc1198a173ed9 Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Neels HofmeyrGerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr
[PATCH] osmo-gsm-tester[master]: jenkins: fix: recent change broke jenkins build
Review at https://gerrit.osmocom.org/3022 jenkins: fix: recent change broke jenkins build Recent commit 851802b927ccfcb061a2774fdc5de12141426b5c introduces a build branch, which works fine, but only on the first run. A second run in the same repos can't delete the branch git is currently on. I've had enough of git being impossibly difficult in UI to simply checkout a hash or a branch now. Completely wipe out the git repository and clone a fresh one every time. Unfortunately, 'git clone -b' doesn't allow passing a commit hash, so we still need to do a clone-then-checkout dance. At least now we know it will work the same on every run. Change-Id: I6aca4c53a796312248a189b815dfc1198a173ed9 --- M contrib/jenkins-build-common.sh 1 file changed, 6 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/22/3022/1 diff --git a/contrib/jenkins-build-common.sh b/contrib/jenkins-build-common.sh index 779f965..895cd63 100644 --- a/contrib/jenkins-build-common.sh +++ b/contrib/jenkins-build-common.sh @@ -73,18 +73,17 @@ fi cd "$base" - if [ ! -d "$repo" ]; then -git clone "$git_url/$repo" "$repo" - fi - cd "$repo" - git fetch origin + rm -rf "$repo" + git clone "$git_url/$repo" "$repo" - # Figure out whether we need to prepend origin/ to find branches in upstream + cd "$repo" + + # Figure out whether we need to prepend origin/ to find branches in upstream. + # Doing this allows using git hashes instead of a branch name. if git rev-parse "origin/$branch"; then branch="origin/$branch" fi - git branch -D build_branch || true git checkout -b build_branch "$branch" rm -rf * git reset --hard "$branch" -- To view, visit https://gerrit.osmocom.org/3022 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6aca4c53a796312248a189b815dfc1198a173ed9 Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr
[MERGED] osmo-gsm-tester[master]: jenkins-build-common.sh: cosmetic: clear repos a bit later
Neels Hofmeyr has submitted this change and it was merged. Change subject: jenkins-build-common.sh: cosmetic: clear repos a bit later .. jenkins-build-common.sh: cosmetic: clear repos a bit later If we rm -rf * and then checkout a branch, the log prints the entire file tree as deleted. Instead, rm just before the git reset --hard, which avoids the extra output. Change-Id: Ib5b28a82f05d941eae8f3a2f468ef1e9d67e6180 --- M contrib/jenkins-build-common.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/jenkins-build-common.sh b/contrib/jenkins-build-common.sh index 63e0ba8..779f965 100644 --- a/contrib/jenkins-build-common.sh +++ b/contrib/jenkins-build-common.sh @@ -77,7 +77,6 @@ git clone "$git_url/$repo" "$repo" fi cd "$repo" - rm -rf * git fetch origin # Figure out whether we need to prepend origin/ to find branches in upstream @@ -87,6 +86,7 @@ git branch -D build_branch || true git checkout -b build_branch "$branch" + rm -rf * git reset --hard "$branch" git rev-parse HEAD -- To view, visit https://gerrit.osmocom.org/3021 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib5b28a82f05d941eae8f3a2f468ef1e9d67e6180 Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Neels HofmeyrGerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr
osmo-gsm-tester[master]: jenkins-build-common.sh: cosmetic: clear repos a bit later
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3021 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib5b28a82f05d941eae8f3a2f468ef1e9d67e6180 Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Neels HofmeyrGerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: No
[PATCH] osmo-gsm-tester[master]: jenkins-build-common.sh: cosmetic: clear repos a bit later
Review at https://gerrit.osmocom.org/3021 jenkins-build-common.sh: cosmetic: clear repos a bit later If we rm -rf * and then checkout a branch, the log prints the entire file tree as deleted. Instead, rm just before the git reset --hard, which avoids the extra output. Change-Id: Ib5b28a82f05d941eae8f3a2f468ef1e9d67e6180 --- M contrib/jenkins-build-common.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/21/3021/1 diff --git a/contrib/jenkins-build-common.sh b/contrib/jenkins-build-common.sh index 63e0ba8..779f965 100644 --- a/contrib/jenkins-build-common.sh +++ b/contrib/jenkins-build-common.sh @@ -77,7 +77,6 @@ git clone "$git_url/$repo" "$repo" fi cd "$repo" - rm -rf * git fetch origin # Figure out whether we need to prepend origin/ to find branches in upstream @@ -87,6 +86,7 @@ git branch -D build_branch || true git checkout -b build_branch "$branch" + rm -rf * git reset --hard "$branch" git rev-parse HEAD -- To view, visit https://gerrit.osmocom.org/3021 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib5b28a82f05d941eae8f3a2f468ef1e9d67e6180 Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr
[MERGED] osmo-gsm-tester[master]: jenkins-build-common.sh: fix being stuck on branch
Neels Hofmeyr has submitted this change and it was merged. Change subject: jenkins-build-common.sh: fix being stuck on branch .. jenkins-build-common.sh: fix being stuck on branch It's hard to allow both branch names and git hashes. For a branch, we want to prepend 'origin' to use the upstream branch. For a git hash, we don't. We so far prepend 'origin/' if the current branch name doesn't resolve, but that's not enough. If a local 'master' branch exists, we would stay on that branch instead of origin/master. Rather, prepend 'origin/' if 'origin/$branch' exists. Git hashes should not exist as 'origin/123abc...' and used as-is, where branches from origin should be updated to upstream by prepending 'origin/'. Also create a local branch to build. Always force-remove the branch and re-create from the origin/name or git hash. Keep the reset --hard for paranoia. Change-Id: I2e610b357f8559c6b6ffb544eb0a952f04dd9f70 --- M contrib/jenkins-build-common.sh 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/jenkins-build-common.sh b/contrib/jenkins-build-common.sh index 921434d..63e0ba8 100644 --- a/contrib/jenkins-build-common.sh +++ b/contrib/jenkins-build-common.sh @@ -81,10 +81,12 @@ git fetch origin # Figure out whether we need to prepend origin/ to find branches in upstream - if ! git rev-parse "$branch"; then + if git rev-parse "origin/$branch"; then branch="origin/$branch" fi + git branch -D build_branch || true + git checkout -b build_branch "$branch" git reset --hard "$branch" git rev-parse HEAD -- To view, visit https://gerrit.osmocom.org/3020 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2e610b357f8559c6b6ffb544eb0a952f04dd9f70 Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Neels HofmeyrGerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr
osmo-gsm-tester[master]: jenkins-build-common.sh: fix being stuck on branch
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3020 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I2e610b357f8559c6b6ffb544eb0a952f04dd9f70 Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Neels HofmeyrGerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: No
[PATCH] osmo-gsm-tester[master]: jenkins-build-common.sh: fix being stuck on branch
Review at https://gerrit.osmocom.org/3020 jenkins-build-common.sh: fix being stuck on branch It's hard to allow both branch names and git hashes. For a branch, we want to prepend 'origin' to use the upstream branch. For a git hash, we don't. We so far prepend 'origin/' if the current branch name doesn't resolve, but that's not enough. If a local 'master' branch exists, we would stay on that branch instead of origin/master. Rather, prepend 'origin/' if 'origin/$branch' exists. Git hashes should not exist as 'origin/123abc...' and used as-is, where branches from origin should be updated to upstream by prepending 'origin/'. Also create a local branch to build. Always force-remove the branch and re-create from the origin/name or git hash. Keep the reset --hard for paranoia. Change-Id: I2e610b357f8559c6b6ffb544eb0a952f04dd9f70 --- M contrib/jenkins-build-common.sh 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/20/3020/1 diff --git a/contrib/jenkins-build-common.sh b/contrib/jenkins-build-common.sh index 921434d..63e0ba8 100644 --- a/contrib/jenkins-build-common.sh +++ b/contrib/jenkins-build-common.sh @@ -81,10 +81,12 @@ git fetch origin # Figure out whether we need to prepend origin/ to find branches in upstream - if ! git rev-parse "$branch"; then + if git rev-parse "origin/$branch"; then branch="origin/$branch" fi + git branch -D build_branch || true + git checkout -b build_branch "$branch" git reset --hard "$branch" git rev-parse HEAD -- To view, visit https://gerrit.osmocom.org/3020 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2e610b357f8559c6b6ffb544eb0a952f04dd9f70 Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr
osmo-gsm-tester[master]: jenkins: aoip: move to libosmocore master
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3018 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I31f627f24e0e111c2c3461dbdc88f0e54ebf0c8c Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Neels HofmeyrGerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: No
[MERGED] osmo-gsm-tester[master]: jenkins: aoip: move to libosmocore master
Neels Hofmeyr has submitted this change and it was merged. Change subject: jenkins: aoip: move to libosmocore master .. jenkins: aoip: move to libosmocore master The patches needed for AoIP have now been merged to libosmocore master. Change-Id: I31f627f24e0e111c2c3461dbdc88f0e54ebf0c8c --- M contrib/jenkins-build-osmo-msc.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/jenkins-build-osmo-msc.sh b/contrib/jenkins-build-osmo-msc.sh index 5241966..53a23fe 100755 --- a/contrib/jenkins-build-osmo-msc.sh +++ b/contrib/jenkins-build-osmo-msc.sh @@ -4,7 +4,7 @@ name="osmo-msc" . "$(dirname "$0")/jenkins-build-common.sh" -build_repo libosmocore neels/aoip # TEMPORARY BRANCH +build_repo libosmocore build_repo libosmo-abis build_repo libosmo-netif build_repo openggsn -- To view, visit https://gerrit.osmocom.org/3018 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I31f627f24e0e111c2c3461dbdc88f0e54ebf0c8c Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Neels HofmeyrGerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr
[MERGED] libosmocore[master]: fix map entry for gsm0808_speech_codec_from_chan_type
Neels Hofmeyr has submitted this change and it was merged. Change subject: fix map entry for gsm0808_speech_codec_from_chan_type .. fix map entry for gsm0808_speech_codec_from_chan_type Recent commit 884ba0f2bcaf385cabee0b4228a2598d61fa406b adds function gsm0808_chan_type_to_speech_codec() but adds a mismatching name in libosmogsm.map. openbsc.git's aoip branch can't build with this. This must have been an on-the-fly rename that wasn't properly tested. Always test your patches! Change-Id: I68feb14f7bcb2f62b89f9b2d8c085d6824b493bc --- M src/gsm/libosmogsm.map 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 2da8649..e992a4f 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -163,7 +163,7 @@ gsm0808_enc_cell_id_list; gsm0808_dec_cell_id_list; gsm0808_chan_type_to_speech_codec; -gsm0808_extrapolate_speech_codec; +gsm0808_speech_codec_from_chan_type; gsm0858_rsl_ul_meas_enc; -- To view, visit https://gerrit.osmocom.org/3017 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I68feb14f7bcb2f62b89f9b2d8c085d6824b493bc Gerrit-PatchSet: 2 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Neels HofmeyrGerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr
[MERGED] libosmocore[master]: fix map entry and .h declaration for gsm0808_chan_type_to_sp...
Neels Hofmeyr has submitted this change and it was merged. Change subject: fix map entry and .h declaration for gsm0808_chan_type_to_speech_codec() .. fix map entry and .h declaration for gsm0808_chan_type_to_speech_codec() Recent commit 3149b0d076477303a38df735fe579b1b06ee17b2 adds function gsm0808_chan_type_to_speech_codec() but adds a completely mismatching name in libosmogsm.map, as well as a definition with a typo in the name. Fix the entry in libosmogsm.map. Add the missing 'c' in gsm0808_utils.h Change-Id: I5a621fa5ef6b632eabbe224f3dd383eacaffb695 --- M include/osmocom/gsm/gsm0808_utils.h M src/gsm/libosmogsm.map 2 files changed, 2 insertions(+), 2 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/gsm/gsm0808_utils.h b/include/osmocom/gsm/gsm0808_utils.h index 57ba171..17a03f5 100644 --- a/include/osmocom/gsm/gsm0808_utils.h +++ b/include/osmocom/gsm/gsm0808_utils.h @@ -50,6 +50,6 @@ const struct gsm0808_cell_id_list *cil); int gsm0808_dec_cell_id_list(struct gsm0808_cell_id_list *cil, const uint8_t *elem, uint8_t len); -int gsm0808_chan_type_to_speech_code(uint8_t perm_spch); +int gsm0808_chan_type_to_speech_codec(uint8_t perm_spch); int gsm0808_speech_codec_from_chan_type(struct gsm0808_speech_codec *sc, uint8_t perm_spch); diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 36cba39..2da8649 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -162,7 +162,7 @@ gsm0808_dec_encrypt_info; gsm0808_enc_cell_id_list; gsm0808_dec_cell_id_list; -gsm0808_convert_to_speech_codec_type; +gsm0808_chan_type_to_speech_codec; gsm0808_extrapolate_speech_codec; gsm0858_rsl_ul_meas_enc; -- To view, visit https://gerrit.osmocom.org/3016 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5a621fa5ef6b632eabbe224f3dd383eacaffb695 Gerrit-PatchSet: 2 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Neels HofmeyrGerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr
libosmocore[master]: fix map entry for gsm0808_speech_codec_from_chan_type
Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3017 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I68feb14f7bcb2f62b89f9b2d8c085d6824b493bc Gerrit-PatchSet: 2 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Neels HofmeyrGerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: No
libosmocore[master]: fix map entry and .h declaration for gsm0808_chan_type_to_sp...
Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3016 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I5a621fa5ef6b632eabbe224f3dd383eacaffb695 Gerrit-PatchSet: 2 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Neels HofmeyrGerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: No
[MERGED] libosmo-sccp[master]: fix sanitize make check: xua_test: initialize gt_out.
Neels Hofmeyr has submitted this change and it was merged. Change subject: fix sanitize make check: xua_test: initialize gt_out. .. fix sanitize make check: xua_test: initialize gt_out. The sanitize build fails because gt_out is not initialized to zero, but is later mem-compared to a zero-initialized struct. Zero-initialize gt_out. Also print in the test output both byte dumps. It helped to figure out the test failure and might as well stay. Change-Id: Ice8ee9c2a6bde4924f3ae6d95aa9268ebef9f070 --- M tests/xua/xua_test.c M tests/xua/xua_test.ok 2 files changed, 5 insertions(+), 1 deletion(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/xua/xua_test.c b/tests/xua/xua_test.c index da3ee95..4af0836 100644 --- a/tests/xua/xua_test.c +++ b/tests/xua/xua_test.c @@ -151,10 +151,11 @@ { struct msgb *msg = msgb_alloc(1024, "foo"); const struct osmo_sccp_gt *gt_in = _addr_testcases[0].expected.gt; - struct osmo_sccp_gt gt_out; + struct osmo_sccp_gt gt_out = {}; printf("Testing Decoded GT -> SUA encoding\n"); printf("IN: %s\n", osmo_sccp_gt_dump(gt_in)); + printf("%s\n", osmo_hexdump_nospc(gt_in, sizeof(struct osmo_sccp_gt))); /* encode sccp_addr to SUA GT */ xua_part_add_gt(msg, gt_in); @@ -167,6 +168,7 @@ /* parse + compare */ sua_parse_gt(_out, msgb_data(msg), msgb_length(msg)); printf("OUT:%s\n", osmo_sccp_gt_dump(_out)); + printf("%s\n", osmo_hexdump_nospc(_out, sizeof(struct osmo_sccp_gt))); OSMO_ASSERT(!memcmp(gt_in, _out, sizeof(gt_out))); msgb_free(msg); diff --git a/tests/xua/xua_test.ok b/tests/xua/xua_test.ok index 2184902..ca8572a 100644 --- a/tests/xua/xua_test.ok +++ b/tests/xua/xua_test.ok @@ -11,7 +11,9 @@ parsed: RI=7,SSN=254,GTI=0 Testing Decoded GT -> SUA encoding IN: TT=0,NPL=1,NAI=4,DIG=919969679389 + 040001000400393139393639363739333839 OUT:TT=0,NPL=1,NAI=4,DIG=919969679389 + 040001000400393139393639363739333839 => BSSMAP-RESET SCCP Input: [L2]> 09 00 03 05 07 02 42 fe 02 42 fe 06 00 04 30 04 01 20 -- To view, visit https://gerrit.osmocom.org/3019 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ice8ee9c2a6bde4924f3ae6d95aa9268ebef9f070 Gerrit-PatchSet: 1 Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Owner: Neels HofmeyrGerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr
libosmo-sccp[master]: fix sanitize make check: xua_test: initialize gt_out.
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3019 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ice8ee9c2a6bde4924f3ae6d95aa9268ebef9f070 Gerrit-PatchSet: 1 Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Owner: Neels HofmeyrGerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: No
[PATCH] libosmo-sccp[master]: fix sanitize make check: xua_test: initialize gt_out.
Review at https://gerrit.osmocom.org/3019 fix sanitize make check: xua_test: initialize gt_out. The sanitize build fails because gt_out is not initialized to zero, but is later mem-compared to a zero-initialized struct. Zero-initialize gt_out. Also print in the test output both byte dumps. It helped to figure out the test failure and might as well stay. Change-Id: Ice8ee9c2a6bde4924f3ae6d95aa9268ebef9f070 --- M tests/xua/xua_test.c M tests/xua/xua_test.ok 2 files changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/19/3019/1 diff --git a/tests/xua/xua_test.c b/tests/xua/xua_test.c index da3ee95..4af0836 100644 --- a/tests/xua/xua_test.c +++ b/tests/xua/xua_test.c @@ -151,10 +151,11 @@ { struct msgb *msg = msgb_alloc(1024, "foo"); const struct osmo_sccp_gt *gt_in = _addr_testcases[0].expected.gt; - struct osmo_sccp_gt gt_out; + struct osmo_sccp_gt gt_out = {}; printf("Testing Decoded GT -> SUA encoding\n"); printf("IN: %s\n", osmo_sccp_gt_dump(gt_in)); + printf("%s\n", osmo_hexdump_nospc(gt_in, sizeof(struct osmo_sccp_gt))); /* encode sccp_addr to SUA GT */ xua_part_add_gt(msg, gt_in); @@ -167,6 +168,7 @@ /* parse + compare */ sua_parse_gt(_out, msgb_data(msg), msgb_length(msg)); printf("OUT:%s\n", osmo_sccp_gt_dump(_out)); + printf("%s\n", osmo_hexdump_nospc(_out, sizeof(struct osmo_sccp_gt))); OSMO_ASSERT(!memcmp(gt_in, _out, sizeof(gt_out))); msgb_free(msg); diff --git a/tests/xua/xua_test.ok b/tests/xua/xua_test.ok index 2184902..ca8572a 100644 --- a/tests/xua/xua_test.ok +++ b/tests/xua/xua_test.ok @@ -11,7 +11,9 @@ parsed: RI=7,SSN=254,GTI=0 Testing Decoded GT -> SUA encoding IN: TT=0,NPL=1,NAI=4,DIG=919969679389 + 040001000400393139393639363739333839 OUT:TT=0,NPL=1,NAI=4,DIG=919969679389 + 040001000400393139393639363739333839 => BSSMAP-RESET SCCP Input: [L2]> 09 00 03 05 07 02 42 fe 02 42 fe 06 00 04 30 04 01 20 -- To view, visit https://gerrit.osmocom.org/3019 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ice8ee9c2a6bde4924f3ae6d95aa9268ebef9f070 Gerrit-PatchSet: 1 Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr
[PATCH] libosmocore[master]: fix map entry and .h declaration for gsm0808_chan_type_to_sp...
fix map entry and .h declaration for gsm0808_chan_type_to_speech_codec() Recent commit 3149b0d076477303a38df735fe579b1b06ee17b2 adds function gsm0808_chan_type_to_speech_codec() but adds a completely mismatching name in libosmogsm.map, as well as a definition with a typo in the name. Fix the entry in libosmogsm.map. Add the missing 'c' in gsm0808_utils.h Change-Id: I5a621fa5ef6b632eabbe224f3dd383eacaffb695 --- M include/osmocom/gsm/gsm0808_utils.h M src/gsm/libosmogsm.map 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/16/3016/2 diff --git a/include/osmocom/gsm/gsm0808_utils.h b/include/osmocom/gsm/gsm0808_utils.h index 57ba171..17a03f5 100644 --- a/include/osmocom/gsm/gsm0808_utils.h +++ b/include/osmocom/gsm/gsm0808_utils.h @@ -50,6 +50,6 @@ const struct gsm0808_cell_id_list *cil); int gsm0808_dec_cell_id_list(struct gsm0808_cell_id_list *cil, const uint8_t *elem, uint8_t len); -int gsm0808_chan_type_to_speech_code(uint8_t perm_spch); +int gsm0808_chan_type_to_speech_codec(uint8_t perm_spch); int gsm0808_speech_codec_from_chan_type(struct gsm0808_speech_codec *sc, uint8_t perm_spch); diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 36cba39..2da8649 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -162,7 +162,7 @@ gsm0808_dec_encrypt_info; gsm0808_enc_cell_id_list; gsm0808_dec_cell_id_list; -gsm0808_convert_to_speech_codec_type; +gsm0808_chan_type_to_speech_codec; gsm0808_extrapolate_speech_codec; gsm0858_rsl_ul_meas_enc; -- To view, visit https://gerrit.osmocom.org/3016 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I5a621fa5ef6b632eabbe224f3dd383eacaffb695 Gerrit-PatchSet: 2 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Neels HofmeyrGerrit-Reviewer: Jenkins Builder
[PATCH] libosmocore[master]: fix map entry for gsm0808_speech_codec_from_chan_type
Review at https://gerrit.osmocom.org/3017 fix map entry for gsm0808_speech_codec_from_chan_type Recent commit 884ba0f2bcaf385cabee0b4228a2598d61fa406b adds function gsm0808_chan_type_to_speech_codec() but adds a mismatching name in libosmogsm.map. openbsc.git's aoip branch can't build with this. This must have been an on-the-fly rename that wasn't properly tested. Always test your patches! Change-Id: I68feb14f7bcb2f62b89f9b2d8c085d6824b493bc --- M src/gsm/libosmogsm.map 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/17/3017/1 diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 2da8649..e992a4f 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -163,7 +163,7 @@ gsm0808_enc_cell_id_list; gsm0808_dec_cell_id_list; gsm0808_chan_type_to_speech_codec; -gsm0808_extrapolate_speech_codec; +gsm0808_speech_codec_from_chan_type; gsm0858_rsl_ul_meas_enc; -- To view, visit https://gerrit.osmocom.org/3017 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I68feb14f7bcb2f62b89f9b2d8c085d6824b493bc Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr
[PATCH] libosmocore[master]: fix map entry for gsm0808_chan_type_to_speech_codec
Review at https://gerrit.osmocom.org/3016 fix map entry for gsm0808_chan_type_to_speech_codec Recent commit 3149b0d076477303a38df735fe579b1b06ee17b2 adds function gsm0808_chan_type_to_speech_codec() but adds a mismatching name in libosmogsm.map. Change-Id: I5a621fa5ef6b632eabbe224f3dd383eacaffb695 --- M src/gsm/libosmogsm.map 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/16/3016/1 diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 36cba39..2da8649 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -162,7 +162,7 @@ gsm0808_dec_encrypt_info; gsm0808_enc_cell_id_list; gsm0808_dec_cell_id_list; -gsm0808_convert_to_speech_codec_type; +gsm0808_chan_type_to_speech_codec; gsm0808_extrapolate_speech_codec; gsm0858_rsl_ul_meas_enc; -- To view, visit https://gerrit.osmocom.org/3016 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5a621fa5ef6b632eabbe224f3dd383eacaffb695 Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr
[MERGED] libosmocore[master]: doxygen: unify use of \file across the board
Neels Hofmeyr has submitted this change and it was merged. Change subject: doxygen: unify use of \file across the board .. doxygen: unify use of \file across the board Considering the various styles and implications found in the sources, edit scores of files to follow the same API doc guidelines around the doxygen grouping and the \file tag. Many files now show a short description in the generated API doc that was so far only available as C comment. The guidelines and reasoning behind it is documented at https://osmocom.org/projects/cellular-infrastructure/wiki/Guidelines_for_API_documentation In some instances, remove file comments and add to the corresponding group instead, to be shared among several files (e.g. bitvec). Change-Id: Ifa70e77e90462b5eb2b0457c70fd25275910c72b --- M include/osmocom/codec/codec.h M include/osmocom/coding/gsm0503_coding.h M include/osmocom/coding/gsm0503_interleaving.h M include/osmocom/coding/gsm0503_mapping.h M include/osmocom/coding/gsm0503_parity.h M include/osmocom/coding/gsm0503_tables.h M include/osmocom/core/backtrace.h M include/osmocom/core/bitcomp.h M include/osmocom/core/bits.h M include/osmocom/core/bitvec.h M include/osmocom/core/byteswap.h M include/osmocom/core/conv.h M include/osmocom/core/crc16.h M include/osmocom/core/crcXXgen.h.tpl M include/osmocom/core/crcgen.h M include/osmocom/core/defs.h M include/osmocom/core/endian.h M include/osmocom/core/fsm.h M include/osmocom/core/gsmtap.h M include/osmocom/core/gsmtap_util.h M include/osmocom/core/linuxlist.h M include/osmocom/core/logging.h M include/osmocom/core/loggingrb.h M include/osmocom/core/macaddr.h M include/osmocom/core/msgb.h M include/osmocom/core/msgfile.h M include/osmocom/core/panic.h M include/osmocom/core/plugin.h M include/osmocom/core/prim.h M include/osmocom/core/process.h M include/osmocom/core/rate_ctr.h M include/osmocom/core/select.h M include/osmocom/core/sercomm.h M include/osmocom/core/serial.h M include/osmocom/core/signal.h M include/osmocom/core/socket.h M include/osmocom/core/stat_item.h M include/osmocom/core/stats.h M include/osmocom/core/strrb.h M include/osmocom/core/talloc.h M include/osmocom/core/timer.h M include/osmocom/core/timer_compat.h M include/osmocom/core/utils.h M include/osmocom/core/write_queue.h M include/osmocom/crypt/auth.h M include/osmocom/crypt/gprs_cipher.h M include/osmocom/ctrl/control_cmd.h M include/osmocom/ctrl/control_if.h M include/osmocom/ctrl/control_vty.h M include/osmocom/ctrl/ports.h M include/osmocom/gprs/gprs_bssgp.h M include/osmocom/gprs/gprs_bssgp_bss.h M include/osmocom/gprs/gprs_msgb.h M include/osmocom/gprs/gprs_ns.h M include/osmocom/gprs/gprs_ns_frgre.h M include/osmocom/gprs/gprs_rlc.h M include/osmocom/gprs/protocol/gsm_04_60.h M include/osmocom/gprs/protocol/gsm_08_16.h M include/osmocom/gprs/protocol/gsm_08_18.h M include/osmocom/gsm/a5.h M include/osmocom/gsm/abis_nm.h M include/osmocom/gsm/apn.h M include/osmocom/gsm/bitvec_gsm.h M include/osmocom/gsm/comp128.h M include/osmocom/gsm/comp128v23.h M include/osmocom/gsm/gan.h M include/osmocom/gsm/gea.h M include/osmocom/gsm/gsm0341.h M include/osmocom/gsm/gsm0411_smc.h M include/osmocom/gsm/gsm0411_smr.h M include/osmocom/gsm/gsm0411_utils.h M include/osmocom/gsm/gsm0480.h M include/osmocom/gsm/gsm0502.h M include/osmocom/gsm/gsm0808.h M include/osmocom/gsm/gsm0808_utils.h M include/osmocom/gsm/gsm23003.h M include/osmocom/gsm/gsm48.h M include/osmocom/gsm/gsm48_ie.h M include/osmocom/gsm/gsm_utils.h M include/osmocom/gsm/gsup.h M include/osmocom/gsm/ipa.h M include/osmocom/gsm/kasumi.h M include/osmocom/gsm/l1sap.h M include/osmocom/gsm/lapd_core.h M include/osmocom/gsm/lapdm.h M include/osmocom/gsm/meas_rep.h M include/osmocom/gsm/mncc.h M include/osmocom/gsm/oap.h M include/osmocom/gsm/prim.h M include/osmocom/gsm/protocol/gsm_03_40.h M include/osmocom/gsm/protocol/gsm_03_41.h M include/osmocom/gsm/protocol/gsm_04_08.h M include/osmocom/gsm/protocol/gsm_04_08_gprs.h M include/osmocom/gsm/protocol/gsm_04_11.h M include/osmocom/gsm/protocol/gsm_04_12.h M include/osmocom/gsm/protocol/gsm_04_14.h M include/osmocom/gsm/protocol/gsm_04_80.h M include/osmocom/gsm/protocol/gsm_08_58.h M include/osmocom/gsm/protocol/gsm_09_02.h M include/osmocom/gsm/protocol/gsm_12_21.h M include/osmocom/gsm/protocol/gsm_23_003.h M include/osmocom/gsm/protocol/gsm_44_318.h M include/osmocom/gsm/protocol/ipaccess.h M include/osmocom/gsm/protocol/smpp34_osmocom.h M include/osmocom/gsm/rsl.h M include/osmocom/gsm/rxlev_stat.h M include/osmocom/gsm/sysinfo.h M include/osmocom/gsm/tlv.h M include/osmocom/sim/class_tables.h M include/osmocom/sim/sim.h M include/osmocom/vty/buffer.h M include/osmocom/vty/command.h M include/osmocom/vty/logging.h M include/osmocom/vty/misc.h M include/osmocom/vty/ports.h M include/osmocom/vty/stats.h M include/osmocom/vty/telnet_interface.h M include/osmocom/vty/vector.h M include/osmocom/vty/vty.h M
[MERGED] libosmocore[master]: doxygen: various fixes in core/timer.h
Neels Hofmeyr has submitted this change and it was merged. Change subject: doxygen: various fixes in core/timer.h .. doxygen: various fixes in core/timer.h Move a longish comment to the timer group so that it appears in the API doc. Un-doxygen some floating comments that were associated with unrelated code items ('/**' --> '/*'). Add braces to some function names so that the API doc will render as reference links. Change-Id: I3ea5b88cbe9cb54702429158bf47e768e04e8fe7 --- M include/osmocom/core/timer.h 1 file changed, 16 insertions(+), 19 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/core/timer.h b/include/osmocom/core/timer.h index 28785db..a039ac8 100644 --- a/include/osmocom/core/timer.h +++ b/include/osmocom/core/timer.h @@ -19,11 +19,24 @@ */ /*! \defgroup timer Osmocom timers + * Timer management: + * - Create a struct osmo_timer_list + * - Fill out timeout and use osmo_timer_add(), or + *use osmo_timer_schedule() to schedule a timer in + *x seconds and microseconds from now... + * - Use osmo_timer_del() to remove the timer + * + * Internally: + * - We hook into select.c to give a timeval of the + *nearest timer. On already passed timers we give + *it a 0 to immediately fire after the select + * - osmo_timers_update() will call the callbacks and + *remove the timers. * @{ */ /*! \file timer.h - * Osmocom timer handling routines + * Osmocom timer handling routines. */ #pragma once @@ -34,22 +47,6 @@ #include #include -/** - * Timer management: - * - Create a struct osmo_timer_list - * - Fill out timeout and use add_timer or - *use osmo_timer_schedule to schedule a timer in - *x seconds and microseconds from now... - * - Use osmo_timer_del to remove the timer - * - * Internally: - * - We hook into select.c to give a timeval of the - *nearest timer. On already passed timers we give - *it a 0 to immediately fire after the select - * - osmo_timers_update will call the callbacks and - *remove the timers. - * - */ /*! A structure representing a single instance of a timer */ struct osmo_timer_list { struct rb_node node; /*!< rb-tree node header */ @@ -61,7 +58,7 @@ void *data; /*!< user data for callback */ }; -/** +/* * timer management */ @@ -88,7 +85,7 @@ int osmo_gettimeofday(struct timeval *tv, struct timezone *tz); -/** +/* * timer override */ -- To view, visit https://gerrit.osmocom.org/2986 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3ea5b88cbe9cb54702429158bf47e768e04e8fe7 Gerrit-PatchSet: 4 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Neels HofmeyrGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr
[MERGED] libosmocore[master]: doxygen: include all undocumented items in the API doc
Neels Hofmeyr has submitted this change and it was merged. Change subject: doxygen: include all undocumented items in the API doc .. doxygen: include all undocumented items in the API doc Currently, files that omit the \file directive and all functions, enums, structs lacking a doxygen style comment are completely missing from the doxygen API docs. Set EXTRACT_ALL = YES so that all files and code items are at least listed in the doxygen API. Change-Id: I39f558ec0a33a61a1fcec0554f53c8e7668733de --- M Doxyfile.codec.in M Doxyfile.coding.in M Doxyfile.core.in M Doxyfile.gsm.in M Doxyfile.vty.in 5 files changed, 5 insertions(+), 5 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/Doxyfile.codec.in b/Doxyfile.codec.in index 8435379..b826a36 100644 --- a/Doxyfile.codec.in +++ b/Doxyfile.codec.in @@ -318,7 +318,7 @@ # Private class members and static file members will be hidden unless # the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES -EXTRACT_ALL= NO +EXTRACT_ALL= YES # If the EXTRACT_PRIVATE tag is set to YES all private members of a class # will be included in the documentation. diff --git a/Doxyfile.coding.in b/Doxyfile.coding.in index 28e3241..7c1a28e 100644 --- a/Doxyfile.coding.in +++ b/Doxyfile.coding.in @@ -318,7 +318,7 @@ # Private class members and static file members will be hidden unless # the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES -EXTRACT_ALL= NO +EXTRACT_ALL= YES # If the EXTRACT_PRIVATE tag is set to YES all private members of a class # will be included in the documentation. diff --git a/Doxyfile.core.in b/Doxyfile.core.in index 58d35be..cc3d842 100644 --- a/Doxyfile.core.in +++ b/Doxyfile.core.in @@ -318,7 +318,7 @@ # Private class members and static file members will be hidden unless # the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES -EXTRACT_ALL= NO +EXTRACT_ALL= YES # If the EXTRACT_PRIVATE tag is set to YES all private members of a class # will be included in the documentation. diff --git a/Doxyfile.gsm.in b/Doxyfile.gsm.in index feaef0e..9673ea7 100644 --- a/Doxyfile.gsm.in +++ b/Doxyfile.gsm.in @@ -318,7 +318,7 @@ # Private class members and static file members will be hidden unless # the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES -EXTRACT_ALL= NO +EXTRACT_ALL= YES # If the EXTRACT_PRIVATE tag is set to YES all private members of a class # will be included in the documentation. diff --git a/Doxyfile.vty.in b/Doxyfile.vty.in index 073ee0c..204436f 100644 --- a/Doxyfile.vty.in +++ b/Doxyfile.vty.in @@ -318,7 +318,7 @@ # Private class members and static file members will be hidden unless # the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES -EXTRACT_ALL= NO +EXTRACT_ALL= YES # If the EXTRACT_PRIVATE tag is set to YES all private members of a class # will be included in the documentation. -- To view, visit https://gerrit.osmocom.org/2981 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I39f558ec0a33a61a1fcec0554f53c8e7668733de Gerrit-PatchSet: 4 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Neels HofmeyrGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr
[MERGED] libosmocore[master]: api doc typo fix in core/logging.h
Neels Hofmeyr has submitted this change and it was merged. Change subject: api doc typo fix in core/logging.h .. api doc typo fix in core/logging.h Change-Id: I3f1cd5b10e7beccb61f370d7f8fa2666e56542cf --- M include/osmocom/core/logging.h 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/core/logging.h b/include/osmocom/core/logging.h index 4721713..bb5aa42 100644 --- a/include/osmocom/core/logging.h +++ b/include/osmocom/core/logging.h @@ -108,7 +108,7 @@ #define DLM3UA -16 /*!< Osmocom M3UA */ #define OSMO_NUM_DLIB 16 /*!< Number of logging sub-systems in libraries */ -/*! Configuration of singgle log category / sub-system */ +/*! Configuration of single log category / sub-system */ struct log_category { uint8_t loglevel; /*!< configured log-level */ uint8_t enabled;/*!< is logging enabled? */ -- To view, visit https://gerrit.osmocom.org/2985 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3f1cd5b10e7beccb61f370d7f8fa2666e56542cf Gerrit-PatchSet: 4 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Neels HofmeyrGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr
[MERGED] libosmocore[master]: doxygen: enable AUTOBRIEF, drop \brief
Neels Hofmeyr has submitted this change and it was merged. Change subject: doxygen: enable AUTOBRIEF, drop \brief .. doxygen: enable AUTOBRIEF, drop \brief Especially for short descriptions, it is annoying to have to type \brief for every single API doc. Drop all \brief and enable the AUTOBRIEF feature of doxygen, which always takes the first sentence of an API doc as the brief description. Change-Id: I11a8a821b065a128108641a2a63fb5a2b1916e87 --- M Doxyfile.codec.in M Doxyfile.coding.in M Doxyfile.core.in M Doxyfile.gb.in M Doxyfile.gsm.in M Doxyfile.vty.in M include/osmocom/codec/codec.h M include/osmocom/coding/gsm0503_coding.h M include/osmocom/coding/gsm0503_interleaving.h M include/osmocom/coding/gsm0503_mapping.h M include/osmocom/coding/gsm0503_parity.h M include/osmocom/coding/gsm0503_tables.h M include/osmocom/core/application.h M include/osmocom/core/bitXXgen.h.tpl M include/osmocom/core/bitcomp.h M include/osmocom/core/bits.h M include/osmocom/core/bitvec.h M include/osmocom/core/byteswap.h M include/osmocom/core/conv.h M include/osmocom/core/crcXXgen.h.tpl M include/osmocom/core/defs.h M include/osmocom/core/fsm.h M include/osmocom/core/gsmtap.h M include/osmocom/core/gsmtap_util.h M include/osmocom/core/linuxlist.h M include/osmocom/core/logging.h M include/osmocom/core/msgb.h M include/osmocom/core/panic.h M include/osmocom/core/prim.h M include/osmocom/core/rate_ctr.h M include/osmocom/core/select.h M include/osmocom/core/sercomm.h M include/osmocom/core/signal.h M include/osmocom/core/socket.h M include/osmocom/core/stat_item.h M include/osmocom/core/statistics.h M include/osmocom/core/strrb.h M include/osmocom/core/timer.h M include/osmocom/core/timer_compat.h M include/osmocom/core/utils.h M include/osmocom/core/write_queue.h M include/osmocom/crypt/auth.h M include/osmocom/gprs/gprs_bssgp.h M include/osmocom/gprs/gprs_ns.h M include/osmocom/gprs/gprs_rlc.h M include/osmocom/gprs/protocol/gsm_08_16.h M include/osmocom/gprs/protocol/gsm_08_18.h M include/osmocom/gsm/a5.h M include/osmocom/gsm/abis_nm.h M include/osmocom/gsm/gsm_utils.h M include/osmocom/gsm/kasumi.h M include/osmocom/gsm/l1sap.h M include/osmocom/gsm/lapd_core.h M include/osmocom/gsm/lapdm.h M include/osmocom/gsm/oap.h M include/osmocom/gsm/protocol/gsm_04_08.h M include/osmocom/gsm/protocol/gsm_08_08.h M include/osmocom/gsm/protocol/gsm_08_58.h M include/osmocom/gsm/protocol/gsm_12_21.h M include/osmocom/gsm/rsl.h M include/osmocom/gsm/tlv.h M include/osmocom/sim/sim.h M include/osmocom/vty/command.h M include/osmocom/vty/telnet_interface.h M include/osmocom/vty/vty.h M src/application.c M src/backtrace.c M src/bitcomp.c M src/bits.c M src/bitvec.c M src/codec/gsm610.c M src/codec/gsm620.c M src/codec/gsm690.c M src/coding/gsm0503_coding.c M src/coding/gsm0503_interleaving.c M src/coding/gsm0503_mapping.c M src/coding/gsm0503_parity.c M src/coding/gsm0503_tables.c M src/conv.c M src/crc16.c M src/crcXXgen.c.tpl M src/ctrl/control_if.c M src/ctrl/fsm_ctrl_commands.c M src/fsm.c M src/gb/gprs_bssgp_bss.c M src/gb/gprs_ns.c M src/gsm/a5.c M src/gsm/abis_nm.c M src/gsm/auth_core.c M src/gsm/comp128.c M src/gsm/comp128v23.c M src/gsm/gan.c M src/gsm/gea.c M src/gsm/gprs_cipher_core.c M src/gsm/gprs_rlc.c M src/gsm/gsm0341.c M src/gsm/gsm0411_smc.c M src/gsm/gsm0411_utils.c M src/gsm/gsm0808.c M src/gsm/gsm0808_utils.c M src/gsm/gsm48.c M src/gsm/gsm48_ie.c M src/gsm/gsm_04_08_gprs.c M src/gsm/gsm_utils.c M src/gsm/gsup.c M src/gsm/ipa.c M src/gsm/lapd_core.c M src/gsm/lapdm.c M src/gsm/oap.c M src/gsm/rsl.c M src/gsm/sysinfo.c M src/gsm/tlv_parser.c M src/gsmtap_util.c M src/logging.c M src/logging_gsmtap.c M src/logging_syslog.c M src/loggingrb.c M src/macaddr.c M src/msgb.c M src/panic.c M src/plugin.c M src/prim.c M src/rate_ctr.c M src/select.c M src/sercomm.c M src/serial.c M src/signal.c M src/sim/core.c M src/socket.c M src/stat_item.c M src/strrb.c M src/timer.c M src/timer_gettimeofday.c M src/utils.c M src/vty/command.c M src/vty/fsm_vty.c M src/vty/logging_vty.c M src/vty/stats_vty.c M src/vty/telnet_interface.c M src/vty/utils.c M src/vty/vector.c M src/vty/vty.c M src/write_queue.c M utils/conv_gen.py 144 files changed, 1,572 insertions(+), 1,573 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified -- To view, visit https://gerrit.osmocom.org/2983 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I11a8a821b065a128108641a2a63fb5a2b1916e87 Gerrit-PatchSet: 4 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Neels HofmeyrGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr
[MERGED] libosmocore[master]: doxygen: add missing gb API doc generation
Neels Hofmeyr has submitted this change and it was merged. Change subject: doxygen: add missing gb API doc generation .. doxygen: add missing gb API doc generation Files in include/osmocom/gprs/ and src/gb/ are not included in any doxygen generated API docs. Add Doxyfile.gb.in and adjust configure.ac and Makefile.am. Change-Id: Ieb64f497f55368e396872083237c9ff28da2dd93 --- M .gitignore A Doxyfile.gb.in M Makefile.am M configure.ac 4 files changed, 1,730 insertions(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/.gitignore b/.gitignore index 89459f0..f26b699 100644 --- a/.gitignore +++ b/.gitignore @@ -38,6 +38,7 @@ Doxyfile.vty Doxyfile.codec Doxyfile.coding +Doxyfile.gb debian/autoreconf.after debian/autoreconf.before @@ -115,6 +116,7 @@ doc/vty/html doc/vty/doxygen_sqlite3.db doc/gsm +doc/gb doc/html.tar doc/*.tag tags diff --git a/Doxyfile.gb.in b/Doxyfile.gb.in new file mode 100644 index 000..36b4f2b --- /dev/null +++ b/Doxyfile.gb.in @@ -0,0 +1,1716 @@ +# Doxyfile 1.7.4 + +# This file describes the settings to be used by the documentation system +# doxygen (www.doxygen.org) for a project. +# +# All text after a hash (#) is considered a comment and will be ignored. +# The format is: +# TAG = value [value, ...] +# For lists items can also be appended using: +# TAG += value [value, ...] +# Values that contain spaces should be placed between quotes (" "). + +#--- +# Project related configuration options +#--- + +# This tag specifies the encoding used for all characters in the config file +# that follow. The default is UTF-8 which is also the encoding used for all +# text before the first occurrence of this tag. Doxygen uses libiconv (or the +# iconv built into libc) for the transcoding. See +# http://www.gnu.org/software/libiconv for the list of possible encodings. + +DOXYFILE_ENCODING = UTF-8 + +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded +# by quotes) that should identify the project. + +PROJECT_NAME = libosmogb + +# The PROJECT_NUMBER tag can be used to enter a project or revision number. +# This could be handy for archiving the generated documentation or +# if some version control system is used. + +PROJECT_NUMBER = @VERSION@ + +# Using the PROJECT_BRIEF tag one can provide an optional one line description +# for a project that appears at the top of each page and should give viewer +# a quick idea about the purpose of the project. Keep the description short. + +PROJECT_BRIEF = "Osmocom Gb library" + +# With the PROJECT_LOGO tag one can specify an logo or icon that is +# included in the documentation. The maximum height of the logo should not +# exceed 55 pixels and the maximum width should not exceed 200 pixels. +# Doxygen will copy the logo to the output directory. + +PROJECT_LOGO = + +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) +# base path where the generated documentation will be put. +# If a relative path is entered, it will be relative to the location +# where doxygen was started. If left blank the current directory will be used. + +OUTPUT_DIRECTORY = doc/gb + +# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create +# 4096 sub-directories (in 2 levels) under the output directory of each output +# format and will distribute the generated files over these directories. +# Enabling this option can be useful when feeding doxygen a huge amount of +# source files, where putting all generated files in the same directory would +# otherwise cause performance problems for the file system. + +CREATE_SUBDIRS = NO + +# The OUTPUT_LANGUAGE tag is used to specify the language in which all +# documentation generated by doxygen is written. Doxygen will use this +# information to generate all constant output in the proper language. +# The default language is English, other supported languages are: +# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, +# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German, +# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English +# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, +# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak, +# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese. + +OUTPUT_LANGUAGE= English + +# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will +# include brief member descriptions after the members that are listed in +# the file and class documentation (similar to JavaDoc). +# Set to NO to disable this. + +BRIEF_MEMBER_DESC = YES + +# If the REPEAT_BRIEF tag is set to YES (the
[MERGED] libosmocore[master]: doxygen: config: one enum val per line
Neels Hofmeyr has submitted this change and it was merged. Change subject: doxygen: config: one enum val per line .. doxygen: config: one enum val per line In the generated API doc, do not print multiple enum values on the same line, because this makes the lists pretty much unreadable. Change-Id: I63d6f42567f532851e19eb8a6c842e418ce666af --- M Doxyfile.codec.in M Doxyfile.coding.in M Doxyfile.core.in M Doxyfile.gsm.in M Doxyfile.vty.in 5 files changed, 5 insertions(+), 5 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/Doxyfile.codec.in b/Doxyfile.codec.in index 247a8b3..037ef7a 100644 --- a/Doxyfile.codec.in +++ b/Doxyfile.codec.in @@ -1069,7 +1069,7 @@ # documentation. Note that a value of 0 will completely suppress the enum # values from appearing in the overview section. -ENUM_VALUES_PER_LINE = 4 +ENUM_VALUES_PER_LINE = 1 # The GENERATE_TREEVIEW tag is used to specify whether a tree-like index # structure should be generated to display hierarchical information. diff --git a/Doxyfile.coding.in b/Doxyfile.coding.in index 9a0058d..43c4f82 100644 --- a/Doxyfile.coding.in +++ b/Doxyfile.coding.in @@ -1069,7 +1069,7 @@ # documentation. Note that a value of 0 will completely suppress the enum # values from appearing in the overview section. -ENUM_VALUES_PER_LINE = 4 +ENUM_VALUES_PER_LINE = 1 # The GENERATE_TREEVIEW tag is used to specify whether a tree-like index # structure should be generated to display hierarchical information. diff --git a/Doxyfile.core.in b/Doxyfile.core.in index 2ca0ced..c47ff3c 100644 --- a/Doxyfile.core.in +++ b/Doxyfile.core.in @@ -1069,7 +1069,7 @@ # documentation. Note that a value of 0 will completely suppress the enum # values from appearing in the overview section. -ENUM_VALUES_PER_LINE = 4 +ENUM_VALUES_PER_LINE = 1 # The GENERATE_TREEVIEW tag is used to specify whether a tree-like index # structure should be generated to display hierarchical information. diff --git a/Doxyfile.gsm.in b/Doxyfile.gsm.in index 742adc2..dbb5df6 100644 --- a/Doxyfile.gsm.in +++ b/Doxyfile.gsm.in @@ -1069,7 +1069,7 @@ # documentation. Note that a value of 0 will completely suppress the enum # values from appearing in the overview section. -ENUM_VALUES_PER_LINE = 4 +ENUM_VALUES_PER_LINE = 1 # The GENERATE_TREEVIEW tag is used to specify whether a tree-like index # structure should be generated to display hierarchical information. diff --git a/Doxyfile.vty.in b/Doxyfile.vty.in index 917af09..0e138ee 100644 --- a/Doxyfile.vty.in +++ b/Doxyfile.vty.in @@ -1069,7 +1069,7 @@ # documentation. Note that a value of 0 will completely suppress the enum # values from appearing in the overview section. -ENUM_VALUES_PER_LINE = 4 +ENUM_VALUES_PER_LINE = 1 # The GENERATE_TREEVIEW tag is used to specify whether a tree-like index # structure should be generated to display hierarchical information. -- To view, visit https://gerrit.osmocom.org/2988 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I63d6f42567f532851e19eb8a6c842e418ce666af Gerrit-PatchSet: 4 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Neels HofmeyrGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr
[MERGED] libosmocore[master]: doxygen: drop INPUT gsm/protocol, already part of gsm/
Neels Hofmeyr has submitted this change and it was merged. Change subject: doxygen: drop INPUT gsm/protocol, already part of gsm/ .. doxygen: drop INPUT gsm/protocol, already part of gsm/ include/osmocom/gsm/protocol is also implicitly included in its parent dir because of the recursive rule. Naming it again makes doxygen use it twice. It doesn't seem to be harmful, but not needed either. Change-Id: I5dc22ca65740a88540dacc61c0742fede172de9c --- M Doxyfile.gsm.in 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/Doxyfile.gsm.in b/Doxyfile.gsm.in index 1dae2b5..feaef0e 100644 --- a/Doxyfile.gsm.in +++ b/Doxyfile.gsm.in @@ -610,7 +610,7 @@ # directories like "/usr/src/myproject". Separate the files or directories # with spaces. -INPUT = @srcdir@/include/osmocom/gsm @srcdir@/include/osmocom/gsm/protocol @srcdir@/src/gsm +INPUT = @srcdir@/include/osmocom/gsm @srcdir@/src/gsm # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is -- To view, visit https://gerrit.osmocom.org/2980 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5dc22ca65740a88540dacc61c0742fede172de9c Gerrit-PatchSet: 4 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Neels HofmeyrGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr
libosmo-sccp[master]: ss7: Fix compilation error (warning)
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3002 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ibcb3ebf9aaa7717cb553242517abce1499bc9c2a Gerrit-PatchSet: 1 Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Owner: dexterGerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: laforge Gerrit-HasComments: No
[MERGED] libosmocore[master]: comments: gsm0808_utils: mention various 3GPP specs
Neels Hofmeyr has submitted this change and it was merged. Change subject: comments: gsm0808_utils: mention various 3GPP specs .. comments: gsm0808_utils: mention various 3GPP specs Tweaked-by: nhofmeyr Change-Id: I990dfe9eeaf96f377484b828143935240a937226 --- M src/gsm/gsm0808_utils.c 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c index c636adf..210f64e 100644 --- a/src/gsm/gsm0808_utils.c +++ b/src/gsm/gsm0808_utils.c @@ -230,6 +230,7 @@ uint8_t gsm0808_enc_speech_codec(struct msgb *msg, const struct gsm0808_speech_codec *sc) { + /*! See also 3GPP TS 48.008 3.2.2.103 Speech Codec List */ uint8_t *old_tail; uint8_t *tlv_len; @@ -334,6 +335,7 @@ uint8_t gsm0808_enc_speech_codec_list(struct msgb *msg, const struct gsm0808_speech_codec_list *scl) { + /*! See also 3GPP TS 48.008 3.2.2.103 Speech Codec List */ uint8_t *old_tail; uint8_t *tlv_len; unsigned int i; @@ -369,6 +371,7 @@ int gsm0808_dec_speech_codec_list(struct gsm0808_speech_codec_list *scl, const uint8_t *elem, uint8_t len) { + /*! See also 3GPP TS 48.008 3.2.2.103 Speech Codec List */ const uint8_t *old_elem = elem; unsigned int i; int rc; @@ -412,6 +415,7 @@ uint8_t gsm0808_enc_channel_type(struct msgb *msg, const struct gsm0808_channel_type *ct) { + /*! See also 3GPP TS 48.008 3.2.2.11 Channel Type */ unsigned int i; uint8_t byte; uint8_t *old_tail; @@ -454,6 +458,7 @@ int gsm0808_dec_channel_type(struct gsm0808_channel_type *ct, const uint8_t *elem, uint8_t len) { + /*! See also 3GPP TS 48.008 3.2.2.11 Channel Type */ unsigned int i; uint8_t byte; const uint8_t *old_elem = elem; -- To view, visit https://gerrit.osmocom.org/3015 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I990dfe9eeaf96f377484b828143935240a937226 Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Neels HofmeyrGerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: dexter
libosmocore[master]: gsm0808: fix length check of the element decoder functions
Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/2446 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I78bc887f68d1963d28c6fcd631ac20ccd893d6d6 Gerrit-PatchSet: 3 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: dexterGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: No
[MERGED] libosmocore[master]: gsm0808: fix length check of the element decoder functions
Neels Hofmeyr has submitted this change and it was merged. Change subject: gsm0808: fix length check of the element decoder functions .. gsm0808: fix length check of the element decoder functions The length check of the decoder functions is not entirely correct. The check also checks for values below zero, which does not make sense, since the length is encoded as uint8_t. For some elements a minimum length is known (in most cases this is 1), so checking for zero is sufficient but in some cases (e.g. channel type) the spec mentions a minimum and maximum length. This is now also reflected in the code. Tweaked-by: nhofmeyr Change-Id: I78bc887f68d1963d28c6fcd631ac20ccd893d6d6 --- M src/gsm/gsm0808_utils.c 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c index 00da04b..c636adf 100644 --- a/src/gsm/gsm0808_utils.c +++ b/src/gsm/gsm0808_utils.c @@ -104,7 +104,7 @@ OSMO_ASSERT(ss); if (!elem) return -EINVAL; - if (len <= 0) + if (len == 0) return -EINVAL; memset(ss, 0, sizeof(*ss)); @@ -261,7 +261,7 @@ OSMO_ASSERT(sc); if (!elem) return -EINVAL; - if (len <= 0) + if (len == 0) return -EINVAL; memset(sc, 0, sizeof(*sc)); @@ -377,7 +377,7 @@ OSMO_ASSERT(scl); if (!elem) return -EINVAL; - if (len <= 0) + if (len == 0) return -EINVAL; memset(scl, 0, sizeof(*scl)); @@ -461,7 +461,7 @@ OSMO_ASSERT(ct); if (!elem) return -EINVAL; - if (len <= 0) + if (len < 3 || len > 11) return -EINVAL; memset(ct, 0, sizeof(*ct)); @@ -537,7 +537,7 @@ OSMO_ASSERT(ei); if (!elem) return -EINVAL; - if (len <= 0) + if (len == 0) return -EINVAL; memset(ei, 0, sizeof(*ei)); @@ -614,7 +614,7 @@ OSMO_ASSERT(cil); if (!elem) return -EINVAL; - if (len <= 0) + if (len == 0) return -EINVAL; memset(cil, 0, sizeof(*cil)); -- To view, visit https://gerrit.osmocom.org/2446 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I78bc887f68d1963d28c6fcd631ac20ccd893d6d6 Gerrit-PatchSet: 3 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: dexterGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr
[PATCH] libosmocore[master]: comments: gsm0808_utils: mention various 3GPP specs
Review at https://gerrit.osmocom.org/3015 comments: gsm0808_utils: mention various 3GPP specs Tweaked-by: nhofmeyr Change-Id: I990dfe9eeaf96f377484b828143935240a937226 --- M src/gsm/gsm0808_utils.c 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/15/3015/1 diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c index c636adf..210f64e 100644 --- a/src/gsm/gsm0808_utils.c +++ b/src/gsm/gsm0808_utils.c @@ -230,6 +230,7 @@ uint8_t gsm0808_enc_speech_codec(struct msgb *msg, const struct gsm0808_speech_codec *sc) { + /*! See also 3GPP TS 48.008 3.2.2.103 Speech Codec List */ uint8_t *old_tail; uint8_t *tlv_len; @@ -334,6 +335,7 @@ uint8_t gsm0808_enc_speech_codec_list(struct msgb *msg, const struct gsm0808_speech_codec_list *scl) { + /*! See also 3GPP TS 48.008 3.2.2.103 Speech Codec List */ uint8_t *old_tail; uint8_t *tlv_len; unsigned int i; @@ -369,6 +371,7 @@ int gsm0808_dec_speech_codec_list(struct gsm0808_speech_codec_list *scl, const uint8_t *elem, uint8_t len) { + /*! See also 3GPP TS 48.008 3.2.2.103 Speech Codec List */ const uint8_t *old_elem = elem; unsigned int i; int rc; @@ -412,6 +415,7 @@ uint8_t gsm0808_enc_channel_type(struct msgb *msg, const struct gsm0808_channel_type *ct) { + /*! See also 3GPP TS 48.008 3.2.2.11 Channel Type */ unsigned int i; uint8_t byte; uint8_t *old_tail; @@ -454,6 +458,7 @@ int gsm0808_dec_channel_type(struct gsm0808_channel_type *ct, const uint8_t *elem, uint8_t len) { + /*! See also 3GPP TS 48.008 3.2.2.11 Channel Type */ unsigned int i; uint8_t byte; const uint8_t *old_elem = elem; -- To view, visit https://gerrit.osmocom.org/3015 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I990dfe9eeaf96f377484b828143935240a937226 Gerrit-PatchSet: 1 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Neels HofmeyrGerrit-Reviewer: dexter
osmo-ci[master]: Use stow for dependency management
Patch Set 3: Code-Review+1 (1 comment) I'd accept this, can someone else also approve please? https://gerrit.osmocom.org/#/c/2691/3/scripts/osmo-build-dep.sh File scripts/osmo-build-dep.sh: Line 54: mkdir -p "$inst/stow" > Yes, it does. ah ok, that explains it. -- To view, visit https://gerrit.osmocom.org/2691 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8f5012419495a656912b7b71e4f76ce102c6b63a Gerrit-PatchSet: 3 Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Owner: Alexander HuemerGerrit-Reviewer: Alexander Huemer Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: neels Gerrit-HasComments: Yes
osmo-ci[master]: Introduce artifacts holding dependencies to speed up builds.
Patch Set 10: (1 comment) https://gerrit.osmocom.org/#/c/2465/10/scripts/osmo-build.sh File scripts/osmo-build.sh: Line 170: branch_and_rev_of_remote_repo() { > Do you mean branch_and_rev_of{remote,local}_repo when speaking about "... n The comment means: can we have only one branch_and_rev() function replacing {remote,local}? Do we really need two separate ways to determine them? Fewer implementations means smaller error surface. -- To view, visit https://gerrit.osmocom.org/2465 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ifee0a2f837d23b19aa5326f810234d5452e47484 Gerrit-PatchSet: 10 Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Owner: André BoddenbergGerrit-Reviewer: André Boddenberg Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Holger Freyther Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: Yes
libosmocore[master]: doxygen: unify use of \file across the board
Patch Set 3: Code-Review+2 only rebase merge conflicts solved, reinstating previous +2 -- To view, visit https://gerrit.osmocom.org/2987 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ifa70e77e90462b5eb2b0457c70fd25275910c72b Gerrit-PatchSet: 3 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Neels HofmeyrGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: No
libosmocore[master]: doxygen: enable AUTOBRIEF, drop \brief
Patch Set 3: Code-Review+2 rebased and removed some more additions of \brief since the previous patch set, so reinstating previous +2. -- To view, visit https://gerrit.osmocom.org/2983 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I11a8a821b065a128108641a2a63fb5a2b1916e87 Gerrit-PatchSet: 3 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Neels HofmeyrGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: No
[ABANDON] libosmocore[master]: doxygen: linuxlist.h: fix some API doc to use doxygen Qt style
Neels Hofmeyr has abandoned this change. Change subject: doxygen: linuxlist.h: fix some API doc to use doxygen Qt style .. Abandoned -- To view, visit https://gerrit.osmocom.org/2984 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I9ae25c9bc6b7504402e583a6ce77b037083dcb80 Gerrit-PatchSet: 2 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Neels HofmeyrGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr
[PATCH] libosmocore[master]: doxygen: enable AUTOBRIEF, drop \brief
Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/2983 to look at the new patch set (#3). doxygen: enable AUTOBRIEF, drop \brief Especially for short descriptions, it is annoying to have to type \brief for every single API doc. Drop all \brief and enable the AUTOBRIEF feature of doxygen, which always takes the first sentence of an API doc as the brief description. Change-Id: I11a8a821b065a128108641a2a63fb5a2b1916e87 --- M Doxyfile.codec.in M Doxyfile.coding.in M Doxyfile.core.in M Doxyfile.gb.in M Doxyfile.gsm.in M Doxyfile.vty.in M include/osmocom/codec/codec.h M include/osmocom/coding/gsm0503_coding.h M include/osmocom/coding/gsm0503_interleaving.h M include/osmocom/coding/gsm0503_mapping.h M include/osmocom/coding/gsm0503_parity.h M include/osmocom/coding/gsm0503_tables.h M include/osmocom/core/application.h M include/osmocom/core/bitXXgen.h.tpl M include/osmocom/core/bitcomp.h M include/osmocom/core/bits.h M include/osmocom/core/bitvec.h M include/osmocom/core/byteswap.h M include/osmocom/core/conv.h M include/osmocom/core/crcXXgen.h.tpl M include/osmocom/core/defs.h M include/osmocom/core/fsm.h M include/osmocom/core/gsmtap.h M include/osmocom/core/gsmtap_util.h M include/osmocom/core/linuxlist.h M include/osmocom/core/logging.h M include/osmocom/core/msgb.h M include/osmocom/core/panic.h M include/osmocom/core/prim.h M include/osmocom/core/rate_ctr.h M include/osmocom/core/select.h M include/osmocom/core/sercomm.h M include/osmocom/core/signal.h M include/osmocom/core/socket.h M include/osmocom/core/stat_item.h M include/osmocom/core/statistics.h M include/osmocom/core/strrb.h M include/osmocom/core/timer.h M include/osmocom/core/timer_compat.h M include/osmocom/core/utils.h M include/osmocom/core/write_queue.h M include/osmocom/crypt/auth.h M include/osmocom/gprs/gprs_bssgp.h M include/osmocom/gprs/gprs_ns.h M include/osmocom/gprs/gprs_rlc.h M include/osmocom/gprs/protocol/gsm_08_16.h M include/osmocom/gprs/protocol/gsm_08_18.h M include/osmocom/gsm/a5.h M include/osmocom/gsm/abis_nm.h M include/osmocom/gsm/gsm_utils.h M include/osmocom/gsm/kasumi.h M include/osmocom/gsm/l1sap.h M include/osmocom/gsm/lapd_core.h M include/osmocom/gsm/lapdm.h M include/osmocom/gsm/oap.h M include/osmocom/gsm/protocol/gsm_04_08.h M include/osmocom/gsm/protocol/gsm_08_08.h M include/osmocom/gsm/protocol/gsm_08_58.h M include/osmocom/gsm/protocol/gsm_12_21.h M include/osmocom/gsm/rsl.h M include/osmocom/gsm/tlv.h M include/osmocom/sim/sim.h M include/osmocom/vty/command.h M include/osmocom/vty/telnet_interface.h M include/osmocom/vty/vty.h M src/application.c M src/backtrace.c M src/bitcomp.c M src/bits.c M src/bitvec.c M src/codec/gsm610.c M src/codec/gsm620.c M src/codec/gsm690.c M src/coding/gsm0503_coding.c M src/coding/gsm0503_interleaving.c M src/coding/gsm0503_mapping.c M src/coding/gsm0503_parity.c M src/coding/gsm0503_tables.c M src/conv.c M src/crc16.c M src/crcXXgen.c.tpl M src/ctrl/control_if.c M src/ctrl/fsm_ctrl_commands.c M src/fsm.c M src/gb/gprs_bssgp_bss.c M src/gb/gprs_ns.c M src/gsm/a5.c M src/gsm/abis_nm.c M src/gsm/auth_core.c M src/gsm/comp128.c M src/gsm/comp128v23.c M src/gsm/gan.c M src/gsm/gea.c M src/gsm/gprs_cipher_core.c M src/gsm/gprs_rlc.c M src/gsm/gsm0341.c M src/gsm/gsm0411_smc.c M src/gsm/gsm0411_utils.c M src/gsm/gsm0808.c M src/gsm/gsm0808_utils.c M src/gsm/gsm48.c M src/gsm/gsm48_ie.c M src/gsm/gsm_04_08_gprs.c M src/gsm/gsm_utils.c M src/gsm/gsup.c M src/gsm/ipa.c M src/gsm/lapd_core.c M src/gsm/lapdm.c M src/gsm/oap.c M src/gsm/rsl.c M src/gsm/sysinfo.c M src/gsm/tlv_parser.c M src/gsmtap_util.c M src/logging.c M src/logging_gsmtap.c M src/logging_syslog.c M src/loggingrb.c M src/macaddr.c M src/msgb.c M src/panic.c M src/plugin.c M src/prim.c M src/rate_ctr.c M src/select.c M src/sercomm.c M src/serial.c M src/signal.c M src/sim/core.c M src/socket.c M src/stat_item.c M src/strrb.c M src/timer.c M src/timer_gettimeofday.c M src/utils.c M src/vty/command.c M src/vty/fsm_vty.c M src/vty/logging_vty.c M src/vty/stats_vty.c M src/vty/telnet_interface.c M src/vty/utils.c M src/vty/vector.c M src/vty/vty.c M src/write_queue.c M utils/conv_gen.py 144 files changed, 1,572 insertions(+), 1,573 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/83/2983/3 -- To view, visit https://gerrit.osmocom.org/2983 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I11a8a821b065a128108641a2a63fb5a2b1916e87 Gerrit-PatchSet: 3 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Neels HofmeyrGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
[PATCH] libosmocore[master]: doxygen: unify use of \file across the board
Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/2987 to look at the new patch set (#3). doxygen: unify use of \file across the board Considering the various styles and implications found in the sources, edit scores of files to follow the same API doc guidelines around the doxygen grouping and the \file tag. Many files now show a short description in the generated API doc that was so far only available as C comment. The guidelines and reasoning behind it is documented at https://osmocom.org/projects/cellular-infrastructure/wiki/Guidelines_for_API_documentation In some instances, remove file comments and add to the corresponding group instead, to be shared among several files (e.g. bitvec). Change-Id: Ifa70e77e90462b5eb2b0457c70fd25275910c72b --- M include/osmocom/codec/codec.h M include/osmocom/coding/gsm0503_coding.h M include/osmocom/coding/gsm0503_interleaving.h M include/osmocom/coding/gsm0503_mapping.h M include/osmocom/coding/gsm0503_parity.h M include/osmocom/coding/gsm0503_tables.h M include/osmocom/core/backtrace.h M include/osmocom/core/bitcomp.h M include/osmocom/core/bits.h M include/osmocom/core/bitvec.h M include/osmocom/core/byteswap.h M include/osmocom/core/conv.h M include/osmocom/core/crc16.h M include/osmocom/core/crcXXgen.h.tpl M include/osmocom/core/crcgen.h M include/osmocom/core/defs.h M include/osmocom/core/endian.h M include/osmocom/core/fsm.h M include/osmocom/core/gsmtap.h M include/osmocom/core/gsmtap_util.h M include/osmocom/core/linuxlist.h M include/osmocom/core/logging.h M include/osmocom/core/loggingrb.h M include/osmocom/core/macaddr.h M include/osmocom/core/msgb.h M include/osmocom/core/msgfile.h M include/osmocom/core/panic.h M include/osmocom/core/plugin.h M include/osmocom/core/prim.h M include/osmocom/core/process.h M include/osmocom/core/rate_ctr.h M include/osmocom/core/select.h M include/osmocom/core/sercomm.h M include/osmocom/core/serial.h M include/osmocom/core/signal.h M include/osmocom/core/socket.h M include/osmocom/core/stat_item.h M include/osmocom/core/stats.h M include/osmocom/core/strrb.h M include/osmocom/core/talloc.h M include/osmocom/core/timer.h M include/osmocom/core/timer_compat.h M include/osmocom/core/utils.h M include/osmocom/core/write_queue.h M include/osmocom/crypt/auth.h M include/osmocom/crypt/gprs_cipher.h M include/osmocom/ctrl/control_cmd.h M include/osmocom/ctrl/control_if.h M include/osmocom/ctrl/control_vty.h M include/osmocom/ctrl/ports.h M include/osmocom/gprs/gprs_bssgp.h M include/osmocom/gprs/gprs_bssgp_bss.h M include/osmocom/gprs/gprs_msgb.h M include/osmocom/gprs/gprs_ns.h M include/osmocom/gprs/gprs_ns_frgre.h M include/osmocom/gprs/gprs_rlc.h M include/osmocom/gprs/protocol/gsm_04_60.h M include/osmocom/gprs/protocol/gsm_08_16.h M include/osmocom/gprs/protocol/gsm_08_18.h M include/osmocom/gsm/a5.h M include/osmocom/gsm/abis_nm.h M include/osmocom/gsm/apn.h M include/osmocom/gsm/bitvec_gsm.h M include/osmocom/gsm/comp128.h M include/osmocom/gsm/comp128v23.h M include/osmocom/gsm/gan.h M include/osmocom/gsm/gea.h M include/osmocom/gsm/gsm0341.h M include/osmocom/gsm/gsm0411_smc.h M include/osmocom/gsm/gsm0411_smr.h M include/osmocom/gsm/gsm0411_utils.h M include/osmocom/gsm/gsm0480.h M include/osmocom/gsm/gsm0502.h M include/osmocom/gsm/gsm0808.h M include/osmocom/gsm/gsm0808_utils.h M include/osmocom/gsm/gsm23003.h M include/osmocom/gsm/gsm48.h M include/osmocom/gsm/gsm48_ie.h M include/osmocom/gsm/gsm_utils.h M include/osmocom/gsm/gsup.h M include/osmocom/gsm/ipa.h M include/osmocom/gsm/kasumi.h M include/osmocom/gsm/l1sap.h M include/osmocom/gsm/lapd_core.h M include/osmocom/gsm/lapdm.h M include/osmocom/gsm/meas_rep.h M include/osmocom/gsm/mncc.h M include/osmocom/gsm/oap.h M include/osmocom/gsm/prim.h M include/osmocom/gsm/protocol/gsm_03_40.h M include/osmocom/gsm/protocol/gsm_03_41.h M include/osmocom/gsm/protocol/gsm_04_08.h M include/osmocom/gsm/protocol/gsm_04_08_gprs.h M include/osmocom/gsm/protocol/gsm_04_11.h M include/osmocom/gsm/protocol/gsm_04_12.h M include/osmocom/gsm/protocol/gsm_04_14.h M include/osmocom/gsm/protocol/gsm_04_80.h M include/osmocom/gsm/protocol/gsm_08_58.h M include/osmocom/gsm/protocol/gsm_09_02.h M include/osmocom/gsm/protocol/gsm_12_21.h M include/osmocom/gsm/protocol/gsm_23_003.h M include/osmocom/gsm/protocol/gsm_44_318.h M include/osmocom/gsm/protocol/ipaccess.h M include/osmocom/gsm/protocol/smpp34_osmocom.h M include/osmocom/gsm/rsl.h M include/osmocom/gsm/rxlev_stat.h M include/osmocom/gsm/sysinfo.h M include/osmocom/gsm/tlv.h M include/osmocom/sim/class_tables.h M include/osmocom/sim/sim.h M include/osmocom/vty/buffer.h M include/osmocom/vty/command.h M include/osmocom/vty/logging.h M include/osmocom/vty/misc.h M include/osmocom/vty/ports.h M include/osmocom/vty/stats.h M include/osmocom/vty/telnet_interface.h M include/osmocom/vty/vector.h M include/osmocom/vty/vty.h M src/application.c M
libosmocore[master]: doxygen: linuxlist.h: fix some API doc to use doxygen Qt style
Patch Set 2: ok, we can drop this -- To view, visit https://gerrit.osmocom.org/2984 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I9ae25c9bc6b7504402e583a6ce77b037083dcb80 Gerrit-PatchSet: 2 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Neels HofmeyrGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: No
[MERGED] libosmo-sccp[master]: Revert "configure.ac: Use -Werror in C(PP)FLAGS"
Neels Hofmeyr has submitted this change and it was merged. Change subject: Revert "configure.ac: Use -Werror in C(PP)FLAGS" .. Revert "configure.ac: Use -Werror in C(PP)FLAGS" As discussed in chat, -Werror should not be enabled by default. Instead it should be added in our jenkins build scripts. This reverts commit fc252ca38427bf77e55fd272a954dfe24f03a719. Change-Id: I92955c2f74f9a5c40e80028459100cf5e79a537b --- M configure.ac 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Max: Looks good to me, but someone else must approve Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index 3c498c8..36cbb59 100644 --- a/configure.ac +++ b/configure.ac @@ -53,8 +53,8 @@ CFLAGS="$saved_CFLAGS" AC_SUBST(SYMBOL_VISIBILITY) -CFLAGS+=" -Wall -Werror" -CPPFLAGS+=" -Wall -Werror" +CFLAGS+=" -Wall" +CPPFLAGS+=" -Wall" AC_OUTPUT( libosmo-sigtran.pc -- To view, visit https://gerrit.osmocom.org/3010 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I92955c2f74f9a5c40e80028459100cf5e79a537b Gerrit-PatchSet: 2 Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Owner: Neels HofmeyrGerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol
libosmo-abis[master]: Revert "configure.ac: Use -Werror in C(PP)FLAGS"
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3009 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ied6e21b72b24fcb623fd945ed9560b742a8eedf5 Gerrit-PatchSet: 1 Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Owner: Neels HofmeyrGerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No
libosmo-sccp[master]: Revert "configure.ac: Use -Werror in C(PP)FLAGS"
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3010 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I92955c2f74f9a5c40e80028459100cf5e79a537b Gerrit-PatchSet: 1 Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Owner: Neels HofmeyrGerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No
Build failure of network:osmocom:nightly/libosmo-abis in Debian_8.0/i586
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-abis/Debian_8.0/i586 Package network:osmocom:nightly/libosmo-abis failed to build in Debian_8.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-abis Last lines of build log: [ 120s] write(pcap_fd, _header, sizeof(lapd_header)); [ 120s] ^ [ 120s] e1_input.c:192:2: error: ignoring return value of 'write', declared with attribute warn_unused_result [-Werror=unused-result] [ 120s] write(pcap_fd, msg->l2h, msgb_l2len(msg)); [ 120s] ^ [ 120s] cc1: all warnings being treated as errors [ 120s] Makefile:519: recipe for target 'e1_input.lo' failed [ 120s] make[3]: *** [e1_input.lo] Error 1 [ 120s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 120s] Makefile:457: recipe for target 'all-recursive' failed [ 120s] make[2]: *** [all-recursive] Error 1 [ 120s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 120s] Makefile:363: recipe for target 'all' failed [ 120s] make[1]: *** [all] Error 2 [ 120s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 120s] dh_auto_build: make -j1 returned exit code 2 [ 120s] debian/rules:12: recipe for target 'build' failed [ 120s] make: *** [build] Error 2 [ 120s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 120s] [ 120s] cloud135 failed "build libosmo-abis_0.3.3.20170622.dsc" at Thu Jun 22 19:57:49 UTC 2017. [ 120s] [ 120s] ### VM INTERACTION START ### [ 121s] Powering off. [ 121s] [ 101.267656] reboot: Power down [ 123s] ### VM INTERACTION END ### [ 123s] [ 123s] cloud135 failed "build libosmo-abis_0.3.3.20170622.dsc" at Thu Jun 22 19:57:53 UTC 2017. [ 123s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/libosmo-abis in xUbuntu_16.04/i586
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-abis/xUbuntu_16.04/i586 Package network:osmocom:nightly/libosmo-abis failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-abis Last lines of build log: [ 112s] e1_input.c:191:2: error: ignoring return value of 'write', declared with attribute warn_unused_result [-Werror=unused-result] [ 112s] write(pcap_fd, _header, sizeof(lapd_header)); [ 112s] ^ [ 112s] e1_input.c:192:2: error: ignoring return value of 'write', declared with attribute warn_unused_result [-Werror=unused-result] [ 112s] write(pcap_fd, msg->l2h, msgb_l2len(msg)); [ 112s] ^ [ 112s] cc1: all warnings being treated as errors [ 112s] Makefile:530: recipe for target 'e1_input.lo' failed [ 112s] make[3]: *** [e1_input.lo] Error 1 [ 112s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 112s] Makefile:469: recipe for target 'all-recursive' failed [ 112s] make[2]: *** [all-recursive] Error 1 [ 112s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 112s] Makefile:376: recipe for target 'all' failed [ 112s] make[1]: *** [all] Error 2 [ 112s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 112s] dh_auto_build: make -j1 returned exit code 2 [ 112s] debian/rules:12: recipe for target 'build' failed [ 112s] make: *** [build] Error 2 [ 112s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 112s] [ 112s] build35 failed "build libosmo-abis_0.3.3.20170622.dsc" at Thu Jun 22 19:56:05 UTC 2017. [ 112s] [ 112s] ### VM INTERACTION START ### [ 115s] [ 99.251965] reboot: Power down [ 116s] ### VM INTERACTION END ### [ 116s] [ 116s] build35 failed "build libosmo-abis_0.3.3.20170622.dsc" at Thu Jun 22 19:56:09 UTC 2017. [ 116s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/libosmo-abis in xUbuntu_17.04/i586
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-abis/xUbuntu_17.04/i586 Package network:osmocom:nightly/libosmo-abis failed to build in xUbuntu_17.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-abis Last lines of build log: [ 114s] e1_input.c:191:2: error: ignoring return value of 'write', declared with attribute warn_unused_result [-Werror=unused-result] [ 114s] write(pcap_fd, _header, sizeof(lapd_header)); [ 114s] ^ [ 114s] e1_input.c:192:2: error: ignoring return value of 'write', declared with attribute warn_unused_result [-Werror=unused-result] [ 114s] write(pcap_fd, msg->l2h, msgb_l2len(msg)); [ 114s] ^ [ 114s] cc1: all warnings being treated as errors [ 114s] Makefile:530: recipe for target 'e1_input.lo' failed [ 114s] make[3]: *** [e1_input.lo] Error 1 [ 114s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 114s] Makefile:469: recipe for target 'all-recursive' failed [ 114s] make[2]: *** [all-recursive] Error 1 [ 114s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 114s] Makefile:376: recipe for target 'all' failed [ 114s] make[1]: *** [all] Error 2 [ 114s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 114s] dh_auto_build: make -j1 returned exit code 2 [ 114s] debian/rules:12: recipe for target 'build' failed [ 114s] make: *** [build] Error 2 [ 114s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 114s] [ 114s] cloud120 failed "build libosmo-abis_0.3.3.20170622.dsc" at Thu Jun 22 19:55:44 UTC 2017. [ 114s] [ 114s] ### VM INTERACTION START ### [ 117s] [ 90.624167] reboot: Power down [ 124s] ### VM INTERACTION END ### [ 124s] [ 124s] cloud120 failed "build libosmo-abis_0.3.3.20170622.dsc" at Thu Jun 22 19:55:54 UTC 2017. [ 124s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/libosmo-abis in Debian_9.0/i586
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-abis/Debian_9.0/i586 Package network:osmocom:nightly/libosmo-abis failed to build in Debian_9.0/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-abis Last lines of build log: [ 94s] e1_input.c:191:2: error: ignoring return value of 'write', declared with attribute warn_unused_result [-Werror=unused-result] [ 94s] write(pcap_fd, _header, sizeof(lapd_header)); [ 94s] ^ [ 94s] e1_input.c:192:2: error: ignoring return value of 'write', declared with attribute warn_unused_result [-Werror=unused-result] [ 94s] write(pcap_fd, msg->l2h, msgb_l2len(msg)); [ 94s] ^ [ 95s] cc1: all warnings being treated as errors [ 95s] Makefile:530: recipe for target 'e1_input.lo' failed [ 95s] make[3]: *** [e1_input.lo] Error 1 [ 95s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 95s] Makefile:469: recipe for target 'all-recursive' failed [ 95s] make[2]: *** [all-recursive] Error 1 [ 95s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 95s] Makefile:376: recipe for target 'all' failed [ 95s] make[1]: *** [all] Error 2 [ 95s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 95s] dh_auto_build: make -j1 returned exit code 2 [ 95s] debian/rules:12: recipe for target 'build' failed [ 95s] make: *** [build] Error 2 [ 95s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 95s] [ 95s] lamb07 failed "build libosmo-abis_0.3.3.20170622.dsc" at Thu Jun 22 19:55:27 UTC 2017. [ 95s] [ 95s] ### VM INTERACTION START ### [ 98s] [ 82.482869] reboot: Power down [ 98s] ### VM INTERACTION END ### [ 98s] [ 98s] lamb07 failed "build libosmo-abis_0.3.3.20170622.dsc" at Thu Jun 22 19:55:31 UTC 2017. [ 98s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/libosmo-abis in xUbuntu_16.04/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-abis/xUbuntu_16.04/x86_64 Package network:osmocom:nightly/libosmo-abis failed to build in xUbuntu_16.04/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-abis Last lines of build log: [ 100s] ^ [ 100s] e1_input.c:191:2: error: ignoring return value of 'write', declared with attribute warn_unused_result [-Werror=unused-result] [ 100s] write(pcap_fd, _header, sizeof(lapd_header)); [ 100s] ^ [ 100s] e1_input.c:192:2: error: ignoring return value of 'write', declared with attribute warn_unused_result [-Werror=unused-result] [ 100s] write(pcap_fd, msg->l2h, msgb_l2len(msg)); [ 100s] ^ [ 100s] cc1: all warnings being treated as errors [ 100s] Makefile:530: recipe for target 'e1_input.lo' failed [ 100s] make[3]: *** [e1_input.lo] Error 1 [ 100s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 100s] Makefile:469: recipe for target 'all-recursive' failed [ 100s] make[2]: *** [all-recursive] Error 1 [ 100s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 100s] Makefile:376: recipe for target 'all' failed [ 100s] make[1]: *** [all] Error 2 [ 100s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 100s] dh_auto_build: make -j1 returned exit code 2 [ 100s] debian/rules:12: recipe for target 'build' failed [ 100s] make: *** [build] Error 2 [ 100s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 100s] [ 100s] lamb70 failed "build libosmo-abis_0.3.3.20170622.dsc" at Thu Jun 22 19:55:14 UTC 2017. [ 100s] [ 100s] ### VM INTERACTION START ### [ 103s] ### VM INTERACTION END ### [ 103s] [ 103s] lamb70 failed "build libosmo-abis_0.3.3.20170622.dsc" at Thu Jun 22 19:55:17 UTC 2017. [ 103s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/libosmo-abis in Debian_9.0/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-abis/Debian_9.0/x86_64 Package network:osmocom:nightly/libosmo-abis failed to build in Debian_9.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-abis Last lines of build log: [ 90s] e1_input.c:191:2: error: ignoring return value of 'write', declared with attribute warn_unused_result [-Werror=unused-result] [ 90s] write(pcap_fd, _header, sizeof(lapd_header)); [ 90s] ^ [ 90s] e1_input.c:192:2: error: ignoring return value of 'write', declared with attribute warn_unused_result [-Werror=unused-result] [ 90s] write(pcap_fd, msg->l2h, msgb_l2len(msg)); [ 90s] ^ [ 90s] cc1: all warnings being treated as errors [ 90s] Makefile:530: recipe for target 'e1_input.lo' failed [ 90s] make[3]: *** [e1_input.lo] Error 1 [ 90s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 90s] Makefile:469: recipe for target 'all-recursive' failed [ 90s] make[2]: *** [all-recursive] Error 1 [ 90s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 90s] Makefile:376: recipe for target 'all' failed [ 90s] make[1]: *** [all] Error 2 [ 90s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 90s] dh_auto_build: make -j1 returned exit code 2 [ 90s] debian/rules:12: recipe for target 'build' failed [ 90s] make: *** [build] Error 2 [ 90s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 90s] [ 90s] lamb02 failed "build libosmo-abis_0.3.3.20170622.dsc" at Thu Jun 22 19:55:14 UTC 2017. [ 90s] [ 90s] ### VM INTERACTION START ### [ 93s] [ 79.225237] reboot: Power down [ 93s] ### VM INTERACTION END ### [ 93s] [ 93s] lamb02 failed "build libosmo-abis_0.3.3.20170622.dsc" at Thu Jun 22 19:55:17 UTC 2017. [ 93s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/libosmo-abis in xUbuntu_16.10/i586
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-abis/xUbuntu_16.10/i586 Package network:osmocom:nightly/libosmo-abis failed to build in xUbuntu_16.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-abis Last lines of build log: [ 78s] e1_input.c:191:2: error: ignoring return value of 'write', declared with attribute warn_unused_result [-Werror=unused-result] [ 78s] write(pcap_fd, _header, sizeof(lapd_header)); [ 78s] ^ [ 78s] e1_input.c:192:2: error: ignoring return value of 'write', declared with attribute warn_unused_result [-Werror=unused-result] [ 78s] write(pcap_fd, msg->l2h, msgb_l2len(msg)); [ 78s] ^ [ 78s] cc1: all warnings being treated as errors [ 78s] Makefile:530: recipe for target 'e1_input.lo' failed [ 78s] make[3]: *** [e1_input.lo] Error 1 [ 78s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 78s] Makefile:469: recipe for target 'all-recursive' failed [ 78s] make[2]: *** [all-recursive] Error 1 [ 78s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 78s] Makefile:376: recipe for target 'all' failed [ 78s] make[1]: *** [all] Error 2 [ 78s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 78s] dh_auto_build: make -j1 returned exit code 2 [ 78s] debian/rules:12: recipe for target 'build' failed [ 78s] make: *** [build] Error 2 [ 78s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 78s] [ 78s] lamb73 failed "build libosmo-abis_0.3.3.20170622.dsc" at Thu Jun 22 19:55:16 UTC 2017. [ 78s] [ 78s] ### VM INTERACTION START ### [ 81s] [ 67.391011] reboot: Power down [ 81s] ### VM INTERACTION END ### [ 81s] [ 81s] lamb73 failed "build libosmo-abis_0.3.3.20170622.dsc" at Thu Jun 22 19:55:19 UTC 2017. [ 81s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/libosmo-abis in Debian_8.0/x86_64
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmo-abis/Debian_8.0/x86_64 Package network:osmocom:nightly/libosmo-abis failed to build in Debian_8.0/x86_64 Check out the package for editing: osc checkout network:osmocom:nightly libosmo-abis Last lines of build log: [ 92s] write(pcap_fd, _header, sizeof(lapd_header)); [ 92s] ^ [ 93s] e1_input.c:192:2: error: ignoring return value of 'write', declared with attribute warn_unused_result [-Werror=unused-result] [ 93s] write(pcap_fd, msg->l2h, msgb_l2len(msg)); [ 93s] ^ [ 93s] cc1: all warnings being treated as errors [ 93s] Makefile:519: recipe for target 'e1_input.lo' failed [ 93s] make[3]: *** [e1_input.lo] Error 1 [ 93s] make[3]: Leaving directory '/usr/src/packages/BUILD/src' [ 93s] Makefile:457: recipe for target 'all-recursive' failed [ 93s] make[2]: *** [all-recursive] Error 1 [ 93s] make[2]: Leaving directory '/usr/src/packages/BUILD' [ 93s] Makefile:363: recipe for target 'all' failed [ 93s] make[1]: *** [all] Error 2 [ 93s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 93s] dh_auto_build: make -j1 returned exit code 2 [ 93s] debian/rules:12: recipe for target 'build' failed [ 93s] make: *** [build] Error 2 [ 93s] dpkg-buildpackage: error: debian/rules build gave error exit status 2 [ 93s] [ 93s] lamb02 failed "build libosmo-abis_0.3.3.20170622.dsc" at Thu Jun 22 19:54:47 UTC 2017. [ 93s] [ 93s] ### VM INTERACTION START ### [ 94s] Powering off. [ 94s] [ 78.909489] reboot: Power down [ 94s] ### VM INTERACTION END ### [ 94s] [ 94s] lamb02 failed "build libosmo-abis_0.3.3.20170622.dsc" at Thu Jun 22 19:54:49 UTC 2017. [ 94s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
Build failure of network:osmocom:nightly/libosmocore in xUbuntu_16.04/i586
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/libosmocore/xUbuntu_16.04/i586 Package network:osmocom:nightly/libosmocore failed to build in xUbuntu_16.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly libosmocore Last lines of build log: [ 241s] -tch_hr_decode: n_errors=10 n_bits_total=456 ber=0.02 [ 241s] -tch_hr_decode: n_errors=10 n_bits_total=456 ber=0.02 [ 241s] -pdtch_decode: n_errors=0 n_bits_total=456 ber=0.00 [ 241s] -pdtch_decode: n_errors=132 n_bits_total=588 ber=0.22 [ 241s] -pdtch_decode: n_errors=220 n_bits_total=676 ber=0.33 [ 241s] -pdtch_decode: n_errors=0 n_bits_total=444 ber=0.00 [ 241s] -pdtch_decode: n_errors=0 n_bits_total=456 ber=0.00 [ 241s] -pdtch_decode: n_errors=132 n_bits_total=588 ber=0.22 [ 241s] -pdtch_decode: n_errors=220 n_bits_total=676 ber=0.33 [ 241s] -pdtch_decode: n_errors=0 n_bits_total=444 ber=0.00 [ 241s] -Success [ 241s] ./testsuite.at:63: exit code was 132, expected 0 [ 241s] 10. testsuite.at:60: 10. coding (testsuite.at:60): FAILED (testsuite.at:63) [ 241s] debian/rules:26: recipe for target 'override_dh_auto_test' failed [ 241s] make[1]: *** [override_dh_auto_test] Error 1 [ 241s] make[1]: Leaving directory '/usr/src/packages/BUILD' [ 241s] debian/rules:15: recipe for target 'build' failed [ 241s] make: *** [build] Error 2 [ 241s] dpkg-buildpackage: error: debian/rule[ 221.544142] serial8250: too much work for irq4 [ 241s] s build gave error exit status 2 [ 241s] [ 241s] build35 failed "build libosmocore_0.9.6.20170622.dsc" at Thu Jun 22 19:53:52 UTC 2017. [ 241s] [ 241s] ### VM INTERACTION START ### [ 244s] [ 224.709945] reboot: Power down [ 245s] ### VM INTERACTION END ### [ 245s] [ 245s] build35 failed "build libosmocore_0.9.6.20170622.dsc" at Thu Jun 22 19:53:57 UTC 2017. [ 245s] -- Configure notifications at https://build.opensuse.org/user/notifications openSUSE Build Service (https://build.opensuse.org/)
[PATCH] libosmo-sccp[master]: add various debug logging to help figure out complex SCCP ro...
Review at https://gerrit.osmocom.org/3012 add various debug logging to help figure out complex SCCP routing Change-Id: Ia3243606d6cad7721f7da7f6caba2caa90ae2bbd --- M src/m3ua.c M src/osmo_ss7.c M src/osmo_ss7_hmrt.c M src/sccp_scoc.c M src/sccp_scrc.c 5 files changed, 32 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/12/3012/1 diff --git a/src/m3ua.c b/src/m3ua.c index d96bd18..22e1f9c 100644 --- a/src/m3ua.c +++ b/src/m3ua.c @@ -536,6 +536,8 @@ struct m3ua_data_hdr *dh; struct osmo_ss7_as *as; + LOGPASP(asp, DLM3UA, LOGL_DEBUG, "m3ua_rx_xfer\n"); + if (xua->hdr.msg_type != M3UA_XFER_DATA) return M3UA_ERR_UNSUPP_MSG_TYPE; @@ -556,6 +558,9 @@ dh = data_hdr_from_m3ua(xua); OSMO_ASSERT(dh); m3ua_dh_to_xfer_param(>mtp, dh); + LOGPASP(asp, DLM3UA, LOGL_DEBUG, + "m3ua data hdr opc=%u dpc=%u\n", + xua->mtp.opc, xua->mtp.dpc); /* remove ROUTE_CTX as in the routing case we want to add a new * routing context on the outbound side */ diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c index 78b22a7..1ef04ca 100644 --- a/src/osmo_ss7.c +++ b/src/osmo_ss7.c @@ -740,10 +740,15 @@ rt->cfg.pc = pc; rt->cfg.mask = mask; rt->cfg.linkset_name = talloc_strdup(rt, linkset_name); - if (lset) + if (lset) { rt->dest.linkset = lset; - else + DEBUGP(DLSS7, "Created route pc=%u mask=%u name=%s linkset %s\n", pc, mask, linkset_name, + lset->cfg.name); + } else { rt->dest.as = as; + DEBUGP(DLSS7, "Created route pc=%u mask=%u name=%s as %s\n", pc, mask, linkset_name, + as->cfg.name); + } rt->rtable = rtbl; route_insert_sorted(rtbl, rt); diff --git a/src/osmo_ss7_hmrt.c b/src/osmo_ss7_hmrt.c index e66762d..b018639 100644 --- a/src/osmo_ss7_hmrt.c +++ b/src/osmo_ss7_hmrt.c @@ -132,6 +132,15 @@ /* FIXME: unify with gen_mtp_transfer_req_xua() */ rt = osmo_ss7_route_lookup(inst, dpc); if (rt) { + DEBUGP(DLSS7, "found route for dpc %u: %s pc=%u mask=%u %s:%s\n", dpc, + rt->cfg.linkset_name, + rt->cfg.pc, + rt->cfg.mask, + rt->dest.linkset ? "linkset" + : (rt->dest.as ? "as" : "-"), + rt->dest.linkset ? rt->dest.linkset->cfg.name + : (rt->dest.as ? rt->dest.as->cfg.name : "-") + ); /* FIXME: DPC SP restart? */ /* FIXME: DPC Congested? */ /* FIXME: Select link based on SLS */ @@ -140,6 +149,7 @@ struct osmo_ss7_as *as = rt->dest.as; switch (as->cfg.proto) { case OSMO_SS7_ASP_PROT_M3UA: + DEBUGP(DLSS7, "rt->dest.as proto is M3UA for dpc %u\n", dpc); return m3ua_tx_xua_as(as,xua); case OSMO_SS7_ASP_PROT_IPA: return ipa_tx_xua_as(as, xua); @@ -171,8 +181,10 @@ { uint32_t dpc = xua->mtp.dpc; if (osmo_ss7_pc_is_local(inst, dpc)) { + DEBUGP(DLSS7, "dpc %u is local\n", dpc); return hmdt_message_for_distribution(inst, xua); } else { + DEBUGP(DLSS7, "dpc %u is for routing\n", dpc); return hmrt_message_for_routing(inst, xua); } } diff --git a/src/sccp_scoc.c b/src/sccp_scoc.c index fbb6ef8..54ce707 100644 --- a/src/sccp_scoc.c +++ b/src/sccp_scoc.c @@ -1544,6 +1544,8 @@ * the one we saved in local state */ src_loc_ref = xua_msg_get_u32(xua, SUA_IEI_SRC_REF); if (src_loc_ref != conn->remote_ref) { + DEBUGP(DLSCCP, "src_loc_ref(%u) != conn->remote_ref(%u)\n", + src_loc_ref, conn->remote_ref); sccp_scoc_rx_inval_src_ref(conn, xua); return; } @@ -1551,6 +1553,8 @@ /* Check if received OPC != the remote_pc we stored locally */ if (xua->mtp.opc != conn->remote_pc) { + DEBUGP(DLSCCP, "xua->mtp.opc(%u) != conn->remote_pc(%u)\n", + xua->mtp.opc, conn->remote_pc); sccp_scoc_rx_inval_opc(inst, xua); return; } diff --git a/src/sccp_scrc.c b/src/sccp_scrc.c index a4ce34c..333ab61 100644 --- a/src/sccp_scrc.c +++ b/src/sccp_scrc.c @@ -238,6 +238,7 @@ static int scrc_node_4(struct osmo_sccp_instance *inst, struct xua_msg *xua, uint32_t return_cause) { +
[PATCH] libosmo-sccp[master]: gen_mtp_transfer_req_xua(): add addr to error log for missin...
Review at https://gerrit.osmocom.org/3013 gen_mtp_transfer_req_xua(): add addr to error log for missing DPC Change-Id: Icfd45bcbecc440b94893db2aca537a162f210abd --- M src/sccp_scrc.c 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/13/3013/1 diff --git a/src/sccp_scrc.c b/src/sccp_scrc.c index 333ab61..7ae1984 100644 --- a/src/sccp_scrc.c +++ b/src/sccp_scrc.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include @@ -125,7 +126,8 @@ xua->mtp.dpc = called->pc; if (!xua->mtp.dpc) { LOGP(DLSCCP, LOGL_ERROR, "MTP-TRANSFER.req from SCCP " - "without DPC?!?\n"); + "without DPC?!? called=%s\n", + osmo_sccp_addr_dump(called)); return -1; } -- To view, visit https://gerrit.osmocom.org/3013 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icfd45bcbecc440b94893db2aca537a162f210abd Gerrit-PatchSet: 1 Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr
[PATCH] libosmo-sccp[master]: cosmetic: drop second ';;'
Review at https://gerrit.osmocom.org/3011 cosmetic: drop second ';;' Change-Id: I861b87e485d94f17e4b4a800c8da865f98633c92 --- M include/osmocom/sigtran/osmo_ss7.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/11/3011/1 diff --git a/include/osmocom/sigtran/osmo_ss7.h b/include/osmocom/sigtran/osmo_ss7.h index 741a7e3..4e04352 100644 --- a/include/osmocom/sigtran/osmo_ss7.h +++ b/include/osmocom/sigtran/osmo_ss7.h @@ -294,7 +294,7 @@ uint8_t qos_class; struct { uint32_t dpc; - } pc_override;; + } pc_override; struct osmo_ss7_asp *asps[16]; } cfg; -- To view, visit https://gerrit.osmocom.org/3011 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I861b87e485d94f17e4b4a800c8da865f98633c92 Gerrit-PatchSet: 1 Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr
libosmo-sccp[master]: Revert "configure.ac: Use -Werror in C(PP)FLAGS"
Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/3010 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I92955c2f74f9a5c40e80028459100cf5e79a537b Gerrit-PatchSet: 1 Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Owner: Neels HofmeyrGerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-HasComments: No
libosmo-abis[master]: Revert "configure.ac: Use -Werror in C(PP)FLAGS"
Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/3009 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ied6e21b72b24fcb623fd945ed9560b742a8eedf5 Gerrit-PatchSet: 1 Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Owner: Neels HofmeyrGerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-HasComments: No
[PATCH] libosmo-sccp[master]: Revert "configure.ac: Use -Werror in C(PP)FLAGS"
Review at https://gerrit.osmocom.org/3010 Revert "configure.ac: Use -Werror in C(PP)FLAGS" As discussed in chat, -Werror should not be enabled by default. Instead it should be added in our jenkins build scripts. This reverts commit fc252ca38427bf77e55fd272a954dfe24f03a719. Change-Id: I92955c2f74f9a5c40e80028459100cf5e79a537b --- M configure.ac 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/10/3010/1 diff --git a/configure.ac b/configure.ac index 3c498c8..36cbb59 100644 --- a/configure.ac +++ b/configure.ac @@ -53,8 +53,8 @@ CFLAGS="$saved_CFLAGS" AC_SUBST(SYMBOL_VISIBILITY) -CFLAGS+=" -Wall -Werror" -CPPFLAGS+=" -Wall -Werror" +CFLAGS+=" -Wall" +CPPFLAGS+=" -Wall" AC_OUTPUT( libosmo-sigtran.pc -- To view, visit https://gerrit.osmocom.org/3010 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I92955c2f74f9a5c40e80028459100cf5e79a537b Gerrit-PatchSet: 1 Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr
libosmo-abis[master]: Revert "configure.ac: Use -Werror in C(PP)FLAGS"
Neels Hofmeyr has reverted this change. Change subject: Revert "configure.ac: Use -Werror in C(PP)FLAGS" .. Uploaded patch set 1. -- To view, visit https://gerrit.osmocom.org/3009 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: revert Gerrit-Change-Id: Ied6e21b72b24fcb623fd945ed9560b742a8eedf5 Gerrit-PatchSet: 1 Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr
[PATCH] libosmo-abis[master]: Revert "configure.ac: Use -Werror in C(PP)FLAGS"
Review at https://gerrit.osmocom.org/3009 Revert "configure.ac: Use -Werror in C(PP)FLAGS" As discussed in chat, -Werror should not be enabled by default. Instead it should be added in our jenkins build scripts. This reverts commit 7d1f53143e8eaeb25bae8979fb80dac57ddbf827. Change-Id: Ied6e21b72b24fcb623fd945ed9560b742a8eedf5 --- M configure.ac 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/09/3009/1 diff --git a/configure.ac b/configure.ac index b76545e..535d1c3 100644 --- a/configure.ac +++ b/configure.ac @@ -26,8 +26,8 @@ AC_CONFIG_MACRO_DIR([m4]) -CFLAGS+=" -Wall -Werror" -CPPFLAGS+=" -Wall -Werror" +CFLAGS+=" -Wall" +CPPFLAGS+=" -Wall" # The following test is taken from WebKit's webkit.m4 saved_CFLAGS="$CFLAGS" -- To view, visit https://gerrit.osmocom.org/3009 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ied6e21b72b24fcb623fd945ed9560b742a8eedf5 Gerrit-PatchSet: 1 Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr
libosmocore[master]: configure.ac: Enable -Werror by default
Patch Set 7: Code-Review-1 after discussion in chat, we should not have -Werror on by default, instead add it in the contrib/jenkins script, by means of 'make CFLAGS+="-Werror" CPPFLAGS+="-Werror"' -- To view, visit https://gerrit.osmocom.org/2954 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1752cad1e34cb6e5f36edf3f538d803eff29d18c Gerrit-PatchSet: 7 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Pau Espin PedrolGerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No
[PATCH] osmo-bts[master]: Simplify jenkins build scripts
Review at https://gerrit.osmocom.org/3008 Simplify jenkins build scripts * move duplicated code into separate functions in jenkins_common.sh * use that function in individual builds Change-Id: I4d09c5f2693b5ac0a4d8f2c840971e13d1ec58cf --- M contrib/jenkins_bts_trx.sh M contrib/jenkins_common.sh M contrib/jenkins_lc15.sh M contrib/jenkins_oct_and_bts_trx.sh M contrib/jenkins_sysmobts.sh 5 files changed, 26 insertions(+), 60 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/08/3008/1 diff --git a/contrib/jenkins_bts_trx.sh b/contrib/jenkins_bts_trx.sh index 076a4ff..664c158 100755 --- a/contrib/jenkins_bts_trx.sh +++ b/contrib/jenkins_bts_trx.sh @@ -17,24 +17,10 @@ cd "$base" -set +x -echo -echo -echo -echo " === osmo-bts-trx ===" -echo -set -x - -autoreconf --install --force configure_flags="\ --with-openbsc=$deps/openbsc/openbsc/include \ --with-osmo-pcu=$deps/osmo-pcu/include \ --enable-trx \ " -./configure $configure_flags -$MAKE $PARALLEL_MAKE -$MAKE check \ - || cat-testlogs.sh -DISTCHECK_CONFIGURE_FLAGS="$configure_flags" \ - $MAKE distcheck \ - || cat-testlogs.sh + +build "osmo-bts-trx" $configure_flags diff --git a/contrib/jenkins_common.sh b/contrib/jenkins_common.sh index 824dd43..d81817d 100644 --- a/contrib/jenkins_common.sh +++ b/contrib/jenkins_common.sh @@ -22,3 +22,21 @@ cd "$base" "$deps"/libosmocore/contrib/verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]") + +# generic project build function, usage: +# build "PROJECT-NAME" "CONFIGURE OPTIONS" +build() { +set +x +echo +echo "$2" +echo +echo " === $1 ===" +echo +set -x + +autoreconf --install --force +./configure "$2 --with-openbsc=$deps/openbsc/openbsc/include" +$MAKE $PARALLEL_MAKE +$MAKE check || cat-testlogs.sh +DISTCHECK_CONFIGURE_FLAGS="$2 --with-openbsc=$deps/openbsc/openbsc/include" $MAKE distcheck || cat-testlogs.sh +} diff --git a/contrib/jenkins_lc15.sh b/contrib/jenkins_lc15.sh index af335d5..420d8d2 100755 --- a/contrib/jenkins_lc15.sh +++ b/contrib/jenkins_lc15.sh @@ -14,16 +14,6 @@ osmo-layer1-headers.sh lc15 "$FIRMWARE_VERSION" cd "$base" -set +x -echo -echo -echo -echo " === osmo-bts-lc15 ===" -echo -set -x +configure_flags="--with-litecell15=$deps/layer1-headers/inc/ --enable-litecell15" -autoreconf --install --force -./configure --with-openbsc="$deps/openbsc/openbsc/include" --with-litecell15="$deps/layer1-headers/inc/" --enable-litecell15 -$MAKE $PARALLEL_MAKE -$MAKE check || cat-testlogs.sh -DISTCHECK_CONFIGURE_FLAGS="--with-litecell15=$deps/layer1-headers/inc/ --with-openbsc=$deps/openbsc/openbsc/include --enable-litecell15" $MAKE distcheck || cat-testlogs.sh +build "osmo-bts-lc15" $configure_flags diff --git a/contrib/jenkins_oct_and_bts_trx.sh b/contrib/jenkins_oct_and_bts_trx.sh index a8a8004..74aa7e3 100755 --- a/contrib/jenkins_oct_and_bts_trx.sh +++ b/contrib/jenkins_oct_and_bts_trx.sh @@ -19,15 +19,6 @@ cd "$base" -set +x -echo -echo -echo -echo " === osmo-bts-octphy+trx ===" -echo -set -x - -autoreconf --install --force configure_flags="\ --with-openbsc=$deps/openbsc/openbsc/include \ --with-osmo-pcu=$deps/osmo-pcu/include \ @@ -35,10 +26,5 @@ --enable-octphy \ --enable-trx \ " -./configure $configure_flags -$MAKE $PARALLEL_MAKE -$MAKE check \ - || cat-testlogs.sh -DISTCHECK_CONFIGURE_FLAGS="$configure_flags" \ - $MAKE distcheck \ - || cat-testlogs.sh + +build "osmo-bts-octphy+trx" $configure_flags diff --git a/contrib/jenkins_sysmobts.sh b/contrib/jenkins_sysmobts.sh index 227f249..7cd8572 100755 --- a/contrib/jenkins_sysmobts.sh +++ b/contrib/jenkins_sysmobts.sh @@ -16,22 +16,8 @@ ln -s $deps/layer1-headers/include/* "$inst/include/sysmocom/femtobts/" cd "$base" -set +x -echo -echo -echo -echo " === osmo-bts-sysmo ===" -echo -set -x - -autoreconf --install --force -./configure --enable-sysmocom-bts --with-openbsc="$deps/openbsc/openbsc/include" -$MAKE $PARALLEL_MAKE -$MAKE check \ - || cat-testlogs.sh -DISTCHECK_CONFIGURE_FLAGS="--enable-sysmocom-bts --with-openbsc=$deps/openbsc/openbsc/include" \ - $MAKE distcheck \ - || cat-testlogs.sh +configure_flags="--enable-sysmocom-bts" +build "osmo-bts-sysmo" $configure_flags # This will not work for the femtobts if [ $FIRMWARE_VERSION != "femtobts_v2.7" ]; then -- To view, visit https://gerrit.osmocom.org/3008 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4d09c5f2693b5ac0a4d8f2c840971e13d1ec58cf Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Max
[PATCH] osmo-bts[master]: lc15: fix jenkins build
Review at https://gerrit.osmocom.org/3007 lc15: fix jenkins build * use proper fw headers include path * do not quote $PARALLEL_MAKE variable Change-Id: Ib67305ae858ce322f7ea4ac6c6ce5007ce8e7ab9 Related: SYS#3682 --- M contrib/jenkins_lc15.sh 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/07/3007/1 diff --git a/contrib/jenkins_lc15.sh b/contrib/jenkins_lc15.sh index c9173bf..af335d5 100755 --- a/contrib/jenkins_lc15.sh +++ b/contrib/jenkins_lc15.sh @@ -23,7 +23,7 @@ set -x autoreconf --install --force -./configure --with-openbsc="$deps/openbsc/openbsc/include" --with-litecell15="$deps/layer1-headers/" --enable-litecell15 -$MAKE "$PARALLEL_MAKE" +./configure --with-openbsc="$deps/openbsc/openbsc/include" --with-litecell15="$deps/layer1-headers/inc/" --enable-litecell15 +$MAKE $PARALLEL_MAKE $MAKE check || cat-testlogs.sh -DISTCHECK_CONFIGURE_FLAGS="--with-litecell15=$deps/layer1-headers/ --with-openbsc=$deps/openbsc/openbsc/include --enable-litecell15" $MAKE distcheck || cat-testlogs.sh +DISTCHECK_CONFIGURE_FLAGS="--with-litecell15=$deps/layer1-headers/inc/ --with-openbsc=$deps/openbsc/openbsc/include --enable-litecell15" $MAKE distcheck || cat-testlogs.sh -- To view, visit https://gerrit.osmocom.org/3007 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib67305ae858ce322f7ea4ac6c6ce5007ce8e7ab9 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Max
[MERGED] libosmocore[master]: timer_gettimeofday.c: Fix implicit use of timeradd
Harald Welte has submitted this change and it was merged. Change subject: timer_gettimeofday.c: Fix implicit use of timeradd .. timer_gettimeofday.c: Fix implicit use of timeradd timer_gettimeofday.c: In function 'osmo_gettimeofday_override_add': timer_gettimeofday.c:54:2: error: implicit declaration of function 'timeradd' [-Werror=implicit-function-declaration] timeradd(_gettimeofday_override_time, , ^ Change-Id: Iced451be255cfde8a6cf38380bef71ef29673994 --- M src/timer_gettimeofday.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Vadim Yanitskiy: Looks good to me, but someone else must approve Max: Looks good to me, but someone else must approve Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/timer_gettimeofday.c b/src/timer_gettimeofday.c index 81a1598..3573051 100644 --- a/src/timer_gettimeofday.c +++ b/src/timer_gettimeofday.c @@ -29,6 +29,7 @@ #include #include +#include bool osmo_gettimeofday_override = false; struct timeval osmo_gettimeofday_override_time = { 23, 424242 }; -- To view, visit https://gerrit.osmocom.org/2959 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iced451be255cfde8a6cf38380bef71ef29673994 Gerrit-PatchSet: 3 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Pau Espin PedrolGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy
[MERGED] libosmocore[master]: sercomm_test.c: return correctly in main
Harald Welte has submitted this change and it was merged. Change subject: sercomm_test.c: return correctly in main .. sercomm_test.c: return correctly in main Change-Id: I57fd3e1bf74ec24dec692710359a1ce00ecde75a --- M tests/sercomm/sercomm_test.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Vadim Yanitskiy: Looks good to me, but someone else must approve Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/sercomm/sercomm_test.c b/tests/sercomm/sercomm_test.c index 8b1ffdf..f4f1c22 100644 --- a/tests/sercomm/sercomm_test.c +++ b/tests/sercomm/sercomm_test.c @@ -133,4 +133,5 @@ int main(int argc, char **argv) { test_sercomm(); + return 0; } -- To view, visit https://gerrit.osmocom.org/2956 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I57fd3e1bf74ec24dec692710359a1ce00ecde75a Gerrit-PatchSet: 3 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Pau Espin PedrolGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy
[MERGED] libosmocore[master]: fsm.c: Fix compilation warning: Use PRIu32 for uint32_t
Harald Welte has submitted this change and it was merged. Change subject: fsm.c: Fix compilation warning: Use PRIu32 for uint32_t .. fsm.c: Fix compilation warning: Use PRIu32 for uint32_t Change-Id: I4c441b20b250c34656f1e8330d6bb4b1ce2b8423 --- M src/fsm.c 1 file changed, 4 insertions(+), 3 deletions(-) Approvals: Max: Looks good to me, but someone else must approve Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/fsm.c b/src/fsm.c index fbe22d7..16f5d65 100644 --- a/src/fsm.c +++ b/src/fsm.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include @@ -284,7 +285,7 @@ { static char buf[32]; if (!fsm->event_names) { - snprintf(buf, sizeof(buf), "%u", event); + snprintf(buf, sizeof(buf), "%"PRIu32, event); return buf; } else return get_value_string(fsm->event_names, event); @@ -314,7 +315,7 @@ { static char buf[32]; if (state >= fsm->num_states) { - snprintf(buf, sizeof(buf), "unknown %u", state); + snprintf(buf, sizeof(buf), "unknown %"PRIu32, state); return buf; } else return fsm->states[state].name; @@ -408,7 +409,7 @@ if (!fi) { LOGPSRC(DLGLOBAL, LOGL_ERROR, file, line, - "Trying to dispatch event %u to non-existent" + "Trying to dispatch event %"PRIu32" to non-existent" " FSM instance!\n", event); osmo_log_backtrace(DLGLOBAL, LOGL_ERROR); return -ENODEV; -- To view, visit https://gerrit.osmocom.org/2960 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4c441b20b250c34656f1e8330d6bb4b1ce2b8423 Gerrit-PatchSet: 3 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Pau Espin PedrolGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr
libosmocore[master]: pseudotalloc: Add simplistic implementation of talloc_asprintf
Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/2961 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I61cd83d4c8570af1e452c945ac6f194baf7e6ac4 Gerrit-PatchSet: 3 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Pau Espin PedrolGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: No
[MERGED] libosmo-abis[master]: osmo_ortp.c: Fix warning: check ortp API in rtp_session_sign...
Harald Welte has submitted this change and it was merged. Change subject: osmo_ortp.c: Fix warning: check ortp API in rtp_session_signal_connect .. osmo_ortp.c: Fix warning: check ortp API in rtp_session_signal_connect Since ortp commit 5ab29c50adc7948b11449e3aeee66010379ff7dc preceeding ortp 0.24, the API is fixed and requests a pointer instead of an unsigned long. As we now require at least ortp 0.22 since libosmo-abis 15d9b7929d449e4138bcb003c614035bceadc3d1, we need to support both old and new version of the API to continue having support for 0.22 but still supporting new versions of the library. Change-Id: I2dbd0498d75160358eca4336850e1a0ad2efdbeb --- M configure.ac M src/trau/osmo_ortp.c 2 files changed, 21 insertions(+), 4 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index 9b2f189..ff78035 100644 --- a/configure.ac +++ b/configure.ac @@ -72,6 +72,20 @@ [ortp_set_log_level_mask has no domain parameter])]) CFLAGS=$_cflags_save +_cflags_save=$CFLAGS +CFLAGS="$CFLAGS $ORTP_CFLAGS" +AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#include ]], + [[void fake_cb(struct _RtpSession *r, void *arg1, void *arg2, void *arg3) { return; } rtp_session_signal_connect(NULL, "", fake_cb, (void*) fake_cb);]] + )], + [AC_DEFINE([RTP_SIGNAL_PTR_CAST(arg)], [(void*)(arg)], + [rtp_session_signal_connect requires pointer parameter])], + [AC_DEFINE([RTP_SIGNAL_PTR_CAST(arg)], [(unsigned long)(arg)], + [rtp_session_signal_connect requires ulong parameter])]) +CFLAGS=$_cflags_save + + AC_OUTPUT( libosmoabis.pc libosmotrau.pc diff --git a/src/trau/osmo_ortp.c b/src/trau/osmo_ortp.c index c4e9d53..b2ee040 100644 --- a/src/trau/osmo_ortp.c +++ b/src/trau/osmo_ortp.c @@ -350,16 +350,19 @@ rtp_session_signal_connect(rs->sess, "ssrc_changed", (RtpCallback) ortp_sig_cb_ssrc, - (unsigned long) rs); + RTP_SIGNAL_PTR_CAST(rs)); + rtp_session_signal_connect(rs->sess, "payload_type_changed", (RtpCallback) ortp_sig_cb_pt, - (unsigned long) rs); + RTP_SIGNAL_PTR_CAST(rs)); + rtp_session_signal_connect(rs->sess, "network_error", (RtpCallback) ortp_sig_cb_net, - (unsigned long) rs); + RTP_SIGNAL_PTR_CAST(rs)); + rtp_session_signal_connect(rs->sess, "timestamp_jump", (RtpCallback) ortp_sig_cb_ts, - (unsigned long) rs); + RTP_SIGNAL_PTR_CAST(rs)); /* initialize according to the RFC */ rtp_session_set_seq_number(rs->sess, random()); -- To view, visit https://gerrit.osmocom.org/2990 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2dbd0498d75160358eca4336850e1a0ad2efdbeb Gerrit-PatchSet: 3 Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Owner: Pau Espin PedrolGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol
[MERGED] libosmocore[master]: pseudotalloc: Add simplistic implementation of talloc_asprintf
Harald Welte has submitted this change and it was merged. Change subject: pseudotalloc: Add simplistic implementation of talloc_asprintf .. pseudotalloc: Add simplistic implementation of talloc_asprintf fsm.c uses this function. When compiled with --enable-embedded, it triggers a warning: fsm.c: In function 'osmo_fsm_inst_alloc': fsm.c:213:4: warning: implicit declaration of function 'talloc_asprintf' [-Wimplicit-function-declaration] fi->name = talloc_asprintf(fi, "%s(%s)", fsm->name, id); Change-Id: I61cd83d4c8570af1e452c945ac6f194baf7e6ac4 --- M src/pseudotalloc/pseudotalloc.c M src/pseudotalloc/talloc.h 2 files changed, 17 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/pseudotalloc/pseudotalloc.c b/src/pseudotalloc/pseudotalloc.c index fe7f1ed..bc7a491 100644 --- a/src/pseudotalloc/pseudotalloc.c +++ b/src/pseudotalloc/pseudotalloc.c @@ -5,6 +5,7 @@ #include "talloc.h" #include +#include void *_talloc_zero(const void *ctx, size_t size, const char *name) { @@ -61,3 +62,18 @@ { return talloc_zero_size(ctx, el_size * count); } + +char *talloc_asprintf(const void *ctx, const char *fmt, ...) +{ + char *buf; + size_t len = 128; + va_list args; + va_start(args, fmt); + + buf = talloc_size(ctx, len); + if (len < vsnprintf(buf, len, fmt, args)) + strcpy([len-6], "[...]"); + + va_end(args); + return buf; +} diff --git a/src/pseudotalloc/talloc.h b/src/pseudotalloc/talloc.h index c7127de..f4c0a74 100644 --- a/src/pseudotalloc/talloc.h +++ b/src/pseudotalloc/talloc.h @@ -39,4 +39,4 @@ size_t el_size, unsigned count, const char *name); - +char *talloc_asprintf(const void *ctx, const char *fmt, ...); -- To view, visit https://gerrit.osmocom.org/2961 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I61cd83d4c8570af1e452c945ac6f194baf7e6ac4 Gerrit-PatchSet: 4 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Pau Espin PedrolGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr
[MERGED] libosmo-abis[master]: osmo_ortp.c: Fix warning: implicit use of function
Harald Welte has submitted this change and it was merged. Change subject: osmo_ortp.c: Fix warning: implicit use of function .. osmo_ortp.c: Fix warning: implicit use of function Explicitly state that we are using an internal API from ortp, and define the function we are using to avoid printing a warning. Change-Id: I9cadcb31ce7ade3632d83753be97fdc9ea518b5b --- M src/trau/osmo_ortp.c 1 file changed, 5 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/trau/osmo_ortp.c b/src/trau/osmo_ortp.c index 4e9df56..c4e9d53 100644 --- a/src/trau/osmo_ortp.c +++ b/src/trau/osmo_ortp.c @@ -199,6 +199,10 @@ return 0; } +/* Internal API coming from rtpsession_priv.h, used in osmo_rtcp_fd_cb */ +#pragma message ("Using internal ortp API: rtp_session_rtcp_rec") +int rtp_session_rtcp_recv(RtpSession * session); + static int osmo_rtcp_fd_cb(struct osmo_fd *fd, unsigned int what) { struct osmo_rtp_socket *rs = fd->data; @@ -360,7 +364,7 @@ /* initialize according to the RFC */ rtp_session_set_seq_number(rs->sess, random()); rs->tx_timestamp = random(); - + return rs; } -- To view, visit https://gerrit.osmocom.org/2989 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9cadcb31ce7ade3632d83753be97fdc9ea518b5b Gerrit-PatchSet: 2 Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Owner: Pau Espin PedrolGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
[MERGED] libosmocore[master]: osmo-sim-test.c: Remove unused functions
Harald Welte has submitted this change and it was merged. Change subject: osmo-sim-test.c: Remove unused functions .. osmo-sim-test.c: Remove unused functions Change-Id: I3060cfee8ece86c4c89a65f93c9f5424df0c410b --- M utils/osmo-sim-test.c 1 file changed, 0 insertions(+), 37 deletions(-) Approvals: Vadim Yanitskiy: Looks good to me, but someone else must approve Neels Hofmeyr: Looks good to me, approved Jenkins Builder: Verified diff --git a/utils/osmo-sim-test.c b/utils/osmo-sim-test.c index d5e932e..ea24120 100644 --- a/utils/osmo-sim-test.c +++ b/utils/osmo-sim-test.c @@ -91,22 +91,6 @@ return msg; } -/* 11.1.6 */ -static struct msgb *update_record_nr(struct osim_chan_hdl *st, uint8_t rec_nr, -const uint8_t *data, uint16_t rec_size) -{ - struct msgb *msg; - uint8_t *cur; - - msg = osim_new_apdumsg(0x00, 0xDC, rec_nr, 0x04, rec_size, 0); - cur = msgb_put(msg, rec_size); - memcpy(cur, data, rec_size); - - osim_transceive_apdu(st, msg); - - return msg; -} - /* 11.1.3 */ static struct msgb *read_binary(struct osim_chan_hdl *st, uint16_t offset, uint16_t len) { @@ -121,27 +105,6 @@ return msg; } - -/* 11.1.4 */ -static struct msgb *update_binary(struct osim_chan_hdl *st, uint16_t offset, - const uint8_t *data, uint16_t len) -{ - struct msgb *msg; - uint8_t *cur; - - if (offset > 0x7fff || len > 256) - return NULL; - - msg = osim_new_apdumsg(0x00, 0xD6, offset >> 8, offset & 0xff, len & 0xff, 0); - cur = msgb_put(msg, len); - memcpy(cur, data, len); - - osim_transceive_apdu(st, msg); - - return msg; -} - - static int dump_fcp_template(struct tlv_parsed *tp) { -- To view, visit https://gerrit.osmocom.org/2957 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3060cfee8ece86c4c89a65f93c9f5424df0c410b Gerrit-PatchSet: 5 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Pau Espin PedrolGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy
[MERGED] libosmo-abis[master]: configure.ac: Use -Wall in C(PP)FLAGS
Harald Welte has submitted this change and it was merged. Change subject: configure.ac: Use -Wall in C(PP)FLAGS .. configure.ac: Use -Wall in C(PP)FLAGS Change-Id: I5033387e4a4206f7d34d1db3c6ede9255d199941 --- M configure.ac 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index ff78035..535d1c3 100644 --- a/configure.ac +++ b/configure.ac @@ -26,6 +26,9 @@ AC_CONFIG_MACRO_DIR([m4]) +CFLAGS+=" -Wall" +CPPFLAGS+=" -Wall" + # The following test is taken from WebKit's webkit.m4 saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -fvisibility=hidden " -- To view, visit https://gerrit.osmocom.org/2991 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5033387e4a4206f7d34d1db3c6ede9255d199941 Gerrit-PatchSet: 3 Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Owner: Pau Espin PedrolGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
libosmo-abis[master]: osmo_ortp.c: Fix warning: check ortp API in rtp_session_sign...
Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/2990 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I2dbd0498d75160358eca4336850e1a0ad2efdbeb Gerrit-PatchSet: 3 Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Owner: Pau Espin PedrolGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No
[MERGED] libosmo-abis[master]: configure.ac: Use -Werror in C(PP)FLAGS
Harald Welte has submitted this change and it was merged. Change subject: configure.ac: Use -Werror in C(PP)FLAGS .. configure.ac: Use -Werror in C(PP)FLAGS Change-Id: Ic674bf28d781b9806dc023777e1fea4ee1a0257a --- M configure.ac 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index 535d1c3..b76545e 100644 --- a/configure.ac +++ b/configure.ac @@ -26,8 +26,8 @@ AC_CONFIG_MACRO_DIR([m4]) -CFLAGS+=" -Wall" -CPPFLAGS+=" -Wall" +CFLAGS+=" -Wall -Werror" +CPPFLAGS+=" -Wall -Werror" # The following test is taken from WebKit's webkit.m4 saved_CFLAGS="$CFLAGS" -- To view, visit https://gerrit.osmocom.org/2992 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic674bf28d781b9806dc023777e1fea4ee1a0257a Gerrit-PatchSet: 3 Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Owner: Pau Espin PedrolGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
osmo-trx[master]: sigProcLib: Specify standard namespace for isnan()
Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/2977 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I49328c43fdd690a4e6a2b2e949411aaf5674ead1 Gerrit-PatchSet: 2 Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Owner: Tom TsouGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Tom Tsou Gerrit-HasComments: No
[MERGED] osmo-trx[master]: sigProcLib: Specify standard namespace for isnan()
Tom Tsou has submitted this change and it was merged. Change subject: sigProcLib: Specify standard namespace for isnan() .. sigProcLib: Specify standard namespace for isnan() In commit a3dce85f "sigProcLib: Use explicit NaN check in sinc table generation" Use of std::isnan(double) was added without namespace specifier, which may cause build issues depending on whether the C version isnan() call is available. Add standard namespace to force C++ call usage and potential build issues. Change-Id: I49328c43fdd690a4e6a2b2e949411aaf5674ead1 --- M Transceiver52M/sigProcLib.cpp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Tom Tsou: Looks good to me, approved Harald Welte: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/Transceiver52M/sigProcLib.cpp b/Transceiver52M/sigProcLib.cpp index 9d1ef49..e94170b 100644 --- a/Transceiver52M/sigProcLib.cpp +++ b/Transceiver52M/sigProcLib.cpp @@ -982,7 +982,7 @@ for (int i = 0; i < TABLESIZE; i++) { auto x = (double) i / TABLESIZE * 8 * M_PI; auto y = sin(x) / x; -sincTable[i] = isnan(y) ? 1.0 : y; +sincTable[i] = std::isnan(y) ? 1.0 : y; } } -- To view, visit https://gerrit.osmocom.org/2977 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I49328c43fdd690a4e6a2b2e949411aaf5674ead1 Gerrit-PatchSet: 2 Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Owner: Tom TsouGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Tom Tsou
[MERGED] osmo-trx[master]: sigProcLib: Replace dynamically allocated resampling buffers
Tom Tsou has submitted this change and it was merged. Change subject: sigProcLib: Replace dynamically allocated resampling buffers .. sigProcLib: Replace dynamically allocated resampling buffers Instead use object allocated STL vectors. This simplifies code, removes the need to explicitly release buffers, and fixes a memory leak in destructor deallocation. Also, remove simplified init and release sub-calls. Maintain partition filter allocation using memalign() for SIMD alignment requirements. Change-Id: Ie836982794c10fb1b6334e40592d44b200454846 --- M Transceiver52M/Resampler.cpp M Transceiver52M/Resampler.h 2 files changed, 39 insertions(+), 76 deletions(-) Approvals: Tom Tsou: Looks good to me, approved Harald Welte: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/Transceiver52M/Resampler.cpp b/Transceiver52M/Resampler.cpp index 1927e45..6b9621c 100644 --- a/Transceiver52M/Resampler.cpp +++ b/Transceiver52M/Resampler.cpp @@ -22,6 +22,7 @@ #include #include #include +#include #include "Resampler.h" @@ -35,6 +36,8 @@ #define MAX_OUTPUT_LEN 4096 +using namespace std; + static float sinc(float x) { if (x == 0.0) @@ -43,32 +46,19 @@ return sin(M_PI * x) / (M_PI * x); } -bool Resampler::initFilters(float bw) +void Resampler::initFilters(float bw) { - size_t proto_len = p * filt_len; - float *proto, val, cutoff; + float cutoff; float sum = 0.0f, scale = 0.0f; - float midpt = (float) (proto_len - 1.0) / 2.0; /* * Allocate partition filters and the temporary prototype filter * according to numerator of the rational rate. Coefficients are * real only and must be 16-byte memory aligned for SSE usage. */ - proto = new float[proto_len]; - if (!proto) - return false; - - partitions = (float **) malloc(sizeof(float *) * p); - if (!partitions) { - delete[] proto; - return false; - } - - for (size_t i = 0; i < p; i++) { - partitions[i] = (float *) - memalign(16, filt_len * 2 * sizeof(float)); - } + auto proto = vector(p * filt_len); + for (auto : partitions) + part = (complex *) memalign(16, filt_len * sizeof(complex)); /* * Generate the prototype filter with a Blackman-harris window. @@ -85,47 +75,26 @@ else cutoff = (float) q; - for (size_t i = 0; i < proto_len; i++) { + float midpt = (proto.size() - 1) / 2.0; + for (size_t i = 0; i < proto.size(); i++) { proto[i] = sinc(((float) i - midpt) / cutoff * bw); proto[i] *= a0 - - a1 * cos(2 * M_PI * i / (proto_len - 1)) + - a2 * cos(4 * M_PI * i / (proto_len - 1)) - - a3 * cos(6 * M_PI * i / (proto_len - 1)); + a1 * cos(2 * M_PI * i / (proto.size() - 1)) + + a2 * cos(4 * M_PI * i / (proto.size() - 1)) - + a3 * cos(6 * M_PI * i / (proto.size() - 1)); sum += proto[i]; } scale = p / sum; /* Populate filter partitions from the prototype filter */ for (size_t i = 0; i < filt_len; i++) { - for (size_t n = 0; n < p; n++) { - partitions[n][2 * i + 0] = proto[i * p + n] * scale; - partitions[n][2 * i + 1] = 0.0f; - } + for (size_t n = 0; n < p; n++) + partitions[n][i] = complex(proto[i * p + n] * scale); } - /* For convolution, we store the filter taps in reverse */ - for (size_t n = 0; n < p; n++) { - for (size_t i = 0; i < filt_len / 2; i++) { - val = partitions[n][2 * i]; - partitions[n][2 * i] = partitions[n][2 * (filt_len - 1 - i)]; - partitions[n][2 * (filt_len - 1 - i)] = val; - } - } - - delete[] proto; - - return true; -} - -void Resampler::releaseFilters() -{ - if (partitions) { - for (size_t i = 0; i < p; i++) - free(partitions[i]); - } - - free(partitions); - partitions = NULL; + /* Store filter taps in reverse */ + for (auto : partitions) + reverse([0], [filt_len]); } static bool check_vec_len(int in_len, int out_len, int p, int q) @@ -159,14 +128,6 @@ return true; } -void Resampler::computePath() -{ - for (int i = 0; i < MAX_OUTPUT_LEN; i++) { - in_index[i] = (q * i) / p; - out_path[i] = (q * i) % p; - } -} - int Resampler::rotate(const float *in, size_t in_len, float *out, size_t out_len) {
osmo-trx[master]: sigProcLib: Replace dynamically allocated resampling buffers
Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/2978 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie836982794c10fb1b6334e40592d44b200454846 Gerrit-PatchSet: 2 Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Owner: Tom TsouGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Tom Tsou Gerrit-HasComments: No
[PATCH] libosmo-abis[master]: osmo_ortp.c: Fix warning: check ortp API in rtp_session_sign...
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/2990 to look at the new patch set (#3). osmo_ortp.c: Fix warning: check ortp API in rtp_session_signal_connect Since ortp commit 5ab29c50adc7948b11449e3aeee66010379ff7dc preceeding ortp 0.24, the API is fixed and requests a pointer instead of an unsigned long. As we now require at least ortp 0.22 since libosmo-abis 15d9b7929d449e4138bcb003c614035bceadc3d1, we need to support both old and new version of the API to continue having support for 0.22 but still supporting new versions of the library. Change-Id: I2dbd0498d75160358eca4336850e1a0ad2efdbeb --- M configure.ac M src/trau/osmo_ortp.c 2 files changed, 21 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/90/2990/3 diff --git a/configure.ac b/configure.ac index 9b2f189..ff78035 100644 --- a/configure.ac +++ b/configure.ac @@ -72,6 +72,20 @@ [ortp_set_log_level_mask has no domain parameter])]) CFLAGS=$_cflags_save +_cflags_save=$CFLAGS +CFLAGS="$CFLAGS $ORTP_CFLAGS" +AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#include ]], + [[void fake_cb(struct _RtpSession *r, void *arg1, void *arg2, void *arg3) { return; } rtp_session_signal_connect(NULL, "", fake_cb, (void*) fake_cb);]] + )], + [AC_DEFINE([RTP_SIGNAL_PTR_CAST(arg)], [(void*)(arg)], + [rtp_session_signal_connect requires pointer parameter])], + [AC_DEFINE([RTP_SIGNAL_PTR_CAST(arg)], [(unsigned long)(arg)], + [rtp_session_signal_connect requires ulong parameter])]) +CFLAGS=$_cflags_save + + AC_OUTPUT( libosmoabis.pc libosmotrau.pc diff --git a/src/trau/osmo_ortp.c b/src/trau/osmo_ortp.c index c4e9d53..b2ee040 100644 --- a/src/trau/osmo_ortp.c +++ b/src/trau/osmo_ortp.c @@ -350,16 +350,19 @@ rtp_session_signal_connect(rs->sess, "ssrc_changed", (RtpCallback) ortp_sig_cb_ssrc, - (unsigned long) rs); + RTP_SIGNAL_PTR_CAST(rs)); + rtp_session_signal_connect(rs->sess, "payload_type_changed", (RtpCallback) ortp_sig_cb_pt, - (unsigned long) rs); + RTP_SIGNAL_PTR_CAST(rs)); + rtp_session_signal_connect(rs->sess, "network_error", (RtpCallback) ortp_sig_cb_net, - (unsigned long) rs); + RTP_SIGNAL_PTR_CAST(rs)); + rtp_session_signal_connect(rs->sess, "timestamp_jump", (RtpCallback) ortp_sig_cb_ts, - (unsigned long) rs); + RTP_SIGNAL_PTR_CAST(rs)); /* initialize according to the RFC */ rtp_session_set_seq_number(rs->sess, random()); -- To view, visit https://gerrit.osmocom.org/2990 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I2dbd0498d75160358eca4336850e1a0ad2efdbeb Gerrit-PatchSet: 3 Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Owner: Pau Espin PedrolGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol
[PATCH] libosmocore[master]: pseudotalloc: Add simplistic implementation of talloc_asprintf
Hello Neels Hofmeyr, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/2961 to look at the new patch set (#3). pseudotalloc: Add simplistic implementation of talloc_asprintf fsm.c uses this function. When compiled with --enable-embedded, it triggers a warning: fsm.c: In function 'osmo_fsm_inst_alloc': fsm.c:213:4: warning: implicit declaration of function 'talloc_asprintf' [-Wimplicit-function-declaration] fi->name = talloc_asprintf(fi, "%s(%s)", fsm->name, id); Change-Id: I61cd83d4c8570af1e452c945ac6f194baf7e6ac4 --- M src/pseudotalloc/pseudotalloc.c M src/pseudotalloc/talloc.h 2 files changed, 17 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/61/2961/3 diff --git a/src/pseudotalloc/pseudotalloc.c b/src/pseudotalloc/pseudotalloc.c index fe7f1ed..bc7a491 100644 --- a/src/pseudotalloc/pseudotalloc.c +++ b/src/pseudotalloc/pseudotalloc.c @@ -5,6 +5,7 @@ #include "talloc.h" #include +#include void *_talloc_zero(const void *ctx, size_t size, const char *name) { @@ -61,3 +62,18 @@ { return talloc_zero_size(ctx, el_size * count); } + +char *talloc_asprintf(const void *ctx, const char *fmt, ...) +{ + char *buf; + size_t len = 128; + va_list args; + va_start(args, fmt); + + buf = talloc_size(ctx, len); + if (len < vsnprintf(buf, len, fmt, args)) + strcpy([len-6], "[...]"); + + va_end(args); + return buf; +} diff --git a/src/pseudotalloc/talloc.h b/src/pseudotalloc/talloc.h index c7127de..f4c0a74 100644 --- a/src/pseudotalloc/talloc.h +++ b/src/pseudotalloc/talloc.h @@ -39,4 +39,4 @@ size_t el_size, unsigned count, const char *name); - +char *talloc_asprintf(const void *ctx, const char *fmt, ...); -- To view, visit https://gerrit.osmocom.org/2961 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I61cd83d4c8570af1e452c945ac6f194baf7e6ac4 Gerrit-PatchSet: 3 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Pau Espin PedrolGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr
[MERGED] libosmocore[master]: cosmetic: remove API documentation strings in header file
Harald Welte has submitted this change and it was merged. Change subject: cosmetic: remove API documentation strings in header file .. cosmetic: remove API documentation strings in header file Typically we don't place comments with the function declarations in .h files. Not sure why this file has comments for each. The API doc belongs in the .c file as proper doxygen comments, and shouldn't be duplicated in the .h file. In this particular case, doxygen comments are added in the corresponding c file recently. Change-Id: I5c4cb55be5ec59a6945b1720b875c5987f1cfaad --- M include/osmocom/gsm/gsm0808_utils.h 1 file changed, 0 insertions(+), 24 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/gsm/gsm0808_utils.h b/include/osmocom/gsm/gsm0808_utils.h index cb53e0c..0937630 100644 --- a/include/osmocom/gsm/gsm0808_utils.h +++ b/include/osmocom/gsm/gsm0808_utils.h @@ -23,55 +23,31 @@ #include -/* Encode AoIP transport address element */ uint8_t gsm0808_enc_aoip_trasp_addr(struct msgb *msg, const struct sockaddr_storage *ss); - -/* Decode AoIP transport address element */ int gsm0808_dec_aoip_trasp_addr(struct sockaddr_storage *ss, const uint8_t *elem, uint8_t len); - -/* Encode Speech Codec element */ uint8_t gsm0808_enc_speech_codec(struct msgb *msg, const struct gsm0808_speech_codec *sc); - -/* Decode Speech Codec element */ int gsm0808_dec_speech_codec(struct gsm0808_speech_codec *sc, const uint8_t *elem, uint8_t len); - -/* Encode Speech Codec list */ uint8_t gsm0808_enc_speech_codec_list(struct msgb *msg, const struct gsm0808_speech_codec_list *scl); - -/* Decode Speech Codec list */ int gsm0808_dec_speech_codec_list(struct gsm0808_speech_codec_list *scl, const uint8_t *elem, uint8_t len); - -/* Encode Channel Type element */ uint8_t gsm0808_enc_channel_type(struct msgb *msg, const struct gsm0808_channel_type *ct); - -/* Decode Channel Type element */ int gsm0808_dec_channel_type(struct gsm0808_channel_type *ct, const uint8_t *elem, uint8_t len); - -/* Encode Encryption Information element */ uint8_t gsm0808_enc_encrypt_info(struct msgb *msg, const struct gsm0808_encrypt_info *ei); - -/* Decode Encryption Information element */ int gsm0808_dec_encrypt_info(struct gsm0808_encrypt_info *ei, const uint8_t *elem, uint8_t len); - -/* Encode Cell Identifier List element */ uint8_t gsm0808_enc_cell_id_list(struct msgb *msg, const struct gsm0808_cell_id_list *cil); - -/* Decode Cell Identifier List element */ int gsm0808_dec_cell_id_list(struct gsm0808_cell_id_list *cil, const uint8_t *elem, uint8_t len); - int gsm0808_chan_type_to_speech_code(uint8_t perm_spch); int gsm0808_speech_codec_from_chan_type(struct gsm0808_speech_codec *sc, uint8_t perm_spch); -- To view, visit https://gerrit.osmocom.org/2936 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5c4cb55be5ec59a6945b1720b875c5987f1cfaad Gerrit-PatchSet: 7 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: dexterGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr
[MERGED] libosmocore[master]: gsm0808: add default speech codec configuration
Harald Welte has submitted this change and it was merged. Change subject: gsm0808: add default speech codec configuration .. gsm0808: add default speech codec configuration In an AoIP scenario, the speech codec list field specifies the codecs used in the RTP interface. This patch adds a table with default codec configurations that match the codec configurations that are also used on the air interface. Change-Id: I9dc0165d76a022b2c1b7418bc3133407e61b7261 --- M include/osmocom/gsm/protocol/gsm_08_08.h 1 file changed, 21 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/gsm/protocol/gsm_08_08.h b/include/osmocom/gsm/protocol/gsm_08_08.h index 9e00d23..d165330 100644 --- a/include/osmocom/gsm/protocol/gsm_08_08.h +++ b/include/osmocom/gsm/protocol/gsm_08_08.h @@ -449,6 +449,27 @@ uint16_t cfg; }; +/*! \brief Default speech codec configurations: Some codecs specified with + * struct gsm0808_speech_codec, require a configuration (cfg). The following + * default configuration will configure the codec (RTP) to match the + * configuration that is used on the air interface (Um). + * + * Default values for FR_AMR, HR_AMR and OHR_AMR: + * See also: 3GPP TS 28.062, Table 7.11.3.1.3-2: Preferred + * Configurations for the Adaptive Multi-Rate Codec Types + * + * Default values for FR_AMR_WB, OFR_AMR_WB and OHR_AMR_WB: + * See also: 3GPP TS 26.103, Table 5.7-1: Allowed Configurations + * for the Adaptive Multi-Rate - Wideband Codec Types */ +enum gsm0808_speech_codec_defaults { + GSM0808_SC_CFG_DEFAULT_FR_AMR = 0x, + GSM0808_SC_CFG_DEFAULT_HR_AMR = 0x073f, + GSM0808_SC_CFG_DEFAULT_OHR_AMR = 0x, + GSM0808_SC_CFG_DEFAULT_FR_AMR_WB= 0x01, + GSM0808_SC_CFG_DEFAULT_OFR_AMR_WB = 0x3f, + GSM0808_SC_CFG_DEFAULT_OHR_AMR_WB = 0x01, +}; + /* 3GPP TS 48.008 3.2.2.103 Speech Codec List */ #define SPEECH_CODEC_MAXLEN 255 struct gsm0808_speech_codec_list { -- To view, visit https://gerrit.osmocom.org/2829 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9dc0165d76a022b2c1b7418bc3133407e61b7261 Gerrit-PatchSet: 9 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: dexterGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr
[MERGED] libosmocore[master]: gsm0808: add function gsm0808_speech_codec_from_chan_type()
Harald Welte has submitted this change and it was merged. Change subject: gsm0808: add function gsm0808_speech_codec_from_chan_type() .. gsm0808: add function gsm0808_speech_codec_from_chan_type() The contents of the speech codec element (struct gsm0808_speech_codec), that is also used in the speech codec list element (struct gsm0808_speech_codec_list) can be generated directly from the permitted speech parameter in the channel type field (struct gsm0808_channel_type) when full AoIP with compressed speech via RTP/UDP/IP is assumed and when the codec configuration on the air interface exactly matches the codec configuration on the IP backhaul. This patch adds a function that can be used as a helper to fill out spech codec fields by only giving a permitted speech parameter as input. Change-Id: I257c972e9fdf0dfe940a8d483447085bd62e50a2 --- M include/osmocom/gsm/gsm0808_utils.h M src/gsm/gsm0808_utils.c M src/gsm/libosmogsm.map 3 files changed, 57 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/gsm/gsm0808_utils.h b/include/osmocom/gsm/gsm0808_utils.h index b510644..cb53e0c 100644 --- a/include/osmocom/gsm/gsm0808_utils.h +++ b/include/osmocom/gsm/gsm0808_utils.h @@ -73,3 +73,5 @@ const uint8_t *elem, uint8_t len); int gsm0808_chan_type_to_speech_code(uint8_t perm_spch); +int gsm0808_speech_codec_from_chan_type(struct gsm0808_speech_codec *sc, + uint8_t perm_spch); diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c index 64ffec4..00da04b 100644 --- a/src/gsm/gsm0808_utils.c +++ b/src/gsm/gsm0808_utils.c @@ -682,4 +682,58 @@ return -EINVAL; } +/*! \brief Extrapolate a speech codec field from a given permitted speech + * parameter (channel type). + * \param[out] sc Caller provided memory to store the resulting speech codec + * \param[in] perm_spch value that is used to derive the speech codec info + * (see also: enum gsm0808_speech_codec_type in gsm0808_utils.h) + * \returns zero when successful; negative on error */ +int gsm0808_speech_codec_from_chan_type(struct gsm0808_speech_codec *sc, + uint8_t perm_spch) +{ + int rc; + + memset(sc, 0, sizeof(*sc)); + + /* Determine codec type */ + rc = gsm0808_chan_type_to_speech_codec(perm_spch); + if (rc < 0) + return -EINVAL; + sc->type = (uint8_t) rc; + + /* Depending on the speech codec type, pick a default codec +* configuration that exactly matches the configuration on the +* air interface. */ + switch (sc->type) { + case GSM0808_SCT_FR3: + sc->cfg = GSM0808_SC_CFG_DEFAULT_FR_AMR; + break; + case GSM0808_SCT_FR4: + sc->cfg = GSM0808_SC_CFG_DEFAULT_OFR_AMR_WB; + break; + case GSM0808_SCT_FR5: + sc->cfg = GSM0808_SC_CFG_DEFAULT_FR_AMR_WB; + break; + case GSM0808_SCT_HR3: + sc->cfg = GSM0808_SC_CFG_DEFAULT_HR_AMR; + break; + case GSM0808_SCT_HR4: + sc->cfg = GSM0808_SC_CFG_DEFAULT_OHR_AMR_WB; + break; + case GSM0808_SCT_HR6: + sc->cfg = GSM0808_SC_CFG_DEFAULT_OHR_AMR; + break; + default: + /* Note: Not all codec types specify a default setting, +* in this case, we just set the field to zero. */ + sc->cfg = 0; + } + + /* Tag all codecs as "Full IP" +* (see als 3GPP TS 48.008 3.2.2.103) */ + sc->fi = true; + + return 0; +} + /*! @} */ diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index ccc5b9a..36cba39 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -163,6 +163,7 @@ gsm0808_enc_cell_id_list; gsm0808_dec_cell_id_list; gsm0808_convert_to_speech_codec_type; +gsm0808_extrapolate_speech_codec; gsm0858_rsl_ul_meas_enc; -- To view, visit https://gerrit.osmocom.org/2831 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I257c972e9fdf0dfe940a8d483447085bd62e50a2 Gerrit-PatchSet: 10 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: dexterGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr
[MERGED] libosmocore[master]: gsm0808: fix AoIP speech codec element parser/generator
Harald Welte has submitted this change and it was merged. Change subject: gsm0808: fix AoIP speech codec element parser/generator .. gsm0808: fix AoIP speech codec element parser/generator The implementation of the parser/generator for the speech codec information element slightly wrong, making it impossible to use it properly. (See also: 3GPP TS 48.008, 3.2.2.103) Change-Id: Idabb0f9620659557672e1c6b90c75481192e5c89 --- M include/osmocom/gsm/protocol/gsm_08_08.h M src/gsm/gsm0808_utils.c M tests/gsm0808/gsm0808_test.c 3 files changed, 136 insertions(+), 79 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/gsm/protocol/gsm_08_08.h b/include/osmocom/gsm/protocol/gsm_08_08.h index 7656c38..9e00d23 100644 --- a/include/osmocom/gsm/protocol/gsm_08_08.h +++ b/include/osmocom/gsm/protocol/gsm_08_08.h @@ -447,8 +447,6 @@ bool tf; uint8_t type; uint16_t cfg; - bool type_extended; - bool cfg_present; }; /* 3GPP TS 48.008 3.2.2.103 Speech Codec List */ diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c index bdd02e5..60fb91c 100644 --- a/src/gsm/gsm0808_utils.c +++ b/src/gsm/gsm0808_utils.c @@ -151,6 +151,32 @@ /* See also 3GPP TS 48.008 3.2.2.103 Speech Codec List */ uint8_t header = 0; uint8_t *old_tail; + bool type_extended; + + /* Note: Extended codec types are codec types that require 8 instead +* of 4 bit to fully specify the selected codec. In the following, +* we check if we work with an extended type or not. We also check +* if the codec type is valid at all. */ + switch(sc->type) { + case GSM0808_SCT_FR1: + case GSM0808_SCT_FR2: + case GSM0808_SCT_FR3: + case GSM0808_SCT_FR4: + case GSM0808_SCT_FR5: + case GSM0808_SCT_HR1: + case GSM0808_SCT_HR3: + case GSM0808_SCT_HR4: + case GSM0808_SCT_HR6: + type_extended = false; + break; + case GSM0808_SCT_CSD: + type_extended = true; + break; + default: + /* Invalid codec type specified */ + OSMO_ASSERT(false); + break; + } old_tail = msg->tail; @@ -162,20 +188,37 @@ header |= (1 << 5); if (sc->tf) header |= (1 << 4); - if (sc->type_extended) { + + if (type_extended) { header |= 0x0f; msgb_put_u8(msg, header); + msgb_put_u8(msg, sc->type); } else { OSMO_ASSERT(sc->type < 0x0f); header |= sc->type; msgb_put_u8(msg, header); - return (uint8_t) (msg->tail - old_tail); } - msgb_put_u8(msg, sc->type); - - if (sc->cfg_present) + /* Note: Whether a configuration is present or not depends on the +* selected codec type. If present, it can either consist of one +* or two octets, depending on the codec type */ + switch (sc->type) { + case GSM0808_SCT_FR3: + case GSM0808_SCT_HR3: + case GSM0808_SCT_HR6: msgb_put_u16(msg, sc->cfg); + break; + case GSM0808_SCT_FR4: + case GSM0808_SCT_FR5: + case GSM0808_SCT_HR4: + case GSM0808_SCT_CSD: + OSMO_ASSERT((sc->cfg & 0xff00) == 0) + msgb_put_u8(msg, (uint8_t) sc->cfg & 0xff); + break; + default: + OSMO_ASSERT(sc->cfg == 0); + break; + } return (uint8_t) (msg->tail - old_tail); } @@ -244,21 +287,42 @@ if ((header & 0x0F) != 0x0F) { sc->type = (header & 0x0F); - return (int)(elem - old_elem); + } else { + sc->type = *elem; + elem++; + len--; } - sc->type = *elem; - elem++; - len--; - - sc->type_extended = true; - - if (len < 2) - return (int)(elem - old_elem); - - sc->cfg = osmo_load16be(elem); - elem += 2; - sc->cfg_present = true; + /* Note: Whether a configuration is present or not depends on the +* selected codec type. If present, it can either consist of one or +* two octets depending on the codec type */ + switch (sc->type) { + case GSM0808_SCT_FR1: + case GSM0808_SCT_FR2: + case GSM0808_SCT_HR1: + break; + case GSM0808_SCT_HR4: + case GSM0808_SCT_CSD: + case GSM0808_SCT_FR4: + case GSM0808_SCT_FR5: + if (len < 1) + return -EINVAL; + sc->cfg = *elem; + elem++; + break; + case GSM0808_SCT_FR3: + case GSM0808_SCT_HR3: + case GSM0808_SCT_HR6: + if (len < 2) +
[MERGED] libosmocore[master]: gsm0808: add function gsm0808_chan_type_to_speech_code()
Harald Welte has submitted this change and it was merged. Change subject: gsm0808: add function gsm0808_chan_type_to_speech_code() .. gsm0808: add function gsm0808_chan_type_to_speech_code() The permitted speech field used in channel type element (struct gsm0808_channel_type) uses a different representation as the type field in the speech codec element (struct gsm0808_speech_codec) This patch adds a function to convert from permitted speech to speech codec type. Change-Id: Ib26a9c20864459b2baaa04f49b6e7902ba44b7cb --- M include/osmocom/gsm/gsm0808_utils.h M src/gsm/gsm0808_utils.c M src/gsm/libosmogsm.map 3 files changed, 40 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/gsm/gsm0808_utils.h b/include/osmocom/gsm/gsm0808_utils.h index c11bf8d..b510644 100644 --- a/include/osmocom/gsm/gsm0808_utils.h +++ b/include/osmocom/gsm/gsm0808_utils.h @@ -71,3 +71,5 @@ /* Decode Cell Identifier List element */ int gsm0808_dec_cell_id_list(struct gsm0808_cell_id_list *cil, const uint8_t *elem, uint8_t len); + +int gsm0808_chan_type_to_speech_code(uint8_t perm_spch); diff --git a/src/gsm/gsm0808_utils.c b/src/gsm/gsm0808_utils.c index 60fb91c..64ffec4 100644 --- a/src/gsm/gsm0808_utils.c +++ b/src/gsm/gsm0808_utils.c @@ -645,4 +645,41 @@ return (int)(elem - old_elem); } +/*! \brief Convert the representation of the permitted speech codec identifier + * that is used in struct gsm0808_channel_type to the speech codec + * representation we use in struct gsm0808_speech_codec. + * \param[in] perm_spch to be converted (see also gsm0808_permitted_speech) + * \returns GSM speech codec type; negative on error */ +int gsm0808_chan_type_to_speech_codec(uint8_t perm_spch) +{ + /*! The speech codec type, which is used in the channel type field to +* signal the permitted speech versions (codecs) has a different +* encoding than the type field in the speech codec type element +* (See also 3GPP TS 48.008, 3.2.2.11 and 3.2.2.103) */ + + switch (perm_spch) { + case GSM0808_PERM_FR1: + return GSM0808_SCT_FR1; + case GSM0808_PERM_FR2: + return GSM0808_SCT_FR2; + case GSM0808_PERM_FR3: + return GSM0808_SCT_FR3; + case GSM0808_PERM_FR4: + return GSM0808_SCT_FR4; + case GSM0808_PERM_FR5: + return GSM0808_SCT_FR5; + case GSM0808_PERM_HR1: + return GSM0808_SCT_HR1; + case GSM0808_PERM_HR3: + return GSM0808_SCT_HR3; + case GSM0808_PERM_HR4: + return GSM0808_SCT_HR4; + case GSM0808_PERM_HR6: + return GSM0808_SCT_HR6; + } + + /* Invalid input */ + return -EINVAL; +} + /*! @} */ diff --git a/src/gsm/libosmogsm.map b/src/gsm/libosmogsm.map index 9613c4e..ccc5b9a 100644 --- a/src/gsm/libosmogsm.map +++ b/src/gsm/libosmogsm.map @@ -162,6 +162,7 @@ gsm0808_dec_encrypt_info; gsm0808_enc_cell_id_list; gsm0808_dec_cell_id_list; +gsm0808_convert_to_speech_codec_type; gsm0858_rsl_ul_meas_enc; -- To view, visit https://gerrit.osmocom.org/2830 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib26a9c20864459b2baaa04f49b6e7902ba44b7cb Gerrit-PatchSet: 10 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: dexterGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr
libosmocore[master]: cosmetic: remove API documentation strings in header file
Patch Set 6: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/2936 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I5c4cb55be5ec59a6945b1720b875c5987f1cfaad Gerrit-PatchSet: 6 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: dexterGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: No
libosmocore[master]: gsm0808: add function gsm0808_chan_type_to_speech_code()
Patch Set 9: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/2830 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib26a9c20864459b2baaa04f49b6e7902ba44b7cb Gerrit-PatchSet: 9 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: dexterGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: No
[MERGED] libosmocore[master]: abis_test.c: Fix warning appearing on some buggy gcc versions
Harald Welte has submitted this change and it was merged. Change subject: abis_test.c: Fix warning appearing on some buggy gcc versions .. abis_test.c: Fix warning appearing on some buggy gcc versions Change-Id: I31d5ffc0cf461d207d6c3d43aa0a25a5448d7000 --- M tests/abis/abis_test.c 1 file changed, 4 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified Objections: Max: I would prefer this is not merged as is diff --git a/tests/abis/abis_test.c b/tests/abis/abis_test.c index a303c91..cb88b01 100644 --- a/tests/abis/abis_test.c +++ b/tests/abis/abis_test.c @@ -122,7 +122,8 @@ static inline void chk_raw(const char *what, const uint8_t *data, uint16_t len) { - struct abis_nm_sw_desc sw = { 0 }; + /* = { 0 } triggers a warning in some gcc versions due to a bug: gcc issue #53119 */ + struct abis_nm_sw_desc sw = { {0} }; int res = abis_nm_get_sw_conf(data, len, , 1); uint16_t xlen = abis_nm_get_sw_desc_len(data, len); @@ -144,7 +145,8 @@ { int res; uint16_t len; - struct abis_nm_sw_desc sw = { 0 }, put = { + /* = { 0 } triggers a warning in some gcc versions due to a bug: gcc issue #53119 */ + struct abis_nm_sw_desc sw = { {0} }, put = { .file_id_len = strlen(f_id), .file_version_len = strlen(f_ver), }; -- To view, visit https://gerrit.osmocom.org/2955 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I31d5ffc0cf461d207d6c3d43aa0a25a5448d7000 Gerrit-PatchSet: 2 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Pau Espin PedrolGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-Reviewer: Vadim Yanitskiy
libosmocore[master]: pseudotalloc: Add simplistic implementation of talloc_asprintf
Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/2961/2/src/pseudotalloc/pseudotalloc.c File src/pseudotalloc/pseudotalloc.c: Line 66: char *talloc_asprintf(const void *ctx, const char *fmt, ...) { coding style -- To view, visit https://gerrit.osmocom.org/2961 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I61cd83d4c8570af1e452c945ac6f194baf7e6ac4 Gerrit-PatchSet: 2 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Pau Espin PedrolGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: Yes
libosmocore[master]: Fix warnings: tolower() and similar require uchar
Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/2963 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I3fed2ab6a4efba9f8a21fcf84a5b3a91e8df084f Gerrit-PatchSet: 2 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Pau Espin PedrolGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: No
osmo-bts[master]: lc15: make jenkins helper executable
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3004 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Icf06040d77180fb9d877ca52e00171b21b634ef8 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: MaxGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: No
[MERGED] osmo-bts[master]: lc15: make jenkins helper executable
Harald Welte has submitted this change and it was merged. Change subject: lc15: make jenkins helper executable .. lc15: make jenkins helper executable Change-Id: Icf06040d77180fb9d877ca52e00171b21b634ef8 Related: SYS#3682 --- M contrib/jenkins_lc15.sh 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/jenkins_lc15.sh b/contrib/jenkins_lc15.sh old mode 100644 new mode 100755 -- To view, visit https://gerrit.osmocom.org/3004 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icf06040d77180fb9d877ca52e00171b21b634ef8 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: MaxGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr
libosmo-abis[master]: configure.ac: Use -Werror in C(PP)FLAGS
Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/2992 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic674bf28d781b9806dc023777e1fea4ee1a0257a Gerrit-PatchSet: 2 Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Owner: Pau Espin PedrolGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
libosmo-abis[master]: osmo_ortp.c: Fix warning: check ortp API in rtp_session_sign...
Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/2990/2/src/trau/osmo_ortp.c File src/trau/osmo_ortp.c: Line 353: #if HAVE_SIGNAL_CONNECT_PTR_TYPE why not simply hide this in a #define macro to avoid spreasding four copies of this around? Something like RTP_SIGNAL_PTR_CAST which then expands? -- To view, visit https://gerrit.osmocom.org/2990 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I2dbd0498d75160358eca4336850e1a0ad2efdbeb Gerrit-PatchSet: 2 Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Owner: Pau Espin PedrolGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: Yes
[PATCH] osmo-bts[master]: Add missing include for abis.h header file
Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/3003 to look at the new patch set (#2). Add missing include for abis.h header file This fixes compilation warning: implicit declaration of function ‘abis_bts_rsl_sendmsg’ Change-Id: I956561b2f953c7d380a26442fad84bc8262ea129 --- M src/common/l1sap.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/03/3003/2 diff --git a/src/common/l1sap.c b/src/common/l1sap.c index b9104b7..3e0a6cc 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include -- To view, visit https://gerrit.osmocom.org/3003 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I956561b2f953c7d380a26442fad84bc8262ea129 Gerrit-PatchSet: 2 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: MaxGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max
[MERGED] osmo-pcu[master]: lc15: use environment for firmware version
Max has submitted this change and it was merged. Change subject: lc15: use environment for firmware version .. lc15: use environment for firmware version This allows to specify firmware version to use by jenkins builder via environment variable. If environment variable does not exist than default master branch is used. Change-Id: If8b249aa00270e60a0449f089a16823976e54d54 Related: SYS#3683 --- M contrib/jenkins.sh 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 9c5c2e2..5222476 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -32,7 +32,7 @@ elif [ "$with_dsp" = lc15 ]; then PCU_CONFIG="$PCU_CONFIG --enable-lc15bts-phy --with-litecell15=$deps/layer1-headers/inc" cd "$deps" - osmo-layer1-headers.sh lc15 + osmo-layer1-headers.sh lc15 "$FIRMWARE_VERSION" cd "$base" elif [ -z "$with_dsp" -o "$with_dsp" = none ]; then -- To view, visit https://gerrit.osmocom.org/3006 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: If8b249aa00270e60a0449f089a16823976e54d54 Gerrit-PatchSet: 2 Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Owner: MaxGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max
osmo-bts[master]: Add missing header file
Patch Set 1: Code-Review-1 you're not adding a header file, but an #include to a header file. please clarify. -- To view, visit https://gerrit.osmocom.org/3003 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I956561b2f953c7d380a26442fad84bc8262ea129 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: MaxGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-HasComments: No
[MERGED] osmo-pcu[master]: tests: remove unused definition
Harald Welte has submitted this change and it was merged. Change subject: tests: remove unused definition .. tests: remove unused definition Fix compilation warning. Change-Id: I1c95c6ec8bee68773643f9646b0319a83fbc6cfa --- M tests/emu/openbsc_clone.c 1 file changed, 0 insertions(+), 16 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/emu/openbsc_clone.c b/tests/emu/openbsc_clone.c index 575f4e1..424dff5 100644 --- a/tests/emu/openbsc_clone.c +++ b/tests/emu/openbsc_clone.c @@ -41,22 +41,6 @@ #define N202 4 #define CRC24_LENGTH 3 -static const struct value_string llc_cmd_strs[] = { - { GPRS_LLC_NULL,"NULL" }, - { GPRS_LLC_RR, "RR" }, - { GPRS_LLC_ACK, "ACK" }, - { GPRS_LLC_RNR, "RNR" }, - { GPRS_LLC_SACK,"SACK" }, - { GPRS_LLC_DM, "DM" }, - { GPRS_LLC_DISC,"DISC" }, - { GPRS_LLC_UA, "UA" }, - { GPRS_LLC_SABM,"SABM" }, - { GPRS_LLC_FRMR,"FRMR" }, - { GPRS_LLC_XID, "XID" }, - { GPRS_LLC_UI, "UI" }, - { 0, NULL } -}; - int gprs_llc_hdr_parse(struct gprs_llc_hdr_parsed *ghp, const uint8_t *llc_hdr, int len) { -- To view, visit https://gerrit.osmocom.org/3005 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1c95c6ec8bee68773643f9646b0319a83fbc6cfa Gerrit-PatchSet: 1 Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Owner: MaxGerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder