diff options
author | Harald Welte <laforge@gnumonks.org> | 2012-06-17 12:16:31 +0800 |
---|---|---|
committer | Harald Welte <laforge@gnumonks.org> | 2012-06-17 12:17:22 +0800 |
commit | b1fd9022ebbf8539cbf52d22a7f0723225eefe02 (patch) | |
tree | 1f3c572ba247d74202a75ad86661100a6b6bfcd3 /openbsc/src/gprs | |
parent | faa70ff2c6c3f592b5601aaa73a3a9a851a6d3c1 (diff) |
libgb: don't call directly into GMM / LLC layer
Instead of direct function calls to individual functions, we now
generate primitives (osmo_prim) and send them to one
application-provided function "bssgp_prim_cb()"
Diffstat (limited to 'openbsc/src/gprs')
-rw-r--r-- | openbsc/src/gprs/gb_proxy.c | 5 | ||||
-rw-r--r-- | openbsc/src/gprs/gprs_llc.c | 3 | ||||
-rw-r--r-- | openbsc/src/gprs/sgsn_main.c | 29 |
3 files changed, 35 insertions, 2 deletions
diff --git a/openbsc/src/gprs/gb_proxy.c b/openbsc/src/gprs/gb_proxy.c index 87cfa61df..500a1b2f8 100644 --- a/openbsc/src/gprs/gb_proxy.c +++ b/openbsc/src/gprs/gb_proxy.c @@ -246,6 +246,11 @@ static int gbprox_relay2bvci(struct msgb *msg, uint16_t ptp_bvci, return gbprox_relay2peer(msg, peer, ns_bvci); } +int bssgp_prim_cb(struct osmo_prim_hdr *oph, void *ctx) +{ + return 0; +} + /* Receive an incoming signalling message from a BSS-side NS-VC */ static int gbprox_rx_sig_from_bss(struct msgb *msg, struct gprs_nsvc *nsvc, uint16_t ns_bvci) diff --git a/openbsc/src/gprs/gprs_llc.c b/openbsc/src/gprs/gprs_llc.c index c1327b6cd..be5fe52bf 100644 --- a/openbsc/src/gprs/gprs_llc.c +++ b/openbsc/src/gprs/gprs_llc.c @@ -48,7 +48,6 @@ static int _bssgp_tx_dl_ud(struct msgb *msg, struct sgsn_mm_ctx *mmctx) dup.drx_parms = mmctx->drx_parms; dup.ms_ra_cap.len = mmctx->ms_radio_access_capa.len; dup.ms_ra_cap.v = mmctx->ms_radio_access_capa.buf; - dup.pdu_lifetime = 1000; /* centi-seconds */ memcpy(&dup.qos_profile, qos_profile_default, sizeof(qos_profile_default)); @@ -328,7 +327,7 @@ int gprs_llc_tx_u(struct msgb *msg, uint8_t sapi, int command, /* Identifiers passed down: (BVCI, NSEI) */ /* Send BSSGP-DL-UNITDATA.req */ - return _bssgp_tx_dl_ud(msg, 1000, NULL); + return _bssgp_tx_dl_ud(msg, NULL); } /* Send XID response to LLE */ diff --git a/openbsc/src/gprs/sgsn_main.c b/openbsc/src/gprs/sgsn_main.c index a579e7e83..55588797b 100644 --- a/openbsc/src/gprs/sgsn_main.c +++ b/openbsc/src/gprs/sgsn_main.c @@ -49,6 +49,7 @@ #include <openbsc/vty.h> #include <openbsc/sgsn.h> #include <openbsc/gprs_llc.h> +#include <openbsc/gprs_gmm.h> #include <gtp.h> @@ -99,6 +100,34 @@ static int sgsn_ns_cb(enum gprs_ns_evt event, struct gprs_nsvc *nsvc, return rc; } +/* call-back function for the BSSGP protocol */ +int bssgp_prim_cb(struct osmo_prim_hdr *oph, void *ctx) +{ + struct osmo_bssgp_prim *bp; + bp = container_of(oph, struct osmo_bssgp_prim, oph); + + switch (oph->sap) { + case SAP_BSSGP_LL: + switch (oph->primitive) { + case PRIM_BSSGP_UL_UD: + return gprs_llc_rcvmsg(oph->msg, bp->tp); + } + break; + case SAP_BSSGP_GMM: + switch (oph->primitive) { + case PRIM_BSSGP_GMM_SUSPEND: + return gprs_gmm_rx_suspend(bp->ra_id, bp->tlli); + case PRIM_BSSGP_GMM_RESUME: + return gprs_gmm_rx_resume(bp->ra_id, bp->tlli, + *bp->u.resume.suspend_ref); + } + break; + case SAP_BSSGP_NM: + break; + } + return 0; +} + static void signal_handler(int signal) { fprintf(stdout, "signal %u received\n", signal); |