Change in osmo-pcap[master]: client: Ensure the "file" header is sent on connect

laforge gerrit-no-reply at lists.osmocom.org
Fri Apr 23 11:29:01 UTC 2021


laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcap/+/23874 )


Change subject: client: Ensure the "file" header is sent on connect
......................................................................

client: Ensure the "file" header is sent on connect

A non-blocking STREAM socket connect() will mark the socket as
write-able once the connection succeeds.  However, as we first
call osmo_fd_setup() and then osmo_sock_init2_ofd(), the latter
will force the 'when' to OSMO_FD_READ and hence the write callback
will not be called.

Change-Id: I44c484b48966a985a9b85fb16122a17df5666bc1
---
M src/osmo_client_network.c
1 file changed, 2 insertions(+), 0 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-pcap refs/changes/74/23874/1

diff --git a/src/osmo_client_network.c b/src/osmo_client_network.c
index c6de579..50b8520 100644
--- a/src/osmo_client_network.c
+++ b/src/osmo_client_network.c
@@ -304,6 +304,8 @@
 		lost_connection(conn);
 		return;
 	}
+	/* osmo_sock_init2_ofd() above will re-set 'when' to OSMO_FD_READ :( */
+	osmo_fd_update_when(&conn->wqueue.bfd, 0, when);
 
 	rate_ctr_inc(&conn->client->ctrg->ctr[CLIENT_CTR_CONNECT]);
 }

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-pcap/+/23874
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-pcap
Gerrit-Branch: master
Gerrit-Change-Id: I44c484b48966a985a9b85fb16122a17df5666bc1
Gerrit-Change-Number: 23874
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge at osmocom.org>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210423/b66d7124/attachment.htm>


More information about the gerrit-log mailing list