cellular-infrastructure
/
osmo-sgsn
mirror of https://gerrit.osmocom.org/osmo-sgsn
9
0
Fork 0
Code Issues Releases Wiki Activity

Drop gprs_msgb_resize_area with libosmocore replacement 

gprs_msgb_resize_area was introduced in libosmocore 0.94
(f78ec5ce0d0f6038147d9b9e14d81094309ba5d5) as msgb_resize_area. Let's use
that one to avoid code duplication.

Change-Id: Ib80f7b2b186d87f21d63d9b0bec58175170c905c
This commit is contained in:
Pau Espin 2018-08-15 14:11:22 +02:00
parent 816a67d59d
commit 107fb59e84
3 changed files with 2 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/osmocom/sgsn/gprs_utils.h
View File

@ -29,8 +29,6 @@
struct msgb;
struct gprs_ra_id;
int gprs_msgb_resize_area(struct msgb *msg, uint8_t *area,
size_t old_size, size_t new_size);
int gprs_str_to_apn(uint8_t *apn_enc, size_t max_len, const char *str);
/* GSM 04.08, 10.5.7.3 GPRS Timer */

5
src/gprs/gb_proxy_patch.c
View File

@ -112,7 +112,7 @@ static void gbproxy_patch_apn_ie(struct msgb *msg,
osmo_apn_to_str(str1, apn, apn_len));
*new_apn_ie_len = 0;
gprs_msgb_resize_area(msg, apn_ie, apn_ie_len, 0);
msgb_resize_area(msg, apn_ie, apn_ie_len, 0);
} else {
/* Resize the IE */
char str1[110];
@ -129,7 +129,7 @@ static void gbproxy_patch_apn_ie(struct msgb *msg,
peer->cfg->core_apn_size));
*new_apn_ie_len = peer->cfg->core_apn_size + 2;
gprs_msgb_resize_area(msg, apn, apn_len, peer->cfg->core_apn_size);
msgb_resize_area(msg, apn, apn_len, peer->cfg->core_apn_size);
memcpy(apn, peer->cfg->core_apn, peer->cfg->core_apn_size);
hdr->apn_len = peer->cfg->core_apn_size;
}
@ -463,4 +463,3 @@ int gbproxy_check_imsi(struct gbproxy_match *match,
return 1;
}

35
src/gprs/gprs_utils.c
View File

@ -30,41 +30,6 @@
#include <string.h>
/* TODO: Move this to libosmocore/msgb.c */
int gprs_msgb_resize_area(struct msgb *msg, uint8_t *area,
size_t old_size, size_t new_size)
{
int rc;
uint8_t *rest = area + old_size;
int rest_len = msg->len - old_size - (area - msg->data);
int delta_size = (int)new_size - (int)old_size;
if (delta_size == 0)
return 0;
if (delta_size > 0) {
rc = msgb_trim(msg, msg->len + delta_size);
if (rc < 0)
return rc;
}
memmove(area + new_size, area + old_size, rest_len);
if (msg->l1h >= rest)
msg->l1h += delta_size;
if (msg->l2h >= rest)
msg->l2h += delta_size;
if (msg->l3h >= rest)
msg->l3h += delta_size;
if (msg->l4h >= rest)
msg->l4h += delta_size;
if (delta_size < 0)
msgb_trim(msg, msg->len + delta_size);
return 0;
}
int gprs_str_to_apn(uint8_t *apn_enc, size_t max_len, const char *str)
{
uint8_t *last_len_field;