diff options
author | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2015-05-17 17:24:09 +0200 |
---|---|---|
committer | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2015-05-17 17:24:09 +0200 |
commit | 267fd0c7f7cbdef595d83ee37b86e863fff8a369 (patch) | |
tree | 837a0cf2569737610245ba1f1a630b3957a73a5c | |
parent | 446f8403d1072b5a7aa7d5a3d55106b36a64941d (diff) | |
parent | d6900dfba4cf1c12133d0bf3200ef560f5c7f0d4 (diff) |
Merge branch 'zecke/features/sgsn-gtp-cdr'
Extend GTP and CDR support in the SGSN.
-rw-r--r-- | openbsc/include/openbsc/gprs_sgsn.h | 1 | ||||
-rw-r--r-- | openbsc/src/gprs/sgsn_cdr.c | 8 | ||||
-rw-r--r-- | openbsc/src/gprs/sgsn_libgtp.c | 16 |
3 files changed, 22 insertions, 3 deletions
diff --git a/openbsc/include/openbsc/gprs_sgsn.h b/openbsc/include/openbsc/gprs_sgsn.h index c88a2bbe7..4bbde9c44 100644 --- a/openbsc/include/openbsc/gprs_sgsn.h +++ b/openbsc/include/openbsc/gprs_sgsn.h @@ -212,6 +212,7 @@ struct sgsn_pdp_ctx { struct timespec cdr_start; /* The start of the CDR */ uint64_t cdr_bytes_in; uint64_t cdr_bytes_out; + uint32_t cdr_charging_id; }; #define LOGPDPCTXP(level, pdp, fmt, args...) \ diff --git a/openbsc/src/gprs/sgsn_cdr.c b/openbsc/src/gprs/sgsn_cdr.c index 0fcdd3b2a..04084f5b2 100644 --- a/openbsc/src/gprs/sgsn_cdr.c +++ b/openbsc/src/gprs/sgsn_cdr.c @@ -64,7 +64,7 @@ static void maybe_print_header(FILE *cdr_file) if (ftell(cdr_file) != 0) return; - fprintf(cdr_file, "timestamp,imsi,imei,msisdn,cell_id,lac,event,pdp_duration,ggsn_addr,sgsn_addr,apni,eua_addr,vol_in,vol_out\n"); + fprintf(cdr_file, "timestamp,imsi,imei,msisdn,cell_id,lac,event,pdp_duration,ggsn_addr,sgsn_addr,apni,eua_addr,vol_in,vol_out,charging_id\n"); } static void cdr_log_mm(struct sgsn_instance *inst, const char *ev, @@ -171,7 +171,7 @@ static void cdr_log_pdp(struct sgsn_instance *inst, const char *ev, duration = tp.tv_sec - pdp->cdr_start.tv_sec; fprintf(cdr_file, - "%04d%02d%02d%02d%02d%02d%03d,%s,%s,%s,%d,%d,%s,%ld,%s,%s,%s,%s,%" PRIu64 ",%" PRIu64 "\n", + "%04d%02d%02d%02d%02d%02d%03d,%s,%s,%s,%d,%d,%s,%ld,%s,%s,%s,%s,%" PRIu64 ",%" PRIu64 ",%u\n", tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec, (int)(tv.tv_usec / 1000), @@ -187,7 +187,8 @@ static void cdr_log_pdp(struct sgsn_instance *inst, const char *ev, apni, eua_addr, pdp->cdr_bytes_in, - pdp->cdr_bytes_out); + pdp->cdr_bytes_out, + pdp->cdr_charging_id); fclose(cdr_file); } @@ -222,6 +223,7 @@ static int handle_sgsn_sig(unsigned int subsys, unsigned int signal, break; case S_SGSN_PDP_ACT: clock_gettime(CLOCK_MONOTONIC, &signal_data->pdp->cdr_start); + signal_data->pdp->cdr_charging_id = signal_data->pdp->lib->cid; cdr_log_pdp(inst, "pdp-act", signal_data->pdp); signal_data->pdp->cdr_timer.cb = cdr_pdp_timeout; signal_data->pdp->cdr_timer.data = signal_data->pdp; diff --git a/openbsc/src/gprs/sgsn_libgtp.c b/openbsc/src/gprs/sgsn_libgtp.c index 9972cddf3..a96eb5c78 100644 --- a/openbsc/src/gprs/sgsn_libgtp.c +++ b/openbsc/src/gprs/sgsn_libgtp.c @@ -227,6 +227,22 @@ struct sgsn_pdp_ctx *sgsn_create_pdp_ctx(struct sgsn_ggsn_ctx *ggsn, pdp->rattype.v[0] = 2; pdp->rattype_given = 1; + /* Include RAI and ULI all the time */ + pdp->rai_given = 1; + pdp->rai.l = 6; + gsm48_construct_ra(pdp->rai.v, &mmctx->ra); + + pdp->userloc_given = 1; + pdp->userloc.l = 8; + pdp->userloc.v[0] = 0; /* CGI for GERAN */ + bssgp_create_cell_id(&pdp->userloc.v[1], &mmctx->ra, mmctx->cell_id); + + /* include the IMEI(SV) */ + pdp->imeisv_given = 1; + gsm48_encode_bcd_number(&pdp->imeisv.v[0], 8, 0, mmctx->imei); + pdp->imeisv.l = pdp->imeisv.v[0]; + memmove(&pdp->imeisv.v[0], &pdp->imeisv.v[1], 8); + /* change pdp state to 'requested' */ pctx->state = PDP_STATE_CR_REQ; |