paulmataruso/osmo-mgw
1
0
Fork 0
mirror of https://gitea.osmocom.org/cellular-infrastructure/osmo-mgw.git synced 2025-11-04 05:53:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

cdr: Remember the charging id supplied by the GGSN

Browse Source 
The charging_id is provided by the GGSN. Copy it into the CDR
part of the data structure so it will remain present until after
the pdp context has been deleted.
This commit is contained in:
Holger Hans Peter Freyther
2015-05-12 21:08:42 +02:00
parent 446f8403d1
commit 77ff1c40e2
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
openbsc/include/openbsc/gprs_sgsn.h
View File

@@ -212,6 +212,7 @@ struct sgsn_pdp_ctx {
struct timespec cdr_start; /* The start of the CDR */ struct timespec cdr_start; /* The start of the CDR */
uint64_t cdr_bytes_in; uint64_t cdr_bytes_in;
uint64_t cdr_bytes_out; uint64_t cdr_bytes_out;
uint32_t cdr_charging_id;
}; };
#define LOGPDPCTXP(level, pdp, fmt, args...) \ #define LOGPDPCTXP(level, pdp, fmt, args...) \

8
openbsc/src/gprs/sgsn_cdr.c
View File

@@ -64,7 +64,7 @@ static void maybe_print_header(FILE *cdr_file)
if (ftell(cdr_file) != 0) if (ftell(cdr_file) != 0)
return; 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, 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; duration = tp.tv_sec - pdp->cdr_start.tv_sec;
fprintf(cdr_file, 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_year + 1900, tm.tm_mon + 1, tm.tm_mday,
tm.tm_hour, tm.tm_min, tm.tm_sec, tm.tm_hour, tm.tm_min, tm.tm_sec,
(int)(tv.tv_usec / 1000), (int)(tv.tv_usec / 1000),
@@ -187,7 +187,8 @@ static void cdr_log_pdp(struct sgsn_instance *inst, const char *ev,
apni, apni,
eua_addr, eua_addr,
pdp->cdr_bytes_in, pdp->cdr_bytes_in,
pdp->cdr_bytes_out); pdp->cdr_bytes_out,
pdp->cdr_charging_id);
fclose(cdr_file); fclose(cdr_file);
} }
@@ -222,6 +223,7 @@ static int handle_sgsn_sig(unsigned int subsys, unsigned int signal,
break; break;
case S_SGSN_PDP_ACT: case S_SGSN_PDP_ACT:
clock_gettime(CLOCK_MONOTONIC, &signal_data->pdp->cdr_start); 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); cdr_log_pdp(inst, "pdp-act", signal_data->pdp);
signal_data->pdp->cdr_timer.cb = cdr_pdp_timeout; signal_data->pdp->cdr_timer.cb = cdr_pdp_timeout;
signal_data->pdp->cdr_timer.data = signal_data->pdp; signal_data->pdp->cdr_timer.data = signal_data->pdp;