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

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

by pespin

Attention is currently required from: neels. pespin 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 1: Code-Review+1 -- 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: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Jul 2022 11:45:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-msc[master]: missing whitespace in gsm_04_08_cc.c

by pespin

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28778 ) Change subject: missing whitespace in gsm_04_08_cc.c ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: Not sure where the whitespace problem is here, but ok. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28778 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: If9e2f543d1924421c1a1f1e1e100c7d9fb63c139 Gerrit-Change-Number: 28778 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Jul 2022 11:45:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-msc[master]: fix typo in msgb name for CC SETUP

by pespin

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28777 ) Change subject: fix typo in msgb name for CC SETUP ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28777 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Id2c44966152805ea52bd7e7534529832fc2312ab Gerrit-Change-Number: 28777 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Jul 2022 11:44:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 11 months

1
0
0 0

Change in osmo-msc[master]: err log: fix reverse statement in msc_a call handling

by pespin

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/28779 ) Change subject: err log: fix reverse statement in msc_a call handling ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28779 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I937abe25ba87d0fcddc3351ac391cf6e7e776de6 Gerrit-Change-Number: 28779 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Mon, 25 Jul 2022 11:44:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

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

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/28782 ) Change subject: in sdp logging: add payload type number like 'AMR#111' ...................................................................... in sdp logging: add payload type number like 'AMR#111' Change-Id: Icbb4e89ce2947bf787c3ee14e3e115d406e43de2 --- M src/libmsc/sdp_msg.c M tests/sdp_msg/sdp_msg_test.ok 2 files changed, 15 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/82/28782/1 diff --git a/src/libmsc/sdp_msg.c b/src/libmsc/sdp_msg.c index 6f30113..08b6e08 100644 --- a/src/libmsc/sdp_msg.c +++ b/src/libmsc/sdp_msg.c @@ -509,6 +509,9 @@ { struct osmo_strbuf sb = { .buf = buf, .len = buflen }; OSMO_STRBUF_PRINTF(sb, "%s", codec->subtype_name); + OSMO_STRBUF_PRINTF(sb, "#%d", codec->payload_type); + if (codec->rate != 8000) + OSMO_STRBUF_PRINTF(sb, "/%u", codec->rate); if (codec->fmtp[0]) OSMO_STRBUF_PRINTF(sb, ":%s", codec->fmtp); return sb.chars_needed; diff --git a/tests/sdp_msg/sdp_msg_test.ok b/tests/sdp_msg/sdp_msg_test.ok index 0b11c51..1101641 100644 --- a/tests/sdp_msg/sdp_msg_test.ok +++ b/tests/sdp_msg/sdp_msg_test.ok @@ -566,25 +566,25 @@ test_select [0] -SDP: AMR:octet-align=1,GSM,GSM-HR-08,GSM-EFR -Select: AMR:octet-align=1 -SDP: AMR:octet-align=1,GSM,GSM-HR-08,GSM-EFR +SDP: AMR#112:octet-align=1,GSM#3,GSM-HR-08#111,GSM-EFR#110 +Select: AMR#112:octet-align=1 +SDP: AMR#112:octet-align=1,GSM#3,GSM-HR-08#111,GSM-EFR#110 [0] ok [1] -SDP: AMR:octet-align=1,GSM,GSM-HR-08,GSM-EFR -Select: GSM -SDP: GSM,AMR:octet-align=1,GSM-HR-08,GSM-EFR +SDP: AMR#112:octet-align=1,GSM#3,GSM-HR-08#111,GSM-EFR#110 +Select: GSM#3 +SDP: GSM#3,AMR#112:octet-align=1,GSM-HR-08#111,GSM-EFR#110 [1] ok [2] -SDP: AMR:octet-align=1,GSM,GSM-HR-08,GSM-EFR -Select: GSM-HR-08 -SDP: GSM-HR-08,AMR:octet-align=1,GSM,GSM-EFR +SDP: AMR#112:octet-align=1,GSM#3,GSM-HR-08#111,GSM-EFR#110 +Select: GSM-HR-08#111 +SDP: GSM-HR-08#111,AMR#112:octet-align=1,GSM#3,GSM-EFR#110 [2] ok [3] -SDP: AMR:octet-align=1,GSM,GSM-HR-08,GSM-EFR -Select: GSM-EFR -SDP: GSM-EFR,AMR:octet-align=1,GSM,GSM-HR-08 +SDP: AMR#112:octet-align=1,GSM#3,GSM-HR-08#111,GSM-EFR#110 +Select: GSM-EFR#110 +SDP: GSM-EFR#110,AMR#112:octet-align=1,GSM#3,GSM-HR-08#111 [3] ok -- 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: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in osmo-msc[master]: sdp_msg: add sdp_audio_codecs_cmp(), add compare flags

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/28783 ) Change subject: sdp_msg: add sdp_audio_codecs_cmp(), add compare flags ...................................................................... sdp_msg: add sdp_audio_codecs_cmp(), add compare flags A problem with SDP fmtp handling is visible in this patch: when cmp_fmtp is true, we compare fmtp strings 1:1, which is not how things should be done. The intention is to fix fmtp handling in a later patch. At least there now is a flag to bypass fmtp comparison altogether. Change-Id: I18d33e189674229501afec950aa1c732386455a2 --- M include/osmocom/msc/sdp_msg.h M src/libmsc/sdp_msg.c 2 files changed, 73 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/83/28783/1 diff --git a/include/osmocom/msc/sdp_msg.h b/include/osmocom/msc/sdp_msg.h index 44a8a30..537713c 100644 --- a/include/osmocom/msc/sdp_msg.h +++ b/include/osmocom/msc/sdp_msg.h @@ -36,7 +36,10 @@ const char *sdp_msg_line_end(const char *src); -int sdp_audio_codec_cmp(const struct sdp_audio_codec *a, const struct sdp_audio_codec *b); +int sdp_audio_codec_cmp(const struct sdp_audio_codec *a, const struct sdp_audio_codec *b, + bool cmp_fmtp, bool cmp_payload_type); +int sdp_audio_codecs_cmp(const struct sdp_audio_codecs *a, const struct sdp_audio_codecs *b, + bool cmp_fmtp, bool cmp_payload_type); struct sdp_audio_codec *sdp_audio_codec_add(struct sdp_audio_codecs *ac, unsigned int payload_type, const char *subtype_name, unsigned int rate, const char *fmtp); diff --git a/src/libmsc/sdp_msg.c b/src/libmsc/sdp_msg.c index 08b6e08..0ba77e6 100644 --- a/src/libmsc/sdp_msg.c +++ b/src/libmsc/sdp_msg.c @@ -31,30 +31,83 @@ #include <osmocom/msc/sdp_msg.h> /* Compare name, rate and fmtp, returning typical cmp result: 0 on match, and -1 / 1 on mismatch. - * Do *not* compare the payload_type number. + * If cmp_fmtp is false, do *not* compare the fmtp string; if true, compare fmtp 1:1 as strings. + * If cmp_payload_type is false, do *not* compare the payload_type number. * The fmtp is only string-compared -- e.g. if AMR parameters appear in a different order, it amounts to a mismatch even * though all parameters are the same. */ -int sdp_audio_codec_cmp(const struct sdp_audio_codec *a, const struct sdp_audio_codec *b) +int sdp_audio_codec_cmp(const struct sdp_audio_codec *a, const struct sdp_audio_codec *b, + bool cmp_fmtp, bool cmp_payload_type) { - int rc; + int cmp; if (a == b) return 0; if (!a) return -1; if (!b) return 1; - rc = strncmp(a->subtype_name, b->subtype_name, sizeof(a->subtype_name)); - if (rc) - return rc; + cmp = strncmp(a->subtype_name, b->subtype_name, sizeof(a->subtype_name)); + if (cmp) + return cmp; + cmp = OSMO_CMP(a->rate, b->rate); + if (cmp) + return cmp; + if (cmp_fmtp) { + cmp = strncmp(a->fmtp, b->fmtp, sizeof(a->fmtp)); + if (cmp) + return cmp; + } + if (cmp_payload_type) { + cmp = OSMO_CMP(a->payload_type, b->payload_type); + if (cmp) + return cmp; + } + return 0; +} - if (a->rate < b->rate) +/* Compare two lists of audio codecs, returning typical cmp result: 0 on match, and -1 / 1 on mismatch. + * The ordering in the two lists may differ, except that the first codec in 'a' must also be the first codec in 'b'. + * This is because the first codec typically expresses the preferred codec to use. + * If cmp_fmtp is false, do *not* compare the fmtp strings; if true, compare fmtp 1:1 as strings. + * If cmp_payload_type is false, do *not* compare the payload_type numbers. + * The fmtp is only string-compared -- e.g. if AMR parameters appear in a different order, it amounts to a mismatch even + * though all parameters are the same. */ +int sdp_audio_codecs_cmp(const struct sdp_audio_codecs *a, const struct sdp_audio_codecs *b, + bool cmp_fmtp, bool cmp_payload_type) +{ + const struct sdp_audio_codec *codec_a; + const struct sdp_audio_codec *codec_b; + int cmp; + if (a == b) + return 0; + if (!a) return -1; - if (a->rate > b->rate) + if (!b) return 1; - rc = strncmp(a->fmtp, b->fmtp, sizeof(a->fmtp)); - if (rc) - return rc; + cmp = OSMO_CMP(a->count, b->count); + if (cmp) + return cmp; + + if (!a->count) + return 0; + + /* The first codec is the "chosen" codec and should match. The others may appear in different order. */ + cmp = sdp_audio_codec_cmp(&a->codec[0], &b->codec[0], cmp_fmtp, cmp_payload_type); + if (cmp) + return cmp; + + /* See if each codec in a is also present in b */ + foreach_sdp_audio_codec(codec_a, a) { + bool match_found = false; + foreach_sdp_audio_codec(codec_b, b) { + if (!sdp_audio_codec_cmp(codec_a, codec_b, cmp_fmtp, cmp_payload_type)) { + match_found = true; + break; + } + } + if (!match_found) + return -1; + } return 0; } @@ -130,13 +183,13 @@ return codec; } -/* Return a given sdp_msg's codec entry that matches the subtype_name, rate and fmtp of the given codec, or NULL if no - * match is found. Comparison is made by sdp_audio_codec_cmp(). */ +/* Return a given sdp_msg's codec entry that matches the subtype_name and rate of the given codec, or NULL if no + * match is found. Comparison is made by sdp_audio_codec_cmp(cmp_payload_type=false). */ struct sdp_audio_codec *sdp_audio_codec_by_descr(struct sdp_audio_codecs *ac, const struct sdp_audio_codec *codec) { struct sdp_audio_codec *i; foreach_sdp_audio_codec(i, ac) { - if (!sdp_audio_codec_cmp(i, codec)) + if (!sdp_audio_codec_cmp(i, codec, false, false)) return i; } return NULL; @@ -452,8 +505,8 @@ } /* Leave only those codecs in 'ac_dest' that are also present in 'ac_other'. - * The matching is made by sdp_audio_codec_cmp(), i.e. payload_type numbers are not compared and fmtp parameters are - * compared 1:1 as plain strings. + * The matching is made by sdp_audio_codec_cmp(cmp_payload_type=false), i.e. payload_type numbers are not compared and + * fmtp parameters are compared 1:1 as plain strings. * If translate_payload_type_numbers has an effect if ac_dest and ac_other have mismatching payload_type numbers for the * same SDP codec descriptions. If translate_payload_type_numbers is true, take the payload_type numbers from ac_other. * If false, keep payload_type numbers in ac_dest unchanged. */ -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28783 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I18d33e189674229501afec950aa1c732386455a2 Gerrit-Change-Number: 28783 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in osmo-msc[master]: sdp_msg: s/sdp_audio_codec_/sdp_audio_codecs_

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/28784 ) Change subject: sdp_msg: s/sdp_audio_codec_/sdp_audio_codecs_ ...................................................................... sdp_msg: s/sdp_audio_codec_/sdp_audio_codecs_ Some functions act on a struct sdp_audio_codecs but begin with the name sdp_audio_codec (singular). That's confusing. Change-Id: Id87eb350c1f17f8dbf776909824bfa06634c1d04 --- M include/osmocom/msc/sdp_msg.h M src/libmsc/sdp_msg.c M tests/sdp_msg/sdp_msg_test.c 3 files changed, 27 insertions(+), 27 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/84/28784/1 diff --git a/include/osmocom/msc/sdp_msg.h b/include/osmocom/msc/sdp_msg.h index 537713c..9073e91 100644 --- a/include/osmocom/msc/sdp_msg.h +++ b/include/osmocom/msc/sdp_msg.h @@ -41,15 +41,15 @@ int sdp_audio_codecs_cmp(const struct sdp_audio_codecs *a, const struct sdp_audio_codecs *b, bool cmp_fmtp, bool cmp_payload_type); -struct sdp_audio_codec *sdp_audio_codec_add(struct sdp_audio_codecs *ac, unsigned int payload_type, - const char *subtype_name, unsigned int rate, const char *fmtp); -struct sdp_audio_codec *sdp_audio_codec_add_copy(struct sdp_audio_codecs *ac, - const struct sdp_audio_codec *codec); -int sdp_audio_codec_remove(struct sdp_audio_codecs *ac, const struct sdp_audio_codec *codec); -struct sdp_audio_codec *sdp_audio_codec_by_payload_type(struct sdp_audio_codecs *ac, - unsigned int payload_type, bool create); -struct sdp_audio_codec *sdp_audio_codec_by_descr(struct sdp_audio_codecs *ac, - const struct sdp_audio_codec *codec); +struct sdp_audio_codec *sdp_audio_codecs_add(struct sdp_audio_codecs *ac, unsigned int payload_type, + const char *subtype_name, unsigned int rate, const char *fmtp); +struct sdp_audio_codec *sdp_audio_codecs_add_copy(struct sdp_audio_codecs *ac, + const struct sdp_audio_codec *codec); +int sdp_audio_codecs_remove(struct sdp_audio_codecs *ac, const struct sdp_audio_codec *codec); +struct sdp_audio_codec *sdp_audio_codecs_by_payload_type(struct sdp_audio_codecs *ac, + unsigned int payload_type, bool create); +struct sdp_audio_codec *sdp_audio_codecs_by_descr(struct sdp_audio_codecs *ac, + const struct sdp_audio_codec *codec); void sdp_audio_codecs_intersection(struct sdp_audio_codecs *ac_dest, const struct sdp_audio_codecs *ac_other, bool translate_payload_type_numbers); diff --git a/src/libmsc/sdp_msg.c b/src/libmsc/sdp_msg.c index 0ba77e6..dfdf373 100644 --- a/src/libmsc/sdp_msg.c +++ b/src/libmsc/sdp_msg.c @@ -116,13 +116,13 @@ * The payload_type must exist in sdp_msg_payload_type_names. * Return the audio codec created or already existing for this payload type number. */ -struct sdp_audio_codec *sdp_audio_codec_add(struct sdp_audio_codecs *ac, unsigned int payload_type, - const char *subtype_name, unsigned int rate, const char *fmtp) +struct sdp_audio_codec *sdp_audio_codecs_add(struct sdp_audio_codecs *ac, unsigned int payload_type, + const char *subtype_name, unsigned int rate, const char *fmtp) { struct sdp_audio_codec *codec; /* Does an entry already exist? */ - codec = sdp_audio_codec_by_payload_type(ac, payload_type, false); + codec = sdp_audio_codecs_by_payload_type(ac, payload_type, false); if (codec) { /* Already exists, sanity check */ if (!codec->subtype_name[0]) @@ -141,7 +141,7 @@ } /* None exists, create codec entry for this payload type number */ - codec = sdp_audio_codec_by_payload_type(ac, payload_type, true); + codec = sdp_audio_codecs_by_payload_type(ac, payload_type, true); /* NULL means unable to add an entry */ if (!codec) return NULL; @@ -152,14 +152,14 @@ return codec; } -struct sdp_audio_codec *sdp_audio_codec_add_copy(struct sdp_audio_codecs *ac, const struct sdp_audio_codec *codec) +struct sdp_audio_codec *sdp_audio_codecs_add_copy(struct sdp_audio_codecs *ac, const struct sdp_audio_codec *codec) { - return sdp_audio_codec_add(ac, codec->payload_type, codec->subtype_name, codec->rate, - codec->fmtp[0] ? codec->fmtp : NULL); + return sdp_audio_codecs_add(ac, codec->payload_type, codec->subtype_name, codec->rate, + codec->fmtp[0] ? codec->fmtp : NULL); } -struct sdp_audio_codec *sdp_audio_codec_by_payload_type(struct sdp_audio_codecs *ac, unsigned int payload_type, - bool create) +struct sdp_audio_codec *sdp_audio_codecs_by_payload_type(struct sdp_audio_codecs *ac, unsigned int payload_type, + bool create) { struct sdp_audio_codec *codec; foreach_sdp_audio_codec(codec, ac) { @@ -185,7 +185,7 @@ /* Return a given sdp_msg's codec entry that matches the subtype_name and rate of the given codec, or NULL if no * match is found. Comparison is made by sdp_audio_codec_cmp(cmp_payload_type=false). */ -struct sdp_audio_codec *sdp_audio_codec_by_descr(struct sdp_audio_codecs *ac, const struct sdp_audio_codec *codec) +struct sdp_audio_codec *sdp_audio_codecs_by_descr(struct sdp_audio_codecs *ac, const struct sdp_audio_codec *codec) { struct sdp_audio_codec *i; foreach_sdp_audio_codec(i, ac) { @@ -196,9 +196,9 @@ } /* Remove the codec entry pointed at by 'codec'. 'codec' must point at an entry of 'sdp' (to use an external codec - * instance, use sdp_audio_codec_by_descr()). + * instance, use sdp_audio_codecs_by_descr()). * Return 0 on success, -ENOENT if codec does not point at the sdp->codec array. */ -int sdp_audio_codec_remove(struct sdp_audio_codecs *ac, const struct sdp_audio_codec *codec) +int sdp_audio_codecs_remove(struct sdp_audio_codecs *ac, const struct sdp_audio_codec *codec) { struct sdp_audio_codec *i; if ((codec < ac->codec) @@ -290,7 +290,7 @@ if (!audio_name || audio_name >= sdp_msg_line_end(src)) return -EINVAL; - codec = sdp_audio_codec_by_payload_type(&sdp->audio_codecs, payload_type, true); + codec = sdp_audio_codecs_by_payload_type(&sdp->audio_codecs, payload_type, true); if (!codec) return -ENOSPC; @@ -314,7 +314,7 @@ if (fmtp_str >= line_end) return -EINVAL; - codec = sdp_audio_codec_by_payload_type(&sdp->audio_codecs, payload_type, true); + codec = sdp_audio_codecs_by_payload_type(&sdp->audio_codecs, payload_type, true); if (!codec) return -ENOSPC; @@ -400,7 +400,7 @@ if (sscanf(payload_type_str, "%u", &payload_type) < 1) return -EINVAL; - codec = sdp_audio_codec_by_payload_type(&sdp->audio_codecs, payload_type, true); + codec = sdp_audio_codecs_by_payload_type(&sdp->audio_codecs, payload_type, true); if (!codec) return -ENOSPC; @@ -519,10 +519,10 @@ struct sdp_audio_codec *other; OSMO_ASSERT(i < ARRAY_SIZE(ac_dest->codec)); - other = sdp_audio_codec_by_descr((struct sdp_audio_codecs*)ac_other, codec); + other = sdp_audio_codecs_by_descr((struct sdp_audio_codecs*)ac_other, codec); if (!other) { - OSMO_ASSERT(sdp_audio_codec_remove(ac_dest, codec) == 0); + OSMO_ASSERT(sdp_audio_codecs_remove(ac_dest, codec) == 0); i--; continue; } diff --git a/tests/sdp_msg/sdp_msg_test.c b/tests/sdp_msg/sdp_msg_test.c index e891953..ee48e80 100644 --- a/tests/sdp_msg/sdp_msg_test.c +++ b/tests/sdp_msg/sdp_msg_test.c @@ -531,7 +531,7 @@ break; } 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); + codec = sdp_audio_codecs_by_payload_type(&sdp.audio_codecs, t->select_payload_type, false); OSMO_ASSERT(codec); printf("Select: %s\n", sdp_audio_codec_to_str(codec)); -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28784 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Id87eb350c1f17f8dbf776909824bfa06634c1d04 Gerrit-Change-Number: 28784 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

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 uploaded this change for review. ( 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() Change-Id: I99161eeb64fd0faa7be6fc1e4986e2ba1bdcc75c --- M src/libmsc/gsm_04_08_cc.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/80/28780/1 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: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

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

by neels

neels has uploaded this change for review. ( 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. 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/81/28781/1 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: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

Change in osmo-msc[master]: fix typo in msgb name for CC SETUP

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/28777 ) Change subject: fix typo in msgb name for CC SETUP ...................................................................... fix typo in msgb name for CC SETUP Change-Id: Id2c44966152805ea52bd7e7534529832fc2312ab --- M src/libmsc/gsm_04_08_cc.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/77/28777/1 diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c index 6562daa..281a386 100644 --- a/src/libmsc/gsm_04_08_cc.c +++ b/src/libmsc/gsm_04_08_cc.c @@ -621,7 +621,7 @@ static int gsm48_cc_tx_setup(struct gsm_trans *trans, void *arg) { - struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 CC STUP"); + struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 CC SETUP"); struct gsm48_hdr *gh; struct gsm_mncc *setup = arg; int rc, trans_id; -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/28777 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Id2c44966152805ea52bd7e7534529832fc2312ab Gerrit-Change-Number: 28777 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 11 months

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2022