January 2024 - gerrit-log - lists.osmocom.org

[L] Change in osmo-ttcn3-hacks[master]: DIAMETER: Split Gy and Gx messages to their own TS files
by laforge 25 Jan '24

25 Jan '24

Attention is currently required from: jolly, lynxis lazus, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35671?usp=email ) Change subject: DIAMETER: Split Gy and Gx messages to their own TS files ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35671?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibe0d5f263813d5083e020c942283f214983162b4 Gerrit-Change-Number: 35671 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Thu, 25 Jan 2024 12:19:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in libosmocore[master]: isdn/v110_ta: avoid redundant .status_update_cb() calls
by fixeria 25 Jan '24

25 Jan '24

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35639?usp=email ) Change subject: isdn/v110_ta: avoid redundant .status_update_cb() calls ...................................................................... isdn/v110_ta: avoid redundant .status_update_cb() calls Let's be smarter and call the status update callback iff the V.24 flagmask was actually changed. Change-Id: I9626d3e737d4e072fa163115c4cdf9ee6ee0968e Related: OS#4396 --- M src/isdn/v110_ta.c M tests/v110/ta_test.err 2 files changed, 44 insertions(+), 36 deletions(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve diff --git a/src/isdn/v110_ta.c b/src/isdn/v110_ta.c index 7757dcc..6730b20 100644 --- a/src/isdn/v110_ta.c +++ b/src/isdn/v110_ta.c @@ -247,12 +247,15 @@ } } -static void v110_ta_flags_updated(const struct osmo_v110_ta *ta) +static void v110_ta_flags_update(struct osmo_v110_ta *ta, unsigned int v24_flags) { - const struct osmo_v110_ta_cfg *cfg = ta->cfg; + struct osmo_v110_ta_cfg *cfg = ta->cfg; + if (ta->state.v24_flags == v24_flags) + return; if (cfg->status_update_cb != NULL) - cfg->status_update_cb(cfg->priv, ta->state.v24_flags); + cfg->status_update_cb(cfg->priv, v24_flags); + ta->state.v24_flags = v24_flags; } static const struct osmo_tdef_state_timeout v110_ta_fsm_timeouts[32] = { @@ -272,6 +275,7 @@ { struct osmo_v110_ta *ta = (struct osmo_v110_ta *)fi->priv; struct v110_ta_state *ts = &ta->state; + unsigned int v24_flags = ta->state.v24_flags; /* 7.1.1.2 During the idle (or ready) state the TA will transmit continuous binary 1s into the B-channel */ ts->tx.d_bit_mode = V110_TA_DBIT_M_ALL_ONE; /* circuit 103: continuous binary '1' */ @@ -282,10 +286,10 @@ /* - circuit 104: continuous binary '1' */ ts->rx.d_bit_mode = V110_TA_DBIT_M_ALL_ONE; /* - circuits 107, 106, 109 = OFF */ - V24_FLAGMASK_SET_OFF(ts->v24_flags, OSMO_V110_TA_C_106); - V24_FLAGMASK_SET_OFF(ts->v24_flags, OSMO_V110_TA_C_107); - V24_FLAGMASK_SET_OFF(ts->v24_flags, OSMO_V110_TA_C_109); - v110_ta_flags_updated(ta); + V24_FLAGMASK_SET_OFF(v24_flags, OSMO_V110_TA_C_106); + V24_FLAGMASK_SET_OFF(v24_flags, OSMO_V110_TA_C_107); + V24_FLAGMASK_SET_OFF(v24_flags, OSMO_V110_TA_C_109); + v110_ta_flags_update(ta, v24_flags); } /* ITU-T V.110 Section 7.1.1 */ @@ -354,24 +358,25 @@ case V110_TA_EV_RX_FRAME_IND: { const struct osmo_v110_decoded_frame *df = data; + unsigned int v24_flags = ta->state.v24_flags; /* 7.1.2.4 When the receiver recognizes that the status of bits S and X are ON */ if (v110_df_s_bits_are(df, V110_SX_BIT_ON) && v110_df_x_bits_are(df, V110_SX_BIT_ON)) { /* ... it will perform the following functions: */ /* a) Turn ON circuit 107 toward the DTE and stop timer T1 */ - V24_FLAGMASK_SET_ON(ts->v24_flags, OSMO_V110_TA_C_107); + V24_FLAGMASK_SET_ON(v24_flags, OSMO_V110_TA_C_107); osmo_timer_del(&fi->timer); /* b) Then, circuit 103 may be connected to the data bits in the frame; however, the * DTE must maintain a binary 1 condition on circuit 103 until circuit 106 is turned * ON in the next portion of the sequence. */ /* c) Turn ON circuit 109 and connect the data bits to circuit 104. */ - V24_FLAGMASK_SET_ON(ts->v24_flags, OSMO_V110_TA_C_109); + V24_FLAGMASK_SET_ON(v24_flags, OSMO_V110_TA_C_109); ts->rx.d_bit_mode = V110_TA_DBIT_M_FORWARD; /* d) After an interval of N bits (see 6.3), it will turn ON circuit 106. */ - V24_FLAGMASK_SET_ON(ts->v24_flags, OSMO_V110_TA_C_106); + V24_FLAGMASK_SET_ON(v24_flags, OSMO_V110_TA_C_106); ts->tx.d_bit_mode = V110_TA_DBIT_M_FORWARD; - v110_ta_flags_updated(ta); + v110_ta_flags_update(ta, v24_flags); /* Circuit 106 transitioning from OFF to ON will cause the transmitted data to * transition from binary 1 to the data mode. */ v110_ta_fsm_state_chg(V110_TA_ST_DATA_TRANSFER); @@ -396,13 +401,14 @@ { struct osmo_v110_ta *ta = (struct osmo_v110_ta *)fi->priv; struct v110_ta_state *ts = &ta->state; + unsigned int v24_flags = ta->state.v24_flags; /* 7.1.3.1 While in the data transfer state, the following circuit conditions exist: * a): 105, 107, 108, and 109 are in the ON condition */ /* XXX: OSMO_ASSERT(V24_FLAGMASK_IS_ON(ts->v24_flags, OSMO_V110_TA_C_105)); */ - V24_FLAGMASK_SET_ON(ts->v24_flags, OSMO_V110_TA_C_107); + V24_FLAGMASK_SET_ON(v24_flags, OSMO_V110_TA_C_107); /* XXX: OSMO_ASSERT(V24_FLAGMASK_IS_ON(ts->v24_flags, OSMO_V110_TA_C_108)); */ - V24_FLAGMASK_SET_ON(ts->v24_flags, OSMO_V110_TA_C_109); + V24_FLAGMASK_SET_ON(v24_flags, OSMO_V110_TA_C_109); /* b) data is being transmitted on circuit 103 and received on circuit 104 */ ts->rx.d_bit_mode = V110_TA_DBIT_M_FORWARD; ts->tx.d_bit_mode = V110_TA_DBIT_M_FORWARD; @@ -410,9 +416,9 @@ * flow control is being used, either or both circuits may be in the ON or the OFF condition. */ if (!ta->cfg->flow_ctrl.end_to_end) { /* XXX: OSMO_ASSERT(V24_FLAGMASK_IS_ON(ts->v24_flags, OSMO_V110_TA_C_133)); */ - V24_FLAGMASK_SET_ON(ts->v24_flags, OSMO_V110_TA_C_106); + V24_FLAGMASK_SET_ON(v24_flags, OSMO_V110_TA_C_106); } - v110_ta_flags_updated(ta); + v110_ta_flags_update(ta, v24_flags); /* 7.1.3.2 While in the data transfer state, the following status bit conditions exist: */ /* a) status bits S in both directions are in the ON condition; */ @@ -453,14 +459,15 @@ case V110_TA_EV_RX_FRAME_IND: { const struct osmo_v110_decoded_frame *df = data; + unsigned int v24_flags = ta->state.v24_flags; /* 7.1.4.2 ... this TA will recognize the transition of the status bits S from * ON to OFF and the data bits from data to binary 0 as a disconnect request */ if (v110_df_s_bits_are(df, V110_SX_BIT_OFF) && v110_df_d_bits_are(df, 0)) { /* ... and it will turn OFF circuits 107 and 109. */ - V24_FLAGMASK_SET_OFF(ts->v24_flags, OSMO_V110_TA_C_107); - V24_FLAGMASK_SET_OFF(ts->v24_flags, OSMO_V110_TA_C_109); - v110_ta_flags_updated(ta); + V24_FLAGMASK_SET_OFF(v24_flags, OSMO_V110_TA_C_107); + V24_FLAGMASK_SET_OFF(v24_flags, OSMO_V110_TA_C_109); + v110_ta_flags_update(ta, v24_flags); /* DTE should respond by turning OFF circuit 108 */ break; /* XXX: shall we forward D-bits to DTE anyway? */ } @@ -478,14 +485,15 @@ { struct osmo_v110_ta *ta = (struct osmo_v110_ta *)fi->priv; struct v110_ta_state *ts = &ta->state; + unsigned int v24_flags = ta->state.v24_flags; /* 7.1.4.1 At the completion of the data transfer phase, the local DTE will indicate a * disconnect request by turning OFF circuit 108. This will cause the following to occur: */ /* a) the status bits S in the frame toward ISDN will turn OFF, status bits X are kept ON */ ts->tx.s_bits = V110_SX_BIT_OFF; /* b) circuit 106 will be turned OFF */ - V24_FLAGMASK_SET_OFF(ts->v24_flags, OSMO_V110_TA_C_106); - v110_ta_flags_updated(ta); + V24_FLAGMASK_SET_OFF(v24_flags, OSMO_V110_TA_C_106); + v110_ta_flags_update(ta, v24_flags); /* c) the data bits in the frame will be set to binary 0. */ ts->tx.d_bit_mode = V110_TA_DBIT_M_ALL_ZERO; @@ -554,6 +562,7 @@ { struct osmo_v110_ta *ta = (struct osmo_v110_ta *)fi->priv; struct v110_ta_state *ts = &ta->state; + unsigned int v24_flags = ta->state.v24_flags; switch (event) { case V110_TA_EV_V24_STATUS_CHG: @@ -575,8 +584,8 @@ ts->tx.x_bits = V110_SX_BIT_OFF; ts->tx.d_bit_mode = V110_TA_DBIT_M_ALL_ZERO; /* TODO: actually Tx those frames (delay state transition) */ - V24_FLAGMASK_SET_OFF(ts->v24_flags, OSMO_V110_TA_C_107); - v110_ta_flags_updated(ta); + V24_FLAGMASK_SET_OFF(v24_flags, OSMO_V110_TA_C_107); + v110_ta_flags_update(ta, v24_flags); v110_ta_fsm_state_chg(V110_TA_ST_DISCONNECTING); break; default: diff --git a/tests/v110/ta_test.err b/tests/v110/ta_test.err index 347f8f6..e8f80e6 100644 --- a/tests/v110/ta_test.err +++ b/tests/v110/ta_test.err @@ -2,7 +2,6 @@ ==== Running test_idle_ready() DLGLOBAL DEBUG V110-TA(test_idle_ready){IDLE_READY}: Allocated DLGLOBAL DEBUG V110-TA(test_idle_ready){IDLE_READY}: State change to IDLE_READY (no timeout) -v110_ta_test_status_update_cb(status=0x00000000) Initial status: 0x00000000 circuit 106/CTS (Clear to Send) is OFF (expected to be OFF) circuit 107/DSR (Data Set Ready) is OFF (expected to be OFF) @@ -29,7 +28,6 @@ setting circuit 108/DTR (Data Terminal Ready) OFF DLGLOBAL DEBUG V110-TA(test_idle_ready){CONNECT_TA_TO_LINE}: Received Event V24_STATUS_CHG DLGLOBAL DEBUG V110-TA(test_idle_ready){CONNECT_TA_TO_LINE}: State change to IDLE_READY (no timeout) -v110_ta_test_status_update_cb(status=0x00000000) osmo_v110_ta_set_circuit() returns 0 setting circuit 108/DTR (Data Terminal Ready) ON DLGLOBAL DEBUG V110-TA(test_idle_ready){IDLE_READY}: Received Event V24_STATUS_CHG @@ -40,7 +38,6 @@ ==== Running test_conn_ta_line() DLGLOBAL DEBUG V110-TA(test_conn_ta_line){IDLE_READY}: Allocated DLGLOBAL DEBUG V110-TA(test_conn_ta_line){IDLE_READY}: State change to IDLE_READY (no timeout) -v110_ta_test_status_update_cb(status=0x00000000) setting circuit 108/DTR (Data Terminal Ready) ON DLGLOBAL DEBUG V110-TA(test_conn_ta_line){IDLE_READY}: Received Event V24_STATUS_CHG DLGLOBAL DEBUG V110-TA(test_conn_ta_line){IDLE_READY}: State change to CONNECT_TA_TO_LINE (T1, 10s) @@ -79,7 +76,6 @@ DLGLOBAL DEBUG V110-TA(test_conn_ta_line){CONNECT_TA_TO_LINE}: Received Event RX_FRAME_IND v110_ta_test_status_update_cb(status=0x0000001e) DLGLOBAL DEBUG V110-TA(test_conn_ta_line){CONNECT_TA_TO_LINE}: State change to DATA_TRANSFER (no timeout) -v110_ta_test_status_update_cb(status=0x0000001e) v110_ta_test_rx_cb(buf_size=48): 010101010101010101010101010101010101010101010101 osmo_v110_ta_frame_in() returns 0 DLGLOBAL DEBUG V110-TA(test_conn_ta_line){DATA_TRANSFER}: Deallocated @@ -87,7 +83,6 @@ ==== Running test_data_transfer() DLGLOBAL DEBUG V110-TA(test_data_transfer){IDLE_READY}: Allocated DLGLOBAL DEBUG V110-TA(test_data_transfer){IDLE_READY}: State change to IDLE_READY (no timeout) -v110_ta_test_status_update_cb(status=0x00000000) setting circuit 108/DTR (Data Terminal Ready) ON DLGLOBAL DEBUG V110-TA(test_data_transfer){IDLE_READY}: Received Event V24_STATUS_CHG DLGLOBAL DEBUG V110-TA(test_data_transfer){IDLE_READY}: State change to CONNECT_TA_TO_LINE (T1, 10s) @@ -102,7 +97,6 @@ DLGLOBAL DEBUG V110-TA(test_data_transfer){CONNECT_TA_TO_LINE}: Received Event RX_FRAME_IND v110_ta_test_status_update_cb(status=0x0000001e) DLGLOBAL DEBUG V110-TA(test_data_transfer){CONNECT_TA_TO_LINE}: State change to DATA_TRANSFER (no timeout) -v110_ta_test_status_update_cb(status=0x0000001e) v110_ta_test_rx_cb(buf_size=48): 010101010101010101010101010101010101010101010101 osmo_v110_ta_frame_in() returns 0 circuit 106/CTS (Clear to Send) is ON (expected to be ON) @@ -127,7 +121,6 @@ ==== Running test_data_transfer_disc_local() DLGLOBAL DEBUG V110-TA(test_data_transfer_disc_local){IDLE_READY}: Allocated DLGLOBAL DEBUG V110-TA(test_data_transfer_disc_local){IDLE_READY}: State change to IDLE_READY (no timeout) -v110_ta_test_status_update_cb(status=0x00000000) setting circuit 108/DTR (Data Terminal Ready) ON DLGLOBAL DEBUG V110-TA(test_data_transfer_disc_local){IDLE_READY}: Received Event V24_STATUS_CHG DLGLOBAL DEBUG V110-TA(test_data_transfer_disc_local){IDLE_READY}: State change to CONNECT_TA_TO_LINE (T1, 10s) @@ -142,7 +135,6 @@ DLGLOBAL DEBUG V110-TA(test_data_transfer_disc_local){CONNECT_TA_TO_LINE}: Received Event RX_FRAME_IND v110_ta_test_status_update_cb(status=0x0000001e) DLGLOBAL DEBUG V110-TA(test_data_transfer_disc_local){CONNECT_TA_TO_LINE}: State change to DATA_TRANSFER (no timeout) -v110_ta_test_status_update_cb(status=0x0000001e) v110_ta_test_rx_cb(buf_size=48): 010101010101010101010101010101010101010101010101 osmo_v110_ta_frame_in() returns 0 local TE initiates disconnection @@ -189,7 +181,6 @@ ==== Running test_data_transfer_disc_remote() DLGLOBAL DEBUG V110-TA(test_data_transfer_disc_remote){IDLE_READY}: Allocated DLGLOBAL DEBUG V110-TA(test_data_transfer_disc_remote){IDLE_READY}: State change to IDLE_READY (no timeout) -v110_ta_test_status_update_cb(status=0x00000000) setting circuit 108/DTR (Data Terminal Ready) ON DLGLOBAL DEBUG V110-TA(test_data_transfer_disc_remote){IDLE_READY}: Received Event V24_STATUS_CHG DLGLOBAL DEBUG V110-TA(test_data_transfer_disc_remote){IDLE_READY}: State change to CONNECT_TA_TO_LINE (T1, 10s) @@ -204,7 +195,6 @@ DLGLOBAL DEBUG V110-TA(test_data_transfer_disc_remote){CONNECT_TA_TO_LINE}: Received Event RX_FRAME_IND v110_ta_test_status_update_cb(status=0x0000001e) DLGLOBAL DEBUG V110-TA(test_data_transfer_disc_remote){CONNECT_TA_TO_LINE}: State change to DATA_TRANSFER (no timeout) -v110_ta_test_status_update_cb(status=0x0000001e) v110_ta_test_rx_cb(buf_size=48): 010101010101010101010101010101010101010101010101 osmo_v110_ta_frame_in() returns 0 remote TE initiates disconnection @@ -227,7 +217,6 @@ osmo_v110_ta_set_circuit() returns 0 DLGLOBAL DEBUG V110-TA(test_data_transfer_disc_remote){DISCONNECTING}: Received Event DESYNC_IND DLGLOBAL DEBUG V110-TA(test_data_transfer_disc_remote){DISCONNECTING}: State change to IDLE_READY (no timeout) -v110_ta_test_status_update_cb(status=0x00000000) circuit 106/CTS (Clear to Send) is OFF (expected to be OFF) circuit 107/DSR (Data Set Ready) is OFF (expected to be OFF) circuit 109/DCD (Data Carrier Detect) is OFF (expected to be OFF) @@ -236,7 +225,6 @@ ==== Running test_syncing() DLGLOBAL DEBUG V110-TA(test_syncing){IDLE_READY}: Allocated DLGLOBAL DEBUG V110-TA(test_syncing){IDLE_READY}: State change to IDLE_READY (no timeout) -v110_ta_test_status_update_cb(status=0x00000000) setting circuit 108/DTR (Data Terminal Ready) ON DLGLOBAL DEBUG V110-TA(test_syncing){IDLE_READY}: Received Event V24_STATUS_CHG DLGLOBAL DEBUG V110-TA(test_syncing){IDLE_READY}: State change to CONNECT_TA_TO_LINE (T1, 10s) @@ -251,7 +239,6 @@ DLGLOBAL DEBUG V110-TA(test_syncing){CONNECT_TA_TO_LINE}: Received Event RX_FRAME_IND v110_ta_test_status_update_cb(status=0x0000001e) DLGLOBAL DEBUG V110-TA(test_syncing){CONNECT_TA_TO_LINE}: State change to DATA_TRANSFER (no timeout) -v110_ta_test_status_update_cb(status=0x0000001e) v110_ta_test_rx_cb(buf_size=48): 010101010101010101010101010101010101010101010101 osmo_v110_ta_frame_in() returns 0 osmo_v110_ta_sync_ind(): the lower layer indicates out-of-sync event @@ -270,7 +257,6 @@ osmo_v110_ta_sync_ind(): the lower layer indicates sync event DLGLOBAL DEBUG V110-TA(test_syncing){RESYNCING}: Received Event SYNC_IND DLGLOBAL DEBUG V110-TA(test_syncing){RESYNCING}: State change to DATA_TRANSFER (no timeout) -v110_ta_test_status_update_cb(status=0x0000001e) osmo_v110_ta_frame_out(): S-bits are expected to be 0 (ON) osmo_v110_ta_frame_out(): X-bits are expected to be 0 (ON) osmo_v110_ta_frame_out(): D-bits are to be set by .tx_cb() -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35639?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9626d3e737d4e072fa163115c4cdf9ee6ee0968e Gerrit-Change-Number: 35639 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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-msc[master]: SDP/MGCP: pass octet-align=1 for AMR / pass all fmtp
by osmith 25 Jan '24

