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

Change in osmo-ttcn3-hacks[master]: lib/DIAMETER: Allow sending CEA with AuthAppId

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27424 ) Change subject: lib/DIAMETER: Allow sending CEA with AuthAppId ...................................................................... Patch Set 3: (1 comment) File library/DIAMETER_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27424/comment/0bb32667_1fd2… PS3, Line 868: template (value) charstring origin_host, template (value) charstring origin_realm, > What's wrong with it? I'm using already used alignment here, see line 888 But you're changing the template name, breaking the old alignment. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27424 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: I0e33673d65140aad34d2efcae3c7f49154ceb99f Gerrit-Change-Number: 27424 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 09 Mar 2022 13:17:15 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: lib/DIAMETER: Allow sending CEA with AuthAppId

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27424 ) Change subject: lib/DIAMETER: Allow sending CEA with AuthAppId ...................................................................... Patch Set 3: (1 comment) File library/DIAMETER_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27424/comment/c4fb764c_16ad… PS3, Line 868: template (value) charstring origin_host, template (value) charstring origin_realm, > Alignment needs to be fixed. What's wrong with it? I'm using already used alignment here, see line 888 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27424 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: I0e33673d65140aad34d2efcae3c7f49154ceb99f Gerrit-Change-Number: 27424 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 09 Mar 2022 13:14:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: sgsn: add TC_iu_attach_encr with UEA > 0

by fixeria

