neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/28812 )
Change subject: pfcp_endpoint: fix final PFCP retrans resp_cb
......................................................................
pfcp_endpoint: fix final PFCP retrans resp_cb
After the final retransmission of a sent request, still keep the message
in the queue for its expiry period, so that a later response is matched
to the request.
The osmo_pfcp_msg.resp_cb() depends on the sent message to remain in the
queue until it times out. That was not the case in an earlier stage of
libosmo-pfcp development.
I noticed this during ttcn3 testing, where osmo-hnbgw continuously
resends PFCP Association Setup Requests, and fails to associate if ttcn3
happens to respond to the final retransmission of a request.
Related: SYS#5599
Change-Id: Iaca396891921f7057015ce6e1e4528b955757809
---
M src/libosmo-pfcp/pfcp_endpoint.c
1 file changed, 10 insertions(+), 9 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-pfcp refs/changes/12/28812/1
diff --git a/src/libosmo-pfcp/pfcp_endpoint.c b/src/libosmo-pfcp/pfcp_endpoint.c
index 3002591..454f102 100644
--- a/src/libosmo-pfcp/pfcp_endpoint.c
+++ b/src/libosmo-pfcp/pfcp_endpoint.c
@@ -181,18 +181,19 @@
struct osmo_pfcp_msg *m = qe->m;
int rc;
- /* re-transmit */
- if (qe->n1_remaining)
- qe->n1_remaining--;
- OSMO_LOG_PFCP_MSG(m, LOGL_INFO, "re-sending (%u attempts remaining)\n", qe->n1_remaining);
-
- rc = osmo_pfcp_endpoint_tx_data_no_logging(endpoint, m);
- /* If encoding failed, it cannot ever succeed. Drop the queue entry. */
- if (rc)
- return false;
/* if no more attempts remaining, drop from queue */
if (!qe->n1_remaining)
return false;
+
+ /* re-transmit */
+ qe->n1_remaining--;
+ OSMO_LOG_PFCP_MSG(m, LOGL_INFO, "re-sending (%u attempts remaining after this)\n", qe->n1_remaining);
+
+ rc = osmo_pfcp_endpoint_tx_data_no_logging(endpoint, m);
+ /* If encoding failed, it cannot ever succeed. Drop the queue entry. (Error logging already taken care of in
+ * osmo_pfcp_endpoint_tx_data_no_logging().) */
+ if (rc)
+ return false;
/* re-schedule timer, keep in queue */
osmo_timer_schedule(&qe->t1, t1_ms/1000, (t1_ms % 1000) * 1000);
return true;
--
To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/28812
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmo-pfcp
Gerrit-Branch: master
Gerrit-Change-Id: Iaca396891921f7057015ce6e1e4528b955757809
Gerrit-Change-Number: 28812
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-MessageType: newchange
Attention is currently required from: pespin.
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-bsc/+/28811
to look at the new patch set (#2).
Change subject: tests/ctrl: Avoid creating logfile
......................................................................
tests/ctrl: Avoid creating logfile
It's of no use for the test. Furthemore, it was being created outside
the build direcory, being left there.
Change-Id: Iaeee14a01badb8439bc8893ba8be06b13e4318f3
---
M tests/ctrl/osmo-bsc-neigh-test.cfg
1 file changed, 0 insertions(+), 9 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/11/28811/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28811
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Iaeee14a01badb8439bc8893ba8be06b13e4318f3
Gerrit-Change-Number: 28811
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newpatchset
pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/28775 )
Change subject: ttcn3-cbc: Set mode server in osmo-cbc.cfg
......................................................................
ttcn3-cbc: Set mode server in osmo-cbc.cfg
TCP/SCTP client support was added recently in osmo-cbc. Since then, the
connection mode (client|server|disabled) needs to be specified in the
config. Let's update osmo-cbc.git to provide the correct info in here.
Requires: osmo-cbc.git Change-Id I3ec54b615b41b56f7a9c64298e3fcaac37f4b60e
Change-Id: I2e3a806a8371011cdb4c3b1f194e132d3896374e
---
M ttcn3-cbc-test/osmo-cbc.cfg
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
diff --git a/ttcn3-cbc-test/osmo-cbc.cfg b/ttcn3-cbc-test/osmo-cbc.cfg
index 0e131c0..c2c1b7b 100644
--- a/ttcn3-cbc-test/osmo-cbc.cfg
+++ b/ttcn3-cbc-test/osmo-cbc.cfg
@@ -32,8 +32,10 @@
local-ip 172.18.27.20
local-port 29168
peer cbsp ttcn3-bsc
+ mode server
remote-port 9999
remote-ip 172.18.27.100
peer sbcap ttcn3-mme
+ mode server
remote-port 9998
remote-ip 172.18.27.100
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/28775
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I2e3a806a8371011cdb4c3b1f194e132d3896374e
Gerrit-Change-Number: 28775
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
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-cbc/+/28803 )
Change subject: sbcap: Improve logging on non-implemented PWS Restart/Failure Ind
......................................................................
sbcap: Improve logging on non-implemented PWS Restart/Failure Ind
Change-Id: I0085ac40a7676d9c3626a9da38d02d3b1b2cf6b4
---
M src/sbcap_link_fsm.c
1 file changed, 4 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
fixeria: Looks good to me, approved
diff --git a/src/sbcap_link_fsm.c b/src/sbcap_link_fsm.c
index 39dd281..3135f1f 100644
--- a/src/sbcap_link_fsm.c
+++ b/src/sbcap_link_fsm.c
@@ -80,7 +80,7 @@
//pdu = data;
/* TODO: delete any CBS state we have for this peer */
/* TODO: re-send messages we have matching the scope of the peer */
- LOGPSBCAPC(link, LOGL_NOTICE, "RESTART but re-sending not implemented yet\n");
+ LOGPSBCAPC(link, LOGL_NOTICE, "Rx PWS Restart Indication not implemented yet\n");
break;
default:
OSMO_ASSERT(0);
@@ -274,10 +274,12 @@
return osmo_fsm_inst_dispatch(link->fi, SBcAP_LINK_E_RX_RESTART, pdu);
case SBcAP_ProcedureId_Error_Indication:
return cbc_sbcap_link_rx_error_ind(link, pdu);
+ case SBcAP_ProcedureId_PWS_Failure_Indication:
+ LOGPSBCAPC(link, LOGL_NOTICE, "Rx PWS Failure Indication not implemented yet\n");
+ return 0;
case SBcAP_ProcedureId_Stop_Warning_Indication:
case SBcAP_ProcedureId_Write_Replace_Warning_Indication:
break; /* Handle msg id below */
- case SBcAP_ProcedureId_PWS_Failure_Indication:
default:
LOGPSBCAPC(link, LOGL_ERROR, "SBcAP initiatingMessage procedure=%ld not implemented?\n",
pdu->choice.initiatingMessage.procedureCode);
4 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.
--
To view, visit https://gerrit.osmocom.org/c/osmo-cbc/+/28803
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-cbc
Gerrit-Branch: master
Gerrit-Change-Id: I0085ac40a7676d9c3626a9da38d02d3b1b2cf6b4
Gerrit-Change-Number: 28803
Gerrit-PatchSet: 5
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: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged