diff options
author | Harald Welte <laforge@gnumonks.org> | 2012-06-16 16:09:52 +0800 |
---|---|---|
committer | Harald Welte <laforge@gnumonks.org> | 2012-06-16 16:09:52 +0800 |
commit | 8645e101da22d539342d2e356bdab6cbf92ed9ef (patch) | |
tree | cca8a410060328c0bda20d6c6f8320df51cdbccf /openbsc/src | |
parent | ea34a4e3a7741c0b03fc421e2850234b82a0977c (diff) |
libgb: move GPRS specific msgb CB definitions to separate header
Diffstat (limited to 'openbsc/src')
-rw-r--r-- | openbsc/src/gprs/gb_proxy.c | 6 | ||||
-rw-r--r-- | openbsc/src/libgb/gprs_bssgp.c | 3 | ||||
-rw-r--r-- | openbsc/src/libgb/gprs_bssgp_bss.c | 3 | ||||
-rw-r--r-- | openbsc/src/libgb/gprs_bssgp_util.c | 3 | ||||
-rw-r--r-- | openbsc/src/libgb/gprs_ns.c | 2 |
5 files changed, 7 insertions, 10 deletions
diff --git a/openbsc/src/gprs/gb_proxy.c b/openbsc/src/gprs/gb_proxy.c index afe793d49..518382d8e 100644 --- a/openbsc/src/gprs/gb_proxy.c +++ b/openbsc/src/gprs/gb_proxy.c @@ -122,7 +122,7 @@ static void peer_free(struct gbprox_peer *peer) /* FIXME: this needs to go to libosmocore/msgb.c */ static struct msgb *msgb_copy(const struct msgb *msg, const char *name) { - struct openbsc_msgb_cb *old_cb, *new_cb; + struct libgb_msgb_cb *old_cb, *new_cb; struct msgb *new_msg; new_msg = msgb_alloc(msg->data_len, name); @@ -144,8 +144,8 @@ static struct msgb *msgb_copy(const struct msgb *msg, const char *name) new_msg->l4h = new_msg->_data + (msg->l4h - msg->_data); /* copy GB specific data */ - old_cb = OBSC_MSGB_CB(msg); - new_cb = OBSC_MSGB_CB(new_msg); + old_cb = LIBGB_MSGB_CB(msg); + new_cb = LIBGB_MSGB_CB(new_msg); new_cb->bssgph = new_msg->_data + (old_cb->bssgph - msg->_data); new_cb->llch = new_msg->_data + (old_cb->llch - msg->_data); diff --git a/openbsc/src/libgb/gprs_bssgp.c b/openbsc/src/libgb/gprs_bssgp.c index e93b3de9a..7615299a9 100644 --- a/openbsc/src/libgb/gprs_bssgp.c +++ b/openbsc/src/libgb/gprs_bssgp.c @@ -1,6 +1,6 @@ /* GPRS BSSGP protocol implementation as per 3GPP TS 08.18 */ -/* (C) 2009-2010 by Harald Welte <laforge@gnumonks.org> +/* (C) 2009-2012 by Harald Welte <laforge@gnumonks.org> * * All Rights Reserved * @@ -33,7 +33,6 @@ #include <osmocom/core/rate_ctr.h> #include <openbsc/debug.h> -#include <openbsc/gsm_data.h> #include <openbsc/gsm_04_08_gprs.h> #include <osmocom/gprs/gprs_bssgp.h> diff --git a/openbsc/src/libgb/gprs_bssgp_bss.c b/openbsc/src/libgb/gprs_bssgp_bss.c index a53423ca1..a681b9dab 100644 --- a/openbsc/src/libgb/gprs_bssgp_bss.c +++ b/openbsc/src/libgb/gprs_bssgp_bss.c @@ -1,6 +1,6 @@ /* GPRS BSSGP protocol implementation as per 3GPP TS 08.18 */ -/* (C) 2009-2011 by Harald Welte <laforge@gnumonks.org> +/* (C) 2009-2012 by Harald Welte <laforge@gnumonks.org> * * All Rights Reserved * @@ -32,7 +32,6 @@ #include <osmocom/gprs/gprs_ns.h> #include <openbsc/debug.h> -#include <openbsc/gsm_data.h> uint8_t *bssgp_msgb_tlli_put(struct msgb *msg, uint32_t tlli) { diff --git a/openbsc/src/libgb/gprs_bssgp_util.c b/openbsc/src/libgb/gprs_bssgp_util.c index c794a590e..6ab97a79c 100644 --- a/openbsc/src/libgb/gprs_bssgp_util.c +++ b/openbsc/src/libgb/gprs_bssgp_util.c @@ -1,6 +1,6 @@ /* GPRS BSSGP protocol implementation as per 3GPP TS 08.18 */ -/* (C) 2009-2010 by Harald Welte <laforge@gnumonks.org> +/* (C) 2009-2012 by Harald Welte <laforge@gnumonks.org> * * All Rights Reserved * @@ -31,7 +31,6 @@ #include <osmocom/gprs/gprs_ns.h> #include <openbsc/debug.h> -#include <openbsc/gsm_data.h> struct gprs_ns_inst *bssgp_nsi; diff --git a/openbsc/src/libgb/gprs_ns.c b/openbsc/src/libgb/gprs_ns.c index c1efa4318..8bed1b7bb 100644 --- a/openbsc/src/libgb/gprs_ns.c +++ b/openbsc/src/libgb/gprs_ns.c @@ -1,7 +1,7 @@ /* GPRS Networks Service (NS) messages on the Gb interface * 3GPP TS 08.16 version 8.0.1 Release 1999 / ETSI TS 101 299 V8.0.1 (2002-05) */ -/* (C) 2009-2010 by Harald Welte <laforge@gnumonks.org> +/* (C) 2009-2012 by Harald Welte <laforge@gnumonks.org> * * All Rights Reserved * |