Attention is currently required from: neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27428 ) Change subject: sgsn: add TC_iu_attach_encr with UEA > 0 ...................................................................... Patch Set 1: Code-Review+1 (2 comments) File sgsn/SGSN_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27428/comment/22a64663_1c1d… PS1, Line 691: private function f_mm_ciph_utran() runs on BSSGP_ConnHdlr This looks more like an altstep to me rather than a function. If you turn it into an altstep, we would be able to use it in 'alt' statements later. At the same time, you would still be able to execute it like a function. Not a merge blocker though. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27428/comment/6616d71c_5c67… PS1, Line 691: mm It should be '_gmm_' in the context of GPRS. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27428 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: I1a7c3b156830058c43f15f55883ea301d2d01d5f Gerrit-Change-Number: 27428 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(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-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Wed, 09 Mar 2022 13:13:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in docker-playground[master]: ttcn3-ggsn-ogs: Change diameter node id to pcrf

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27422 ) Change subject: ttcn3-ggsn-ogs: Change diameter node id to pcrf ...................................................................... ttcn3-ggsn-ogs: Change diameter node id to pcrf This better identifies the peer, specially since we'll also connect to an OCS in the future. Depends: osmo-ttcn3-hacks.git Change- Id I1eb03d907b46c4bb24491f390ef468e831190e08 Change-Id: I4c9f90de1456cf1515c9a0608b44a44fa8acb311 --- M ttcn3-ggsn-test/ogs/freediameter.conf 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/ttcn3-ggsn-test/ogs/freediameter.conf b/ttcn3-ggsn-test/ogs/freediameter.conf index 214ae2c..a770a0f 100644 --- a/ttcn3-ggsn-test/ogs/freediameter.conf +++ b/ttcn3-ggsn-test/ogs/freediameter.conf @@ -261,7 +261,7 @@ # Examples: #ConnectPeer = "aaa.wide.ad.jp"; #ConnectPeer = "old.diameter.serv" { TcTimer = 60; TLS_old_method; No_SCTP; Port=3868; } ; -ConnectPeer = "ttcn3ggsntest.localdomain" { ConnectTo = "172.18.3.202"; Port = 3868; No_TLS; TcTimer = 2; }; +ConnectPeer = "pcrf.localdomain" { ConnectTo = "172.18.3.202"; Port = 3868; No_TLS; TcTimer = 2; }; ############################################################## -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27422 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I4c9f90de1456cf1515c9a0608b44a44fa8acb311 Gerrit-Change-Number: 27422 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ggsn: Rename diameter generic ports to Gx

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27421 ) Change subject: ggsn: Rename diameter generic ports to Gx ...................................................................... ggsn: Rename diameter generic ports to Gx We'll start emulating other Diameter-based interfaces soon (Gy), so let's rename existing stuff which is Gx specific. The DIAMETER_Emulation only supports handling 1 application-id per component, and that's fine anyway since the OCS is in general expected to run in a different conn/node from PCRF. Change-Id: I1eb03d907b46c4bb24491f390ef468e831190e08 --- M ggsn_tests/GGSN_Tests.ttcn 1 file changed, 19 insertions(+), 19 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index eb09555..7a7ff97 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -125,9 +125,9 @@ var integer g_use_echo_intval := 0; /* 0 = disabled */ /* emulated PCRF, used with m_ggsn_impl = GGSN_IMPL_OPEN5GS */ - var DIAMETER_Emulation_CT vc_DIAMETER; - port DIAMETER_PT DIAMETER_UNIT; - port DIAMETEREM_PROC_PT DIAMETER_PROC; + var DIAMETER_Emulation_CT vc_Gx; + port DIAMETER_PT Gx_UNIT; + port DIAMETEREM_PROC_PT Gx_PROC; } private function f_init_vty() runs on GT_CT { @@ -208,17 +208,17 @@ remote_sctp_port := -1, local_ip := m_bind_ip_gtpc, local_sctp_port := PCRF_PORT, - origin_host := "ttcn3ggsntest.localdomain", + origin_host := "pcrf.localdomain", origin_realm := "localdomain", vendor_app_id := c_DIAMETER_3GPP_Gx_AID }; - vc_DIAMETER := DIAMETER_Emulation_CT.create(id); - map(vc_DIAMETER:DIAMETER, system:DIAMETER_CODEC_PT); - connect(vc_DIAMETER:DIAMETER_UNIT, self:DIAMETER_UNIT); - connect(vc_DIAMETER:DIAMETER_PROC, self:DIAMETER_PROC); - vc_DIAMETER.start(DIAMETER_Emulation.main(ops, pars, id)); + vc_Gx := DIAMETER_Emulation_CT.create(id); + map(vc_Gx:DIAMETER, system:DIAMETER_CODEC_PT); + connect(vc_Gx:DIAMETER_UNIT, self:Gx_UNIT); + connect(vc_Gx:DIAMETER_PROC, self:Gx_PROC); + vc_Gx.start(DIAMETER_Emulation.main(ops, pars, id)); - f_diameter_wait_capability(DIAMETER_UNIT); + f_diameter_wait_capability(Gx_UNIT); /* Give some time for our emulation to get out of SUSPECT list of SUT (3 watchdong ping-pongs): * RFC6733 sec 5.1 * RFC3539 sec 3.4.1 [5] @@ -426,7 +426,7 @@ private altstep as_DIA_CCR(DCC_NONE_CC_Request_Type req_type) runs on GT_CT { var PDU_DIAMETER rx_dia; - [] DIAMETER_UNIT.receive(tr_DIA_CCR(req_type := req_type)) -> value rx_dia { + [] Gx_UNIT.receive(tr_DIA_CCR(req_type := req_type)) -> value rx_dia { var template (omit) AVP avp; var octetstring sess_id; var AVP_Unsigned32 req_num; @@ -437,10 +437,10 @@ avp := f_DIAMETER_get_avp(rx_dia, c_AVP_Code_DCC_NONE_CC_Request_Number); req_num := valueof(avp.avp_data.avp_DCC_NONE_CC_Request_Number); - DIAMETER_UNIT.send(ts_DIA_CCA(rx_dia.hop_by_hop_id, rx_dia.end_to_end_id, sess_id, + Gx_UNIT.send(ts_DIA_CCA(rx_dia.hop_by_hop_id, rx_dia.end_to_end_id, sess_id, req_type, req_num)); } - [] DIAMETER_UNIT.receive(PDU_DIAMETER:?) -> value rx_dia { + [] Gx_UNIT.receive(PDU_DIAMETER:?) -> value rx_dia { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("Received unexpected DIAMETER ", rx_dia)); } @@ -458,7 +458,7 @@ g_sgsn_ip_c, g_sgsn_ip_u, ctx.msisdn, ctx.pco_req, ctx.ratType, ctx.uli)); T_default.start; d := activate(pingpong()); - if (DIAMETER_PROC.checkstate("Connected")) { + if (Gx_PROC.checkstate("Connected")) { as_DIA_CCR(INITIAL_REQUEST); } alt { @@ -520,7 +520,7 @@ f_send_gtpc(ts_GTPC_DeletePDP(g_peer_c, g_c_seq_nr, ctx.teic_remote, ctx.nsapi, teardown_ind)); T_default.start; d := activate(pingpong()); - if (DIAMETER_PROC.checkstate("Connected") and expect_diameter) { + if (Gx_PROC.checkstate("Connected") and expect_diameter) { as_DIA_CCR(TERMINATION_REQUEST); } alt { @@ -1937,7 +1937,7 @@ T_next.start; alt { - [DIAMETER_PROC.checkstate("Connected")] as_DIA_CCR(INITIAL_REQUEST) { repeat; } + [Gx_PROC.checkstate("Connected")] as_DIA_CCR(INITIAL_REQUEST) { repeat; } [] pingpong(); [] T_next.timeout { f_send_gtpc(ts_GTPC_CreatePDP(g_peer_c, g_c_seq_nr, ctx[next_req_ctx].imsi, g_restart_ctr, @@ -1991,7 +1991,7 @@ rx_resp_ctx := 0; T_next.start; alt { - [DIAMETER_PROC.checkstate("Connected")] as_DIA_CCR(TERMINATION_REQUEST) { repeat; } + [Gx_PROC.checkstate("Connected")] as_DIA_CCR(TERMINATION_REQUEST) { repeat; } [] pingpong(); [] T_next.timeout { f_send_gtpc(ts_GTPC_DeletePDP(g_peer_c, g_c_seq_nr, ctx[next_req_ctx].teic_remote, ctx[next_req_ctx].nsapi, '1'B)); @@ -2043,7 +2043,7 @@ T_next.start; alt { - [DIAMETER_PROC.checkstate("Connected")] as_DIA_CCR(INITIAL_REQUEST) { repeat; } + [Gx_PROC.checkstate("Connected")] as_DIA_CCR(INITIAL_REQUEST) { repeat; } [] pingpong(); [] T_next.timeout { if (cont_req) { @@ -2092,7 +2092,7 @@ rx_resp_ctx := 0; T_next.start; alt { - [DIAMETER_PROC.checkstate("Connected")] as_DIA_CCR(TERMINATION_REQUEST) { repeat; } + [Gx_PROC.checkstate("Connected")] as_DIA_CCR(TERMINATION_REQUEST) { repeat; } [] pingpong(); [] T_next.timeout { f_send_gtpc(ts_GTPC_DeletePDP(g_peer_c, g_c_seq_nr, teic_list[next_req_ctx], '0001'B, '1'B)); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27421 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: I1eb03d907b46c4bb24491f390ef468e831190e08 Gerrit-Change-Number: 27421 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(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

