July 2022 - gerrit-log - lists.osmocom.org

Change in osmo-cbc[master]: cbc_vty: Fix missing indent char in dump_one_etws_msg

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28787 ) Change subject: cbc_vty: Fix missing indent char in dump_one_etws_msg ...................................................................... cbc_vty: Fix missing indent char in dump_one_etws_msg Change-Id: I8cdced4fa108dede8d5f5dba37dde9cb199198ab --- M src/cbc_vty.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/87/28787/1 diff --git a/src/cbc_vty.c b/src/cbc_vty.c index 5f02e46..50ec807 100644 --- a/src/cbc_vty.c +++ b/src/cbc_vty.c @@ -254,7 +254,7 @@ OSMO_ASSERT(smscb->is_etws); - vty_out(vty, "| %04X| %04X|%-20s|%-13s| %-4u|%c| %04d|%s", + vty_out(vty, "| %04X| %04X|%-20s|%-13s| %-4u|%c| %04d|%s", smscb->message_id, smscb->serial_nr, cbc_msg->cbe_name, get_value_string(cbsp_category_names, cbc_msg->priority), cbc_msg->rep_period, cbc_msg->extended_cbch ? 'E' : 'N', smscb->etws.warning_type, -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28787 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I8cdced4fa108dede8d5f5dba37dde9cb199198ab Gerrit-Change-Number: 28787 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: vty: Add command to delete expired messages

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-cbc/+/28786 to look at the new patch set (#2). Change subject: vty: Add command to delete expired messages ...................................................................... vty: Add command to delete expired messages Otherwise there's no way to remove expired messages, which keep filling the expired list forever. Change-Id: Ie7ed2d9ec8fc23cdc4cb007dce4150458085a6a3 --- M include/osmocom/cbc/cbc_message.h M src/cbc_vty.c M src/smscb_message_fsm.c 3 files changed, 28 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/86/28786/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28786 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: Ie7ed2d9ec8fc23cdc4cb007dce4150458085a6a3 Gerrit-Change-Number: 28786 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 11 months

1
0
0 0

Change in osmo-cbc[master]: Support CBSP/TCP and SBc-AP/SCTP client mode

by pespin

Attention is currently required from: fixeria. Hello Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-cbc/+/28732 to look at the new patch set (#5). Change subject: Support CBSP/TCP and SBc-AP/SCTP client mode ...................................................................... Support CBSP/TCP and SBc-AP/SCTP client mode This patch adds support to set up a CBSP link so that osmo-cbc connects as a TCP client to the BSC, which runs as a TCP server. Similary, support to set up a SBc-AP link so that osmo-cbc connects as a SCTP client to the MME, which runs as SCTP server. A new "mode (client|server|disabled)" VTY command is added to use one mother or the other, and also to disable the link and hence the peer until it is set again. This is useful if the peer is under manintenance for instance. client sockets are created automatically when the "peer" vty node is exited if the link is not yet created, hence creating it at startup or if moved back from "disabled" mode. If client socket dies, it will keep attempting reconnect every 5 seconds. Related: OS#4945 Change-Id: I3ec54b615b41b56f7a9c64298e3fcaac37f4b60e --- M doc/examples/osmo-cbc/osmo-cbc.cfg M include/osmocom/cbc/cbc_peer.h M include/osmocom/cbc/cbsp_link.h M include/osmocom/cbc/sbcap_link.h M src/cbc_main.c M src/cbc_peer.c M src/cbc_vty.c M src/cbsp_link.c M src/sbcap_link.c 9 files changed, 477 insertions(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-cbc refs/changes/32/28732/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28732 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-cbc Gerrit-Branch: master Gerrit-Change-Id: I3ec54b615b41b56f7a9c64298e3fcaac37f4b60e Gerrit-Change-Number: 28732 Gerrit-PatchSet: 5 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 11 months

1
0
0 0

Change in osmo-msc[master]: in sdp logging: add payload type number like 'AMR#111'

by neels

Attention is currently required from: pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28782 ) Change subject: in sdp logging: add payload type number like 'AMR#111' ...................................................................... Patch Set 3: (1 comment) File src/libmsc/sdp_msg.c: https://gerrit.osmocom.org/c/osmo-msc/+/28782/comment/d6eb3427_9de9d62c PS1, Line 512: OSMO_STRBUF_PRINTF(sb, "#%d", codec->payload_type); > Isn't this expected to got at the end, as per the example on line 507? thx, applied this review -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28782 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Icbb4e89ce2947bf787c3ee14e3e115d406e43de2 Gerrit-Change-Number: 28782 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Jul 2022 14:19:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-msc[master]: sdp_msg: s/_name_/_to_str_/g

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28781 ) Change subject: sdp_msg: s/_name_/_to_str_/g ...................................................................... sdp_msg: s/_name_/_to_str_/g foo_name is intended for a short id, foo_to_str is more accurate naming here. Related: SYS#5066 Change-Id: I21d73b2e2633dd4841ff69a0c5fdf9b1a4c0615f --- M include/osmocom/msc/sdp_msg.h M src/libmsc/sdp_msg.c M tests/sdp_msg/sdp_msg_test.c M tests/sdp_msg/sdp_msg_test.ok 4 files changed, 83 insertions(+), 83 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/msc/sdp_msg.h b/include/osmocom/msc/sdp_msg.h index 7ac6036..44a8a30 100644 --- a/include/osmocom/msc/sdp_msg.h +++ b/include/osmocom/msc/sdp_msg.h @@ -52,17 +52,17 @@ bool translate_payload_type_numbers); void sdp_audio_codecs_select(struct sdp_audio_codecs *ac, struct sdp_audio_codec *codec); -int sdp_msg_to_str(char *dst, size_t dst_size, const struct sdp_msg *sdp); -int sdp_msg_from_str(struct sdp_msg *sdp, const char *src); +int sdp_msg_to_sdp_str_buf(char *dst, size_t dst_size, const struct sdp_msg *sdp); +int sdp_msg_from_sdp_str(struct sdp_msg *sdp, const char *src); -int sdp_audio_codec_name_buf(char *buf, size_t buflen, const struct sdp_audio_codec *codec); -char *sdp_audio_codec_name_c(void *ctx, const struct sdp_audio_codec *codec); -const char *sdp_audio_codec_name(const struct sdp_audio_codec *codec); +int sdp_audio_codec_to_str_buf(char *buf, size_t buflen, const struct sdp_audio_codec *codec); +char *sdp_audio_codec_to_str_c(void *ctx, const struct sdp_audio_codec *codec); +const char *sdp_audio_codec_to_str(const struct sdp_audio_codec *codec); -int sdp_audio_codecs_name_buf(char *buf, size_t buflen, const struct sdp_audio_codecs *ac); -char *sdp_audio_codecs_name_c(void *ctx, const struct sdp_audio_codecs *ac); -const char *sdp_audio_codecs_name(const struct sdp_audio_codecs *ac); +int sdp_audio_codecs_to_str_buf(char *buf, size_t buflen, const struct sdp_audio_codecs *ac); +char *sdp_audio_codecs_to_str_c(void *ctx, const struct sdp_audio_codecs *ac); +const char *sdp_audio_codecs_to_str(const struct sdp_audio_codecs *ac); -int sdp_msg_name_buf(char *buf, size_t buflen, const struct sdp_msg *sdp); -char *sdp_msg_name_c(void *ctx, const struct sdp_msg *sdp); -const char *sdp_msg_name(const struct sdp_msg *sdp); +int sdp_msg_to_str_buf(char *buf, size_t buflen, const struct sdp_msg *sdp); +char *sdp_msg_to_str_c(void *ctx, const struct sdp_msg *sdp); +const char *sdp_msg_to_str(const struct sdp_msg *sdp); diff --git a/src/libmsc/sdp_msg.c b/src/libmsc/sdp_msg.c index 6170e8e..6f30113 100644 --- a/src/libmsc/sdp_msg.c +++ b/src/libmsc/sdp_msg.c @@ -163,7 +163,7 @@ } /* Convert struct sdp_msg to the actual SDP protocol representation */ -int sdp_msg_to_str(char *dst, size_t dst_size, const struct sdp_msg *sdp) +int sdp_msg_to_sdp_str_buf(char *dst, size_t dst_size, const struct sdp_msg *sdp) { const struct sdp_audio_codec *codec; struct osmo_strbuf sb = { .buf = dst, .len = dst_size }; @@ -383,7 +383,7 @@ } /* Parse SDP string into struct sdp_msg. Return 0 on success, negative on error. */ -int sdp_msg_from_str(struct sdp_msg *sdp, const char *src) +int sdp_msg_from_sdp_str(struct sdp_msg *sdp, const char *src) { const char *pos; *sdp = (struct sdp_msg){}; @@ -505,7 +505,7 @@ /* Short single-line representation of an SDP audio codec, convenient for logging. * Like "AMR/8000:octet-align=1#122" */ -int sdp_audio_codec_name_buf(char *buf, size_t buflen, const struct sdp_audio_codec *codec) +int sdp_audio_codec_to_str_buf(char *buf, size_t buflen, const struct sdp_audio_codec *codec) { struct osmo_strbuf sb = { .buf = buf, .len = buflen }; OSMO_STRBUF_PRINTF(sb, "%s", codec->subtype_name); @@ -514,18 +514,18 @@ return sb.chars_needed; } -char *sdp_audio_codec_name_c(void *ctx, const struct sdp_audio_codec *codec) +char *sdp_audio_codec_to_str_c(void *ctx, const struct sdp_audio_codec *codec) { - OSMO_NAME_C_IMPL(ctx, 32, "sdp_audio_codec_name_c-ERROR", sdp_audio_codec_name_buf, codec) + OSMO_NAME_C_IMPL(ctx, 32, "sdp_audio_codec_to_str_c-ERROR", sdp_audio_codec_to_str_buf, codec) } -const char *sdp_audio_codec_name(const struct sdp_audio_codec *codec) +const char *sdp_audio_codec_to_str(const struct sdp_audio_codec *codec) { - return sdp_audio_codec_name_c(OTC_SELECT, codec); + return sdp_audio_codec_to_str_c(OTC_SELECT, codec); } /* Short single-line representation of a list of SDP audio codecs, convenient for logging */ -int sdp_audio_codecs_name_buf(char *buf, size_t buflen, const struct sdp_audio_codecs *ac) +int sdp_audio_codecs_to_str_buf(char *buf, size_t buflen, const struct sdp_audio_codecs *ac) { struct osmo_strbuf sb = { .buf = buf, .len = buflen }; const struct sdp_audio_codec *codec; @@ -535,23 +535,23 @@ bool first = (codec == ac->codec); if (!first) OSMO_STRBUF_PRINTF(sb, ","); - OSMO_STRBUF_APPEND(sb, sdp_audio_codec_name_buf, codec); + OSMO_STRBUF_APPEND(sb, sdp_audio_codec_to_str_buf, codec); } return sb.chars_needed; } -char *sdp_audio_codecs_name_c(void *ctx, const struct sdp_audio_codecs *ac) +char *sdp_audio_codecs_to_str_c(void *ctx, const struct sdp_audio_codecs *ac) { - OSMO_NAME_C_IMPL(ctx, 128, "sdp_audio_codecs_name_c-ERROR", sdp_audio_codecs_name_buf, ac) + OSMO_NAME_C_IMPL(ctx, 128, "sdp_audio_codecs_to_str_c-ERROR", sdp_audio_codecs_to_str_buf, ac) } -const char *sdp_audio_codecs_name(const struct sdp_audio_codecs *ac) +const char *sdp_audio_codecs_to_str(const struct sdp_audio_codecs *ac) { - return sdp_audio_codecs_name_c(OTC_SELECT, ac); + return sdp_audio_codecs_to_str_c(OTC_SELECT, ac); } /* Short single-line representation of an SDP message, convenient for logging */ -int sdp_msg_name_buf(char *buf, size_t buflen, const struct sdp_msg *sdp) +int sdp_msg_to_str_buf(char *buf, size_t buflen, const struct sdp_msg *sdp) { struct osmo_strbuf sb = { .buf = buf, .len = buflen }; if (!sdp) { @@ -561,17 +561,17 @@ OSMO_STRBUF_PRINTF(sb, OSMO_SOCKADDR_STR_FMT, OSMO_SOCKADDR_STR_FMT_ARGS(&sdp->rtp)); OSMO_STRBUF_PRINTF(sb, "{"); - OSMO_STRBUF_APPEND(sb, sdp_audio_codecs_name_buf, &sdp->audio_codecs); + OSMO_STRBUF_APPEND(sb, sdp_audio_codecs_to_str_buf, &sdp->audio_codecs); OSMO_STRBUF_PRINTF(sb, "}"); return sb.chars_needed; } -char *sdp_msg_name_c(void *ctx, const struct sdp_msg *sdp) +char *sdp_msg_to_str_c(void *ctx, const struct sdp_msg *sdp) { - OSMO_NAME_C_IMPL(ctx, 128, "sdp_msg_name_c-ERROR", sdp_msg_name_buf, sdp) + OSMO_NAME_C_IMPL(ctx, 128, "sdp_msg_to_str_c-ERROR", sdp_msg_to_str_buf, sdp) } -const char *sdp_msg_name(const struct sdp_msg *sdp) +const char *sdp_msg_to_str(const struct sdp_msg *sdp) { - return sdp_msg_name_c(OTC_SELECT, sdp); + return sdp_msg_to_str_c(OTC_SELECT, sdp); } diff --git a/tests/sdp_msg/sdp_msg_test.c b/tests/sdp_msg/sdp_msg_test.c index b97127a..e891953 100644 --- a/tests/sdp_msg/sdp_msg_test.c +++ b/tests/sdp_msg/sdp_msg_test.c @@ -134,10 +134,10 @@ printf("\n[%d]\n", i); dump_sdp(t->sdp_input, "sdp input: "); - sdp_msg_from_str(&sdp, t->sdp_input); - sdp_msg_to_str(str, sizeof(str), &sdp); + sdp_msg_from_sdp_str(&sdp, t->sdp_input); + sdp_msg_to_sdp_str_buf(str, sizeof(str), &sdp); - dump_sdp(str, "sdp_msg_to_str: "); + dump_sdp(str, "sdp_msg_to_sdp_str_buf: "); if (strcmp(str, t->expect_sdp_str)) { int j; ok = false; @@ -344,7 +344,7 @@ const char *sdp_msg_logstr(const struct sdp_msg *sdp) { static char buf[1024]; - sdp_msg_to_str(buf, sizeof(buf), sdp); + sdp_msg_to_sdp_str_buf(buf, sizeof(buf), sdp); return buf; } @@ -365,20 +365,20 @@ dump_sdp(t->sdp_a, "SDP A: "); dump_sdp(t->sdp_b, " SDP B: "); - rc = sdp_msg_from_str(&sdp_a, t->sdp_a); + rc = sdp_msg_from_sdp_str(&sdp_a, t->sdp_a); if (rc) { printf("ERROR parsing SDP A: %d\n", rc); break; } dump_sdp(sdp_msg_logstr(&sdp_a), "parsed SDP A: "); - rc = sdp_msg_from_str(&sdp_b, t->sdp_b); + rc = sdp_msg_from_sdp_str(&sdp_b, t->sdp_b); if (rc) { printf("ERROR parsing SDP A: %d\n", rc); break; } dump_sdp(sdp_msg_logstr(&sdp_b), "parsed SDP B: "); sdp_audio_codecs_intersection(&sdp_a.audio_codecs, &sdp_b.audio_codecs, false); - sdp_msg_to_str(str, sizeof(str), &sdp_a); + sdp_msg_to_sdp_str_buf(str, sizeof(str), &sdp_a); dump_sdp(str, "sdp_msg_intersection(a,b): "); if (strcmp(str, t->expect_intersection)) { @@ -525,20 +525,20 @@ struct sdp_audio_codec *codec; char buf[1024]; printf("\n[%d]\n", i); - rc = sdp_msg_from_str(&sdp, t->sdp); + rc = sdp_msg_from_sdp_str(&sdp, t->sdp); if (rc) { printf("ERROR parsing SDP: %d\n", rc); break; } - printf("SDP: %s\n", sdp_audio_codecs_name(&sdp.audio_codecs)); + printf("SDP: %s\n", sdp_audio_codecs_to_str(&sdp.audio_codecs)); codec = sdp_audio_codec_by_payload_type(&sdp.audio_codecs, t->select_payload_type, false); OSMO_ASSERT(codec); - printf("Select: %s\n", sdp_audio_codec_name(codec)); + printf("Select: %s\n", sdp_audio_codec_to_str(codec)); sdp_audio_codecs_select(&sdp.audio_codecs, codec); - printf("SDP: %s\n", sdp_audio_codecs_name(&sdp.audio_codecs)); - sdp_msg_to_str(buf, sizeof(buf), &sdp); + printf("SDP: %s\n", sdp_audio_codecs_to_str(&sdp.audio_codecs)); + sdp_msg_to_sdp_str_buf(buf, sizeof(buf), &sdp); if (strcmp(buf, t->expect_sdp ? : t->sdp)) { int j; diff --git a/tests/sdp_msg/sdp_msg_test.ok b/tests/sdp_msg/sdp_msg_test.ok index a7a3d51..0b11c51 100644 --- a/tests/sdp_msg/sdp_msg_test.ok +++ b/tests/sdp_msg/sdp_msg_test.ok @@ -23,25 +23,25 @@ sdp input: a=fmtp:101 0-15\r\n sdp input: a=ptime:20\r\n sdp input: a=sendrecv\r\n -sdp_msg_to_str: v=0\r\n -sdp_msg_to_str: o=OsmoMSC 0 0 IN IP4 192.168.11.121\r\n -sdp_msg_to_str: s=GSM Call\r\n -sdp_msg_to_str: c=IN IP4 192.168.11.121\r\n -sdp_msg_to_str: t=0 0\r\n -sdp_msg_to_str: m=audio 10020 RTP/AVP 18 0 2 4 8 96 97 98 100 101\r\n -sdp_msg_to_str: a=rtpmap:18 G729/8000\r\n -sdp_msg_to_str: a=rtpmap:0 PCMU/8000\r\n -sdp_msg_to_str: a=rtpmap:2 G726-32/8000\r\n -sdp_msg_to_str: a=rtpmap:4 G723/8000\r\n -sdp_msg_to_str: a=rtpmap:8 PCMA/8000\r\n -sdp_msg_to_str: a=rtpmap:96 G726-40/8000\r\n -sdp_msg_to_str: a=rtpmap:97 G726-24/8000\r\n -sdp_msg_to_str: a=rtpmap:98 G726-16/8000\r\n -sdp_msg_to_str: a=rtpmap:100 NSE/8000\r\n -sdp_msg_to_str: a=fmtp:100 192-193\r\n -sdp_msg_to_str: a=rtpmap:101 telephone-event/8000\r\n -sdp_msg_to_str: a=fmtp:101 0-15\r\n -sdp_msg_to_str: a=ptime:20\r\n +sdp_msg_to_sdp_str_buf: v=0\r\n +sdp_msg_to_sdp_str_buf: o=OsmoMSC 0 0 IN IP4 192.168.11.121\r\n +sdp_msg_to_sdp_str_buf: s=GSM Call\r\n +sdp_msg_to_sdp_str_buf: c=IN IP4 192.168.11.121\r\n +sdp_msg_to_sdp_str_buf: t=0 0\r\n +sdp_msg_to_sdp_str_buf: m=audio 10020 RTP/AVP 18 0 2 4 8 96 97 98 100 101\r\n +sdp_msg_to_sdp_str_buf: a=rtpmap:18 G729/8000\r\n +sdp_msg_to_sdp_str_buf: a=rtpmap:0 PCMU/8000\r\n +sdp_msg_to_sdp_str_buf: a=rtpmap:2 G726-32/8000\r\n +sdp_msg_to_sdp_str_buf: a=rtpmap:4 G723/8000\r\n +sdp_msg_to_sdp_str_buf: a=rtpmap:8 PCMA/8000\r\n +sdp_msg_to_sdp_str_buf: a=rtpmap:96 G726-40/8000\r\n +sdp_msg_to_sdp_str_buf: a=rtpmap:97 G726-24/8000\r\n +sdp_msg_to_sdp_str_buf: a=rtpmap:98 G726-16/8000\r\n +sdp_msg_to_sdp_str_buf: a=rtpmap:100 NSE/8000\r\n +sdp_msg_to_sdp_str_buf: a=fmtp:100 192-193\r\n +sdp_msg_to_sdp_str_buf: a=rtpmap:101 telephone-event/8000\r\n +sdp_msg_to_sdp_str_buf: a=fmtp:101 0-15\r\n +sdp_msg_to_sdp_str_buf: a=ptime:20\r\n [0] ok [1] @@ -55,15 +55,15 @@ sdp input: a=fmtp:98 octet-align=1; mode-set=4\r\n sdp input: a=ptime:20\r\n sdp input: a=rtcp:16399 IN IP4 192.168.11.151\r\n -sdp_msg_to_str: v=0\r\n -sdp_msg_to_str: o=OsmoMSC 0 0 IN IP4 192.168.11.151\r\n -sdp_msg_to_str: s=GSM Call\r\n -sdp_msg_to_str: c=IN IP4 192.168.11.151\r\n -sdp_msg_to_str: t=0 0\r\n -sdp_msg_to_str: m=audio 16398 RTP/AVP 98\r\n -sdp_msg_to_str: a=rtpmap:98 AMR/8000\r\n -sdp_msg_to_str: a=fmtp:98 octet-align=1; mode-set=4\r\n -sdp_msg_to_str: a=ptime:20\r\n +sdp_msg_to_sdp_str_buf: v=0\r\n +sdp_msg_to_sdp_str_buf: o=OsmoMSC 0 0 IN IP4 192.168.11.151\r\n +sdp_msg_to_sdp_str_buf: s=GSM Call\r\n +sdp_msg_to_sdp_str_buf: c=IN IP4 192.168.11.151\r\n +sdp_msg_to_sdp_str_buf: t=0 0\r\n +sdp_msg_to_sdp_str_buf: m=audio 16398 RTP/AVP 98\r\n +sdp_msg_to_sdp_str_buf: a=rtpmap:98 AMR/8000\r\n +sdp_msg_to_sdp_str_buf: a=fmtp:98 octet-align=1; mode-set=4\r\n +sdp_msg_to_sdp_str_buf: a=ptime:20\r\n [1] ok [2] @@ -82,19 +82,19 @@ sdp input: a=sendrecv\r\n sdp input: a=rtcp:30437\r\n sdp input: a=ptime:20\r\n -sdp_msg_to_str: v=0\r\n -sdp_msg_to_str: o=OsmoMSC 0 0 IN IP4 192.168.11.140\r\n -sdp_msg_to_str: s=GSM Call\r\n -sdp_msg_to_str: c=IN IP4 192.168.11.140\r\n -sdp_msg_to_str: t=0 0\r\n -sdp_msg_to_str: m=audio 30436 RTP/AVP 18 0 4 8 101\r\n -sdp_msg_to_str: a=rtpmap:18 G729/8000\r\n -sdp_msg_to_str: a=rtpmap:0 PCMU/8000\r\n -sdp_msg_to_str: a=rtpmap:4 G723/8000\r\n -sdp_msg_to_str: a=rtpmap:8 PCMA/8000\r\n -sdp_msg_to_str: a=rtpmap:101 telephone-event/8000\r\n -sdp_msg_to_str: a=fmtp:101 0-15\r\n -sdp_msg_to_str: a=ptime:20\r\n +sdp_msg_to_sdp_str_buf: v=0\r\n +sdp_msg_to_sdp_str_buf: o=OsmoMSC 0 0 IN IP4 192.168.11.140\r\n +sdp_msg_to_sdp_str_buf: s=GSM Call\r\n +sdp_msg_to_sdp_str_buf: c=IN IP4 192.168.11.140\r\n +sdp_msg_to_sdp_str_buf: t=0 0\r\n +sdp_msg_to_sdp_str_buf: m=audio 30436 RTP/AVP 18 0 4 8 101\r\n +sdp_msg_to_sdp_str_buf: a=rtpmap:18 G729/8000\r\n +sdp_msg_to_sdp_str_buf: a=rtpmap:0 PCMU/8000\r\n +sdp_msg_to_sdp_str_buf: a=rtpmap:4 G723/8000\r\n +sdp_msg_to_sdp_str_buf: a=rtpmap:8 PCMA/8000\r\n +sdp_msg_to_sdp_str_buf: a=rtpmap:101 telephone-event/8000\r\n +sdp_msg_to_sdp_str_buf: a=fmtp:101 0-15\r\n +sdp_msg_to_sdp_str_buf: a=ptime:20\r\n [2] ok -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28781 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I21d73b2e2633dd4841ff69a0c5fdf9b1a4c0615f Gerrit-Change-Number: 28781 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

Change in osmo-msc[master]: cosmetic: log actual MNCC msg in tch_rtp_connect()

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28780 ) Change subject: cosmetic: log actual MNCC msg in tch_rtp_connect() ...................................................................... cosmetic: log actual MNCC msg in tch_rtp_connect() Related: SYS#5066 Change-Id: I99161eeb64fd0faa7be6fc1e4986e2ba1bdcc75c --- M src/libmsc/gsm_04_08_cc.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: neels: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index a06e997..8132de5 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -1773,7 +1773,7 @@ return -EIO; } - LOG_TRANS_CAT(trans, DMNCC, LOGL_DEBUG, "rx %s %s:%u\n", get_mncc_name(MNCC_RTP_CONNECT), + LOG_TRANS_CAT(trans, DMNCC, LOGL_DEBUG, "rx %s %s:%u\n", get_mncc_name(rtp->msg_type), osmo_sockaddr_ntop((const struct sockaddr*)&rtp->addr, ipbuf), osmo_sockaddr_port((const struct sockaddr*)&rtp->addr)); -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28780 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I99161eeb64fd0faa7be6fc1e4986e2ba1bdcc75c Gerrit-Change-Number: 28780 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

Change in osmo-msc[master]: cosmetic: log actual MNCC msg in tch_rtp_connect()

by neels

neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28780 ) Change subject: cosmetic: log actual MNCC msg in tch_rtp_connect() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28780 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I99161eeb64fd0faa7be6fc1e4986e2ba1bdcc75c Gerrit-Change-Number: 28780 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Jul 2022 14:18:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: get rid of DEBUG_DEFAULT, give an example

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28774 ) Change subject: trxcon: get rid of DEBUG_DEFAULT, give an example ...................................................................... trxcon: get rid of DEBUG_DEFAULT, give an example Change-Id: If2d2afb18238df89aa4cdaed9a38810f647b3189 --- M src/host/trxcon/include/osmocom/bb/trxcon/logging.h M src/host/trxcon/src/trxcon.c 2 files changed, 1 insertion(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/logging.h b/src/host/trxcon/include/osmocom/bb/trxcon/logging.h index f81e1d6..617e8f1 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/logging.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/logging.h @@ -2,8 +2,6 @@ #include <osmocom/core/logging.h> -#define DEBUG_DEFAULT "DAPP:DL1C:DL1D:DTRXC:DTRXD:DSCH:DSCHD" - enum { DAPP, DL1C, diff --git a/src/host/trxcon/src/trxcon.c b/src/host/trxcon/src/trxcon.c index 0cc0de9..df411c3 100644 --- a/src/host/trxcon/src/trxcon.c +++ b/src/host/trxcon/src/trxcon.c @@ -406,7 +406,7 @@ { printf(" Some help...\n"); printf(" -h --help this text\n"); - printf(" -d --debug Change debug flags. Default: %s\n", DEBUG_DEFAULT); + printf(" -d --debug Change debug flags (e.g. DL1C:DSCH)\n"); printf(" -b --trx-bind TRX bind IP address (default 0.0.0.0)\n"); printf(" -i --trx-remote TRX remote IP address (default 127.0.0.1)\n"); printf(" -p --trx-port Base port of TRX instance (default 6700)\n"); 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28774 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: If2d2afb18238df89aa4cdaed9a38810f647b3189 Gerrit-Change-Number: 28774 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: rename DTRX logging sub-system to DTRXC

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28758 ) Change subject: trxcon: rename DTRX logging sub-system to DTRXC ...................................................................... trxcon: rename DTRX logging sub-system to DTRXC This sub-system is used for TRXC related logging, so reflect this. Change-Id: I33c8f81e37de7ee61809610e51405a96c93536ff --- M src/host/trxcon/include/osmocom/bb/trxcon/logging.h M src/host/trxcon/src/logging.c M src/host/trxcon/src/trx_if.c 3 files changed, 5 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/host/trxcon/include/osmocom/bb/trxcon/logging.h b/src/host/trxcon/include/osmocom/bb/trxcon/logging.h index 152c346..f81e1d6 100644 --- a/src/host/trxcon/include/osmocom/bb/trxcon/logging.h +++ b/src/host/trxcon/include/osmocom/bb/trxcon/logging.h @@ -2,13 +2,13 @@ #include <osmocom/core/logging.h> -#define DEBUG_DEFAULT "DAPP:DL1C:DL1D:DTRX:DTRXD:DSCH:DSCHD" +#define DEBUG_DEFAULT "DAPP:DL1C:DL1D:DTRXC:DTRXD:DSCH:DSCHD" enum { DAPP, DL1C, DL1D, - DTRX, + DTRXC, DTRXD, DSCH, DSCHD, diff --git a/src/host/trxcon/src/logging.c b/src/host/trxcon/src/logging.c index 04f3568..5c16ac5 100644 --- a/src/host/trxcon/src/logging.c +++ b/src/host/trxcon/src/logging.c @@ -42,8 +42,8 @@ .color = "\033[1;31m", .enabled = 1, .loglevel = LOGL_NOTICE, }, - [DTRX] = { - .name = "DTRX", + [DTRXC] = { + .name = "DTRXC", .description = "Transceiver control interface", .color = "\033[1;33m", .enabled = 1, .loglevel = LOGL_NOTICE, diff --git a/src/host/trxcon/src/trx_if.c b/src/host/trxcon/src/trx_if.c index 7499740..46f6e7e 100644 --- a/src/host/trxcon/src/trx_if.c +++ b/src/host/trxcon/src/trx_if.c @@ -81,7 +81,7 @@ .name = "trx_interface", .states = trx_fsm_states, .num_states = ARRAY_SIZE(trx_fsm_states), - .log_subsys = DTRX, + .log_subsys = DTRXC, .event_names = trx_evt_names, }; 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28758 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I33c8f81e37de7ee61809610e51405a96c93536ff Gerrit-Change-Number: 28758 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

