pespin has submitted this change. (
https://gerrit.osmocom.org/c/osmo-cbc/+/28302 )
Change subject: cbsp_server: Reorder logged message
......................................................................
cbsp_server: Reorder logged message
log macro needs to be changed since it uses cbsp_cbc_client_name() which
accesses client->conn which is NULL in there.
Change-Id: Ic444c749476bb1626df5494c00021c5e1a9f24b9
---
M src/cbsp_server.c
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
diff --git a/src/cbsp_server.c b/src/cbsp_server.c
index c3d7471..b265b53 100644
--- a/src/cbsp_server.c
+++ b/src/cbsp_server.c
@@ -126,6 +126,8 @@
osmo_sock_get_ip_and_port(fd, remote_ip, sizeof(remote_ip), portbuf,
sizeof(portbuf), false);
remote_port = atoi(portbuf);
+ LOGP(DCBSP, LOGL_NOTICE, "New CBSP client connection from %s:%u\n",
remote_ip, remote_port);
+
client->conn = osmo_stream_srv_create(link, link, fd, cbsp_cbc_read_cb,
cbsp_cbc_closed_cb, client);
if (!client->conn) {
LOGP(DCBSP, LOGL_ERROR, "Unable to create stream server for
%s:%d\n",
@@ -167,9 +169,7 @@
client->peer->client.cbsp = client;
}
- LOGPCC(client, LOGL_NOTICE, "New CBSP client connection from %s:%u\n",
remote_ip, remote_port);
osmo_fsm_inst_dispatch(client->fi, CBSP_SRV_E_CMD_RESET, NULL);
-
return 0;
}
3 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/+/28302
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-cbc
Gerrit-Branch: master
Gerrit-Change-Id: Ic444c749476bb1626df5494c00021c5e1a9f24b9
Gerrit-Change-Number: 28302
Gerrit-PatchSet: 4
Gerrit-Owner: pespin <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <[email protected]>
Gerrit-Reviewer: laforge <[email protected]>
Gerrit-Reviewer: pespin <[email protected]>
Gerrit-MessageType: merged