3 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ggsn: Rename diameter generic ports to Gx

by fixeria

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27421 ) Change subject: ggsn: Rename diameter generic ports to Gx ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27421 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: I1eb03d907b46c4bb24491f390ef468e831190e08 Gerrit-Change-Number: 27421 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(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-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 09 Mar 2022 13:04:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: lib/DIAMETER: Allow sending CEA with AuthAppId

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27424 ) Change subject: lib/DIAMETER: Allow sending CEA with AuthAppId ...................................................................... Patch Set 3: (2 comments) File library/DIAMETER_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27424/comment/fa6ff597_2b24… PS3, Line 868: template (value) charstring origin_host, template (value) charstring origin_realm, Alignment needs to be fixed. https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27424/comment/572e1d6b_84fc… PS3, Line 907: template (value) charstring origin_host, template (value) charstring origin_realm, Same here, alignment. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27424 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: I0e33673d65140aad34d2efcae3c7f49154ceb99f Gerrit-Change-Number: 27424 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 09 Mar 2022 13:02:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in osmo-ggsn[master]: gtp: Fix typo in comment

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/27419 ) Change subject: gtp: Fix typo in comment ...................................................................... gtp: Fix typo in comment Change-Id: I0e38e0966081d8b37c3f816f5330b4f52f81b7fa --- M gtp/gtp.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, approved osmith: Looks good to me, approved diff --git a/gtp/gtp.c b/gtp/gtp.c index 672c5f0..2544555 100644 --- a/gtp/gtp.c +++ b/gtp/gtp.c @@ -405,7 +405,7 @@ * element has expired */ while ((!queue_getfirst(gsn->queue_req, &qmsg)) && (qmsg->timeout <= now)) { - if (qmsg->retrans > N3_REQUESTS) { /* To many retrans */ + if (qmsg->retrans > N3_REQUESTS) { /* Too many retrans */ LOGP(DLGTP, LOGL_NOTICE, "Retransmit req queue timeout of seq %" PRIu16 "\n", qmsg->seq); if (gsn->cb_conf) -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/27419 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I0e38e0966081d8b37c3f816f5330b4f52f81b7fa Gerrit-Change-Number: 27419 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(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

3 years, 3 months

1
0
0 0

Change in osmo-ggsn[master]: gtp: Log retrans queue register&free entries

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/27417 ) Change subject: gtp: Log retrans queue register&free entries ...................................................................... gtp: Log retrans queue register&free entries Change-Id: I4e12376652fc7a6a96fbdcb579dbe916c1473012 --- M gtp/gtp.c 1 file changed, 13 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/gtp/gtp.c b/gtp/gtp.c index 608e5f9..672c5f0 100644 --- a/gtp/gtp.c +++ b/gtp/gtp.c @@ -400,15 +400,13 @@ time_t now; struct qmsg_t *qmsg; now = time(NULL); - /*printf("Retrans: New beginning %d\n", (int) now); */ /* get first element in queue, as long as the timeout of that * element has expired */ while ((!queue_getfirst(gsn->queue_req, &qmsg)) && (qmsg->timeout <= now)) { - /*printf("Retrans timeout found: %d\n", (int) time(NULL)); */ if (qmsg->retrans > N3_REQUESTS) { /* To many retrans */ - LOGP(DLGTP, LOGL_NOTICE, "Timeout of seq %" PRIu16 "\n", + LOGP(DLGTP, LOGL_NOTICE, "Retransmit req queue timeout of seq %" PRIu16 "\n", qmsg->seq); if (gsn->cb_conf) gsn->cb_conf(qmsg->type, EOF, NULL, qmsg->cbp); @@ -434,7 +432,8 @@ /* Also clean up reply timeouts */ while ((!queue_getfirst(gsn->queue_resp, &qmsg)) && (qmsg->timeout < now)) { - /*printf("Retrans (reply) timeout found: %d\n", (int) time(NULL)); */ + LOGP(DLGTP, LOGL_DEBUG, "Retransmit resp queue seq %" + PRIu16 " expired, removing from queue\n", qmsg->seq); queue_freemsg(gsn->queue_resp, qmsg); } @@ -633,6 +632,8 @@ LOGP(DLGTP, LOGL_ERROR, "Retransmit req queue is full (seq=%" PRIu16 ")\n", gsn->seq_next); } else { + LOGP(DLGTP, LOGL_DEBUG, "Registering seq=%" PRIu16 + " in restransmit req queue\n", gsn->seq_next); memcpy(&qmsg->p, packet, sizeof(union gtp_packet)); qmsg->l = len; qmsg->timeout = time(NULL) + T3_REQUEST; /* When to timeout */ @@ -660,6 +661,7 @@ { struct qmsg_t *qmsg; + LOGP(DLGTP, LOGL_INFO, "Clearing req & resp retransmit queues\n"); while (!queue_getfirst(gsn->queue_req, &qmsg)) { queue_freemsg(gsn->queue_req, qmsg); } @@ -689,10 +691,14 @@ return EOF; } + GTP_LOGPKG(LOGL_DEBUG, peer, packet, len, + "Freeing seq=%" PRIu16 " from retransmit req queue\n", + seq); if (queue_freemsg_seq(gsn->queue_req, peer, seq, type, cbp)) { gsn->err_seq++; GTP_LOGPKG(LOGL_ERROR, peer, packet, len, - "Confirmation packet not found in queue\n"); + "Confirmation packet not found in retransmit req queue (seq=%" + PRIu16 ")\n", seq); return EOF; } @@ -761,6 +767,8 @@ LOGP(DLGTP, LOGL_ERROR, "Retransmit resp queue is full (seq=%" PRIu16 ")\n", seq); } else { + LOGP(DLGTP, LOGL_DEBUG, "Registering seq=%" PRIu16 + " in restransmit resp queue\n", seq); memcpy(&qmsg->p, packet, sizeof(union gtp_packet)); qmsg->l = len; qmsg->timeout = time(NULL) + 60; /* When to timeout */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/27417 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I4e12376652fc7a6a96fbdcb579dbe916c1473012 Gerrit-Change-Number: 27417 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(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-MessageType: merged

3 years, 3 months

1
0
0 0

Change in osmo-ggsn[master]: gtp: Specify retrans queue name & seqnum in log lines

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ggsn/+/27416 ) Change subject: gtp: Specify retrans queue name & seqnum in log lines ...................................................................... gtp: Specify retrans queue name & seqnum in log lines Change-Id: I4f193d7a482ace33afd8526b5f50d2d03467d5fa --- M gtp/gtp.c 1 file changed, 4 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/gtp/gtp.c b/gtp/gtp.c index aeb9603..608e5f9 100644 --- a/gtp/gtp.c +++ b/gtp/gtp.c @@ -630,8 +630,8 @@ /* Use new queue structure */ if (queue_newmsg(gsn->queue_req, &qmsg, &addr, gsn->seq_next)) { gsn->err_queuefull++; - LOGP(DLGTP, LOGL_ERROR, - "Retransmit queue is full\n"); + LOGP(DLGTP, LOGL_ERROR, "Retransmit req queue is full (seq=%" PRIu16 ")\n", + gsn->seq_next); } else { memcpy(&qmsg->p, packet, sizeof(union gtp_packet)); qmsg->l = len; @@ -758,7 +758,8 @@ /* Use new queue structure */ if (queue_newmsg(gsn->queue_resp, &qmsg, peer, seq)) { gsn->err_queuefull++; - LOGP(DLGTP, LOGL_ERROR, "Retransmit queue is full\n"); + LOGP(DLGTP, LOGL_ERROR, "Retransmit resp queue is full (seq=%" PRIu16 ")\n", + seq); } else { memcpy(&qmsg->p, packet, sizeof(union gtp_packet)); qmsg->l = len; -- To view, visit https://gerrit.osmocom.org/c/osmo-ggsn/+/27416 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ggsn Gerrit-Branch: master Gerrit-Change-Id: I4f193d7a482ace33afd8526b5f50d2d03467d5fa Gerrit-Change-Number: 27416 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 3 months

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2022