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

Revert "gsm/ipa: Add segmentation callback" 

It has been decided that the segmentation callback be changed
and moved to libosmo-netif, so we remove it here.

This reverts commit 2c59d1285e.

Related: OS#5753
Change-Id: I9b380326c63587fc79d6a5d8cd458188074fc55d
This commit is contained in:
arehbein 2023-07-05 16:41:09 +02:00 committed by daniel
parent d0d9ecbad1
commit 4ff5db2839
3 changed files with 0 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/osmocom/gsm/ipa.h
View File

@ -79,6 +79,3 @@ struct msgb *ipa_msg_alloc(int headroom);
int ipa_msg_recv(int fd, struct msgb **rmsg);
int ipa_msg_recv_buffered(int fd, struct msgb **rmsg, struct msgb **tmp_msg);
/* Callback for segmenting TCP stream data into IPA packets */
int ipa_segmentation_cb(struct msgb *msg);

29
src/gsm/ipa.c
View File

@ -30,7 +30,6 @@
#include <stdint.h>
#include <errno.h>
#include <stdlib.h>
#include <inttypes.h>
#include <sys/types.h>
@ -719,32 +718,4 @@ struct msgb *ipa_msg_alloc(int headroom)
return nmsg;
}
/*! Segmentation callback used by libosmo-netif streaming backend
* See definition of `struct osmo_io_ops` for callback semantics
* \param[in] msg Original `struct msgb` received via osmo_io
* \returns The total packet length indicated by the first header,
* otherwise
* -EAGAIN, if the header has not been read yet,
* -ENOBUFS, if the header declares a payload too large
*/
int ipa_segmentation_cb(struct msgb *msg)
{
const struct ipaccess_head *hh = (const struct ipaccess_head *) msg->data;
size_t payload_len, total_len;
size_t available = msgb_length(msg) + msgb_tailroom(msg);
if (msgb_length(msg) < sizeof(*hh)) {
/* Haven't even read the entire header */
return -EAGAIN;
}
payload_len = osmo_ntohs(hh->len);
total_len = sizeof(*hh) + payload_len;
if (OSMO_UNLIKELY(available < total_len)) {
LOGP(DLINP, LOGL_ERROR, "Not enough space left in message buffer. "
"Have %zu octets, but need %zu\n",
available, total_len);
return -ENOBUFS;
}
return total_len;
}
/*! @} */

1
src/gsm/libosmogsm.map
View File

@ -691,7 +691,6 @@ ipa_ccm_id_get_parse;
ipa_ccm_id_resp_parse;
ipa_ccm_make_id_resp;
ipa_ccm_make_id_resp_from_req;
ipa_segmentation_cb;
ipa_msg_alloc;
ipa_msg_recv;
ipa_msg_recv_buffered;