aboutsummaryrefslogtreecommitdiffstats
path: root/openbsc/include/openbsc
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <zecke@selfish.org>2010-10-13 23:52:01 +0200
committerHolger Hans Peter Freyther <zecke@selfish.org>2010-10-13 23:55:32 +0200
commit19c530c5e7be14c518c8c0e65855c658b78d0146 (patch)
tree682d801b15fdfae5754021d13c0e92482cb151d1 /openbsc/include/openbsc
parent833fa0bafa0e541cdb3168d6d60732fef90b8372 (diff)
ipaccess: Put our extensions to the protocol into the same enum
Rename NAT_IPAC_PROTO_MGCP to IPAC_PROTO_MGCP and place it in the enum. We need to be prepared to change this number if IPA is ever going to use it for something else.
Diffstat (limited to 'openbsc/include/openbsc')
-rw-r--r--openbsc/include/openbsc/bsc_nat.h2
-rw-r--r--openbsc/include/openbsc/ipaccess.h3
2 files changed, 3 insertions, 2 deletions
diff --git a/openbsc/include/openbsc/bsc_nat.h b/openbsc/include/openbsc/bsc_nat.h
index 4983af56d..7ac175dfc 100644
--- a/openbsc/include/openbsc/bsc_nat.h
+++ b/openbsc/include/openbsc/bsc_nat.h
@@ -38,8 +38,6 @@
#define DIR_BSC 1
#define DIR_MSC 2
-#define NAT_IPAC_PROTO_MGCP 0xfc
-
struct sccp_connections;
struct bsc_nat_parsed;
struct bsc_nat;
diff --git a/openbsc/include/openbsc/ipaccess.h b/openbsc/include/openbsc/ipaccess.h
index f8ddfd467..b36811ce3 100644
--- a/openbsc/include/openbsc/ipaccess.h
+++ b/openbsc/include/openbsc/ipaccess.h
@@ -18,6 +18,9 @@ enum ipaccess_proto {
IPAC_PROTO_IPACCESS = 0xfe,
IPAC_PROTO_SCCP = 0xfd,
IPAC_PROTO_OML = 0xff,
+
+ /* OpenBSC extensions */
+ IPAC_PROTO_MGCP = 0xfc,
};
enum ipaccess_msgtype {