Change in osmocom-bb[master]: trxcon: ensure TRXD logging is actually using LOGPFSMSL()

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/28757 ) Change subject: trxcon: ensure TRXD logging is actually using LOGPFSMSL() ...................................................................... trxcon: ensure TRXD logging is actually using LOGPFSMSL() This should have been done in [1], but somehow I forgot about TRXD. Change-Id: Ia5124061fe391644267a6117ac2627cad7adf873 Fixes: [1] Ic253903e7b8635bb13e210acfe929c73f8870632 Related: OS#5599 --- M src/host/trxcon/src/trx_if.c 1 file changed, 13 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/host/trxcon/src/trx_if.c b/src/host/trxcon/src/trx_if.c index 7daedad..7499740 100644 --- a/src/host/trxcon/src/trx_if.c +++ b/src/host/trxcon/src/trx_if.c @@ -601,13 +601,13 @@ read_len = read(ofd->fd, buf, sizeof(buf)); if (read_len <= 0) { - LOGP(DTRXD, LOGL_ERROR, "read() failed with rc=%zd\n", read_len); + LOGPFSMSL(trx->fi, DTRXD, LOGL_ERROR, "read() failed with rc=%zd\n", read_len); return read_len; } if (read_len < (8 + 148)) { /* TRXDv0 header + GMSK burst */ - LOGP(DTRXD, LOGL_ERROR, "Got data message with invalid " - "length '%zd'\n", read_len); + LOGPFSMSL(trx->fi, DTRXD, LOGL_ERROR, + "Got data message with invalid length '%zd'\n", read_len); return -EINVAL; } @@ -620,17 +620,18 @@ osmo_ubit2sbit(bits, buf + 8, 148); if (tn >= 8) { - LOGP(DTRXD, LOGL_ERROR, "Illegal TS %d\n", tn); + LOGPFSMSL(trx->fi, DTRXD, LOGL_ERROR, "Illegal TS %d\n", tn); return -EINVAL; } if (fn >= 2715648) { - LOGP(DTRXD, LOGL_ERROR, "Illegal FN %u\n", fn); + LOGPFSMSL(trx->fi, DTRXD, LOGL_ERROR, "Illegal FN %u\n", fn); return -EINVAL; } - LOGP(DTRXD, LOGL_DEBUG, "RX burst tn=%u fn=%u rssi=%d toa=%d\n", - tn, fn, rssi, toa256); + LOGPFSMSL(trx->fi, DTRXD, LOGL_DEBUG, + "RX burst tn=%u fn=%u rssi=%d toa=%d\n", + tn, fn, rssi, toa256); /* Group the measurements together */ meas = (struct l1sched_meas_set) { @@ -664,14 +665,15 @@ */ #if 0 if (trx->fi->state != TRX_STATE_ACTIVE) { - LOGP(DTRXD, LOGL_ERROR, "Ignoring TX data, " - "transceiver isn't ready\n"); + LOGPFSMSL(trx->fi, DTRXD, LOGL_ERROR, + "Ignoring TX data, transceiver isn't ready\n"); return -EAGAIN; } #endif - LOGP(DTRXD, LOGL_DEBUG, "TX burst tn=%u fn=%u pwr=%u\n", - br->tn, br->fn, br->pwr); + LOGPFSMSL(trx->fi, DTRXD, LOGL_DEBUG, + "TX burst tn=%u fn=%u pwr=%u\n", + br->tn, br->fn, br->pwr); buf[0] = br->tn; osmo_store32be(br->fn, buf + 1); 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/28757 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia5124061fe391644267a6117ac2627cad7adf873 Gerrit-Change-Number: 28757 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 11 months

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2022