25 Jan '24

Attention is currently required from: fixeria, neels, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/35307?usp=email ) Change subject: SDP/MGCP: pass octet-align=1 for AMR / pass all fmtp ...................................................................... Patch Set 3: (1 comment) File configure.ac: https://gerrit.osmocom.org/c/osmo-msc/+/35307/comment/519b1ac7_5c305e1f PS3, Line 48: PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.13.0) > now this ... […] yes. just mention it in the TODO-RELEASE, and don't change the PKG_CHECK_MODULES line in configure.ac, doing that is part of the release process. https://osmocom.org/projects/cellular-infrastructure/wiki/Make_a_new_releas… -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/35307?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ief9225c9bcf7525a9a0a07c282ffb8cc0d092186 Gerrit-Change-Number: 35307 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 25 Jan 2024 07:47:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[M] Change in libosmocore[master]: isdn/v110_ta: avoid redundant .status_update_cb() calls
by osmith 25 Jan '24

25 Jan '24

Attention is currently required from: fixeria, laforge. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35639?usp=email ) Change subject: isdn/v110_ta: avoid redundant .status_update_cb() calls ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35639?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9626d3e737d4e072fa163115c4cdf9ee6ee0968e Gerrit-Change-Number: 35639 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 25 Jan 2024 07:44:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[L] Change in osmo-ttcn3-hacks[master]: DIAMETER: Split Gy and Gx messages to their own TS files
by osmith 25 Jan '24

