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

nat: Move the DTAP unpacking into a new method 

DTAP unpacking will be used by the USSD checking code
This commit is contained in:
Holger Hans Peter Freyther 2010-09-29 02:30:50 +08:00
parent 749497eeb3
commit a3967579f8
2 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,6 +32,7 @@
#include <osmocore/write_queue.h>
#include <osmocore/rate_ctr.h>
#include <osmocore/statistics.h>
#include <osmocore/protocol/gsm_04_08.h>
#include <regex.h>
@ -315,4 +316,6 @@ int bsc_nat_msc_is_connected(struct bsc_nat *nat);
int bsc_conn_type_to_ctr(struct sccp_connections *conn);
struct gsm48_hdr *bsc_unpack_dtap(struct bsc_nat_parsed *parsed, struct msgb *msg, uint32_t *len);
#endif

34
openbsc/src/nat/bsc_nat_utils.c
View File

@ -549,6 +549,25 @@ int bsc_nat_filter_sccp_cr(struct bsc_connection *bsc, struct msgb *msg,
}
}
struct gsm48_hdr *bsc_unpack_dtap(struct bsc_nat_parsed *parsed,
struct msgb *msg, uint32_t *len)
{
/* gsm_type is actually the size of the dtap */
*len = parsed->gsm_type;
if (*len < msgb_l3len(msg) - 3) {
LOGP(DNAT, LOGL_ERROR, "Not enough space for DTAP.\n");
return NULL;
}
if (*len < sizeof(struct gsm48_hdr)) {
LOGP(DNAT, LOGL_ERROR, "GSM48 header does not fit.\n");
return NULL;
}
msg->l4h = &msg->l3h[3];
return (struct gsm48_hdr *) msg->l4h;
}
int bsc_nat_filter_dt(struct bsc_connection *bsc, struct msgb *msg,
struct sccp_connections *con, struct bsc_nat_parsed *parsed)
{
@ -563,20 +582,9 @@ int bsc_nat_filter_dt(struct bsc_connection *bsc, struct msgb *msg,
if (parsed->bssap != BSSAP_MSG_DTAP)
return 0;
/* gsm_type is actually the size of the dtap */
len = parsed->gsm_type;
if (len < msgb_l3len(msg) - 3) {
LOGP(DNAT, LOGL_ERROR, "Not enough space for DTAP.\n");
hdr48 = bsc_unpack_dtap(parsed, msg, &len);
if (!hdr48)
return -1;
}
if (len < sizeof(*hdr48)) {
LOGP(DNAT, LOGL_ERROR, "GSM48 header does not fit.\n");
return -1;
}
msg->l4h = &msg->l3h[3];
hdr48 = (struct gsm48_hdr *) msg->l4h;
msg_type = hdr48->msg_type & 0xbf;
if (hdr48->proto_discr == GSM48_PDISC_MM &&