osmocom
/
libosmocore
mirror of https://gerrit.osmocom.org/libosmocore
11
0
Fork 0
Code Issues Releases Wiki Activity

ipa: Use enhanced ipa_msg_recv_buffered() to cope with partioned IPA messages 

The old ipa_msg_recv() implementation didn't support partial receive,
so IPA connections got disconnected when this happened.

This patch adds the handling of the temporary message buffers and uses
ipa_msg_recv_buffered().

It has been successfully tested by jerlbeck with osmo-nitb and
osmo-bsc.

Ticket: OW#768
Sponsored-by: On-Waves ehf
This commit is contained in:
Jacob Erlbeck 2014-03-31 13:42:11 +02:00 committed by Harald Welte
parent ea62a38b5d
commit 141de62b06
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openbsc/include/openbsc/control_cmd.h
View File

@ -39,6 +39,9 @@ struct ctrl_connection {
/* The queue for sending data back */
struct osmo_wqueue write_queue;
/* Buffer for partial input data */
struct msgb *pending_msg;
/* Callback if the connection was closed */
void (*closed_cb)(struct ctrl_connection *conn);

5
openbsc/src/libctrl/control_if.c
View File

@ -123,6 +123,7 @@ static void control_close_conn(struct ctrl_connection *ccon)
llist_del(&ccon->list_entry);
if (ccon->closed_cb)
ccon->closed_cb(ccon);
msgb_free(ccon->pending_msg);
talloc_free(ccon);
}
@ -140,8 +141,10 @@ static int handle_control_read(struct osmo_fd * bfd)
queue = container_of(bfd, struct osmo_wqueue, bfd);
ccon = container_of(queue, struct ctrl_connection, write_queue);
ret = ipa_msg_recv(bfd->fd, &msg);
ret = ipa_msg_recv_buffered(bfd->fd, &msg, &ccon->pending_msg);
if (ret <= 0) {
if (ret == -EAGAIN)
return 0;
if (ret == 0)
LOGP(DCTRL, LOGL_INFO, "The control connection was closed\n");
else