25 Jan '24

Attention is currently required from: jolly, lynxis lazus, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35671?usp=email ) Change subject: DIAMETER: Split Gy and Gx messages to their own TS files ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35671?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibe0d5f263813d5083e020c942283f214983162b4 Gerrit-Change-Number: 35671 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Thu, 25 Jan 2024 07:37:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-sip-connector[master]: verbosely log MNCC and SDP
by neels 25 Jan '24

25 Jan '24

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/35308?usp=email ) Change subject: verbosely log MNCC and SDP ...................................................................... verbosely log MNCC and SDP Change-Id: Ie923117929c6b79b1eb61e5a9f02a169edabc599 --- M src/mncc.c M src/sdp.c M src/sip.c 3 files changed, 68 insertions(+), 8 deletions(-) Approvals: neels: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/mncc.c b/src/mncc.c index ed36085..12cc359 100644 --- a/src/mncc.c +++ b/src/mncc.c @@ -134,12 +134,14 @@ { int rc; + LOGP(DMNCC, LOGL_DEBUG, "tx MNCC %s with SDP=%s\n", osmo_mncc_name(mncc->msg_type), + osmo_quote_str(mncc->sdp, -1)); + /* * TODO: we need to put cause in here for release or such? shall we return a * static struct? */ rc = write(conn->fd.fd, mncc, sizeof(*mncc)); - LOGP(DMNCC, LOGL_DEBUG, "MNCC sent message type: %s\n", osmo_mncc_name(mncc->msg_type)); if (rc != sizeof(*mncc)) { LOGP(DMNCC, LOGL_ERROR, "Failed to send message for call(%u)\n", mncc->callref); close_connection(conn); @@ -160,8 +162,10 @@ { int rc; + LOGP(DMNCC, LOGL_DEBUG, "tx MNCC %s with SDP=%s\n", osmo_mncc_name(rtp->msg_type), + osmo_quote_str(rtp->sdp, -1)); + rc = write(conn->fd.fd, rtp, sizeof(*rtp)); - LOGP(DMNCC, LOGL_DEBUG, "MNCC sent message type: %s\n", osmo_mncc_name(rtp->msg_type)); if (rc != sizeof(*rtp)) { LOGP(DMNCC, LOGL_ERROR, "Failed to send message for call(%u): %d\n", rtp->callref, rc); close_connection(conn); @@ -1028,6 +1032,53 @@ conn->state = MNCC_WAIT_VERSION; } +static inline void log_mncc(const char *label, const uint8_t *buf, size_t buflen) +{ + uint32_t msg_type; + const struct gsm_mncc *gsm_mncc; + const struct gsm_mncc_rtp *gsm_mncc_rtp; + const char *sdp = NULL; + + /* Any size errors will be logged elsewhere already, so just exit here if the buffer is too small. */ + if (buflen < 4) + return; + memcpy(&msg_type, buf, 4); + + switch (msg_type) { + case MNCC_SETUP_IND: + case MNCC_DISC_IND: + case MNCC_REL_IND: + case MNCC_REJ_IND: + case MNCC_REL_CNF: + case MNCC_SETUP_COMPL_IND: + case MNCC_SETUP_CNF: + case MNCC_CALL_CONF_IND: + case MNCC_ALERT_IND: + case MNCC_HOLD_IND: + case MNCC_RETRIEVE_IND: + if (buflen < sizeof(gsm_mncc)) + return; + gsm_mncc = (void *)buf; + sdp = gsm_mncc->sdp; + break; + case MNCC_RTP_CREATE: + case MNCC_RTP_CONNECT: + if (buflen < sizeof(gsm_mncc_rtp)) + return; + gsm_mncc_rtp = (void *)buf; + sdp = gsm_mncc_rtp->sdp; + break; + + default: + break; + } + if (sdp) + LOGP(DMNCC, LOGL_DEBUG, "%sMNCC %s with SDP=%s\n", label, osmo_mncc_name(msg_type), + osmo_quote_str(sdp, -1)); + else + LOGP(DMNCC, LOGL_DEBUG, "%sMNCC %s\n", label, osmo_mncc_name(msg_type)); +} + /* osmo-fd read call-back for MNCC socket: read MNCC message + dispatch it */ static int mncc_data(struct osmo_fd *fd, unsigned int what) { @@ -1047,10 +1098,10 @@ goto bad_data; } + log_mncc("rx ", (void *)buf, rc); + + /* Handle the received MNCC message */ memcpy(&msg_type, buf, 4); - - LOGP(DMNCC, LOGL_DEBUG, "MNCC rcvd message type: %s\n", osmo_mncc_name(msg_type)); - switch (msg_type) { case MNCC_SOCKET_HELLO: check_hello(conn, buf, rc); diff --git a/src/sdp.c b/src/sdp.c index 7e632c3..ed57031 100644 --- a/src/sdp.c +++ b/src/sdp.c @@ -322,7 +322,7 @@ sdp = sdp_session(parser); if (!sdp) { - LOGP(DSIP, LOGL_ERROR, "leg(%p) no sdp session\n", other); + LOGP(DSIP, LOGL_INFO, "leg(%p) no SDP session in %s, returning SDP unchanged\n", other, osmo_quote_str(sdp_data, -1)); sdp_parser_free(parser); return talloc_strdup(leg, sdp_data); } diff --git a/src/sip.c b/src/sip.c index 0c8130f..99bab9f 100644 --- a/src/sip.c +++ b/src/sip.c @@ -358,8 +358,8 @@ void nua_callback(nua_event_t event, int status, char const *phrase, nua_t *nua, nua_magic_t *magic, nua_handle_t *nh, nua_hmagic_t *hmagic, sip_t const *sip, tagi_t tags[]) { - LOGP(DSIP, LOGL_DEBUG, "SIP event[%s] status(%d) phrase(%s) %p\n", - nua_event_name(event), status, phrase, hmagic); + LOGP(DSIP, LOGL_DEBUG, "SIP event[%s] status(%d) phrase(%s) SDP(%s) %p\n", + nua_event_name(event), status, phrase, sip_get_sdp(sip), hmagic); if (event == nua_r_invite) { struct sip_call_leg *leg; -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/35308?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ie923117929c6b79b1eb61e5a9f02a169edabc599 Gerrit-Change-Number: 35308 Gerrit-PatchSet: 5 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-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in osmo-sip-connector[master]: verbosely log MNCC and SDP
by neels 25 Jan '24

25 Jan '24

Attention is currently required from: fixeria, laforge, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/35308?usp=email ) Change subject: verbosely log MNCC and SDP ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/35308?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ie923117929c6b79b1eb61e5a9f02a169edabc599 Gerrit-Change-Number: 35308 Gerrit-PatchSet: 5 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-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 25 Jan 2024 01:56:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-sip-connector[master]: verbosely log MNCC and SDP
by neels 25 Jan '24

25 Jan '24

Attention is currently required from: fixeria, laforge, neels, pespin. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/35308?usp=email to look at the new patch set (#5). The following approvals got outdated and were removed: Code-Review+2 by neels, Verified-1 by Jenkins Builder Change subject: verbosely log MNCC and SDP ...................................................................... verbosely log MNCC and SDP Change-Id: Ie923117929c6b79b1eb61e5a9f02a169edabc599 --- M src/mncc.c M src/sdp.c M src/sip.c 3 files changed, 68 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/08/35308/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/35308?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ie923117929c6b79b1eb61e5a9f02a169edabc599 Gerrit-Change-Number: 35308 Gerrit-PatchSet: 5 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-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[M] Change in osmo-sip-connector[master]: verbosely log MNCC and SDP
by neels 25 Jan '24

25 Jan '24

Attention is currently required from: fixeria, laforge, neels, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/35308?usp=email ) Change subject: verbosely log MNCC and SDP ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/35308?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ie923117929c6b79b1eb61e5a9f02a169edabc599 Gerrit-Change-Number: 35308 Gerrit-PatchSet: 4 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-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 25 Jan 2024 01:54:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-sip-connector[master]: verbosely log MNCC and SDP
by Jenkins Builder 25 Jan '24

25 Jan '24

Attention is currently required from: fixeria, laforge, neels, pespin. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/35308?usp=email ) Change subject: verbosely log MNCC and SDP ...................................................................... Patch Set 4: (1 comment) File src/mncc.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-13836): https://gerrit.osmocom.org/c/osmo-sip-connector/+/35308/comment/69a6a3c1_5e… PS4, Line 1101: log_mncc("rx ", (void*)buf, rc); "(foo*)" should be "(foo *)" -- To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/35308?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sip-connector Gerrit-Branch: master Gerrit-Change-Id: Ie923117929c6b79b1eb61e5a9f02a169edabc599 Gerrit-Change-Number: 35308 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 25 Jan 2024 01:53:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0