diff options
| author | Holger Hans Peter Freyther <zecke@selfish.org> | 2011-01-07 16:54:46 +0100 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2011-01-07 16:54:46 +0100 |
| commit | 368a0a73d4f673c9baa8dc61585e7868fea923c3 (patch) | |
| tree | 03ac29429cfb01d0b7167c4c2056751f9b4bb982 /openbsc/src/nat | |
| parent | 45c2184c7e02861b9089555dc72f11cd91bd6901 (diff) | |
ipa: Only use one IPA number for Osmo extensions
Instead of using more numbers from the proto range we will
use the 0xee and then have a mini header with our new proto
id in there. For a start rename the use types to _OLD.
Diffstat (limited to 'openbsc/src/nat')
| -rw-r--r-- | openbsc/src/nat/bsc_filter.c | 2 | ||||
| -rw-r--r-- | openbsc/src/nat/bsc_mgcp_utils.c | 4 | ||||
| -rw-r--r-- | openbsc/src/nat/bsc_nat.c | 2 | ||||
| -rw-r--r-- | openbsc/src/nat/bsc_nat_utils.c | 2 | ||||
| -rw-r--r-- | openbsc/src/nat/bsc_ussd.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/openbsc/src/nat/bsc_filter.c b/openbsc/src/nat/bsc_filter.c index f22f5bee1..73e987893 100644 --- a/openbsc/src/nat/bsc_filter.c +++ b/openbsc/src/nat/bsc_filter.c @@ -69,7 +69,7 @@ static struct bsc_pkt_filter white_list[] = { { IPAC_PROTO_SCCP, ALLOW_ANY, ALLOW_ANY, ALLOW_ANY, FILTER_TO_BOTH }, /* allow MGCP messages to both sides */ - { IPAC_PROTO_MGCP, ALLOW_ANY, ALLOW_ANY, ALLOW_ANY, FILTER_TO_BOTH }, + { IPAC_PROTO_MGCP_OLD, ALLOW_ANY, ALLOW_ANY, ALLOW_ANY, FILTER_TO_BOTH }, }; struct bsc_nat_parsed *bsc_nat_parse(struct msgb *msg) diff --git a/openbsc/src/nat/bsc_mgcp_utils.c b/openbsc/src/nat/bsc_mgcp_utils.c index dc8cd81b6..aacfce6eb 100644 --- a/openbsc/src/nat/bsc_mgcp_utils.c +++ b/openbsc/src/nat/bsc_mgcp_utils.c @@ -303,7 +303,7 @@ int bsc_mgcp_policy_cb(struct mgcp_config *cfg, int endpoint, int state, const c } /* send the message and a fake MDCX to force sending of a dummy packet */ - bsc_write(sccp->bsc, bsc_msg, IPAC_PROTO_MGCP); + bsc_write(sccp->bsc, bsc_msg, IPAC_PROTO_MGCP_OLD); bsc_mgcp_send_mdcx(sccp->bsc, sccp->bsc_endp, mgcp_endp); return MGCP_POLICY_DEFER; } else if (state == MGCP_ENDP_DLCX) { @@ -312,7 +312,7 @@ int bsc_mgcp_policy_cb(struct mgcp_config *cfg, int endpoint, int state, const c bsc_mgcp_dlcx(sccp); return MGCP_POLICY_CONT; } else { - bsc_write(sccp->bsc, bsc_msg, IPAC_PROTO_MGCP); + bsc_write(sccp->bsc, bsc_msg, IPAC_PROTO_MGCP_OLD); return MGCP_POLICY_DEFER; } } diff --git a/openbsc/src/nat/bsc_nat.c b/openbsc/src/nat/bsc_nat.c index 046f38c11..a0bebf13b 100644 --- a/openbsc/src/nat/bsc_nat.c +++ b/openbsc/src/nat/bsc_nat.c @@ -958,7 +958,7 @@ static int forward_sccp_to_msc(struct bsc_connection *bsc, struct msgb *msg) goto exit2; break; } - } else if (parsed->ipa_proto == IPAC_PROTO_MGCP) { + } else if (parsed->ipa_proto == IPAC_PROTO_MGCP_OLD) { bsc_mgcp_forward(bsc, msg); goto exit2; } else { diff --git a/openbsc/src/nat/bsc_nat_utils.c b/openbsc/src/nat/bsc_nat_utils.c index 05868f947..aba082d4d 100644 --- a/openbsc/src/nat/bsc_nat_utils.c +++ b/openbsc/src/nat/bsc_nat_utils.c @@ -262,7 +262,7 @@ int bsc_write_mgcp(struct bsc_connection *bsc, const uint8_t *data, unsigned int msg->l3h = msgb_put(msg, length); memcpy(msg->l3h, data, length); - return bsc_write(bsc, msg, IPAC_PROTO_MGCP); + return bsc_write(bsc, msg, IPAC_PROTO_MGCP_OLD); } int bsc_write(struct bsc_connection *bsc, struct msgb *msg, int proto) diff --git a/openbsc/src/nat/bsc_ussd.c b/openbsc/src/nat/bsc_ussd.c index 378fbc50f..c121abe5d 100644 --- a/openbsc/src/nat/bsc_ussd.c +++ b/openbsc/src/nat/bsc_ussd.c @@ -281,7 +281,7 @@ static int forward_ussd(struct sccp_connections *con, const struct ussd_request memcpy(copy->l2h, input->l2h, msgb_l2len(input)); msg->l2h = msgb_put(msg, 1); - msg->l2h[0] = IPAC_MSGT_SCCP_STATE; + msg->l2h[0] = IPAC_MSGT_SCCP_OLD; /* fill out the data */ state = (struct ipac_msgt_sccp_state *) msgb_put(msg, sizeof(*state)); |