[MERGED] osmo-sgsn[master]: sgsn_cdr: Split log formatting into a snprintf function

[Pau Espin Pedrol]

Pau Espin Pedrol has submitted this change and it was merged.

Change subject: sgsn_cdr: Split log formatting into a snprintf function
......................................................................


sgsn_cdr: Split log formatting into a snprintf function

This function is going to be re-used to send TRAP messages over CTRL
interface.

Related: OS#2360

Change-Id: I0d87df578db1d8c220fd63376e03866895d2aa0d
---
M src/gprs/sgsn_cdr.c
1 file changed, 52 insertions(+), 31 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/gprs/sgsn_cdr.c b/src/gprs/sgsn_cdr.c
index 474d41a..bc051ac 100644
--- a/src/gprs/sgsn_cdr.c
+++ b/src/gprs/sgsn_cdr.c
@@ -68,12 +68,34 @@
 	fprintf(cdr_file, "timestamp,imsi,imei,msisdn,cell_id,lac,hlr,event,pdp_duration,ggsn_addr,sgsn_addr,apni,eua_addr,vol_in,vol_out,charging_id\n");
 }
 
+static int cdr_snprintf_mm(char *buf, size_t size, const char *ev,
+			struct sgsn_mm_ctx *mmctx)
+{
+	struct tm tm;
+	struct timeval tv;
+	int ret;
+
+	gettimeofday(&tv, NULL);
+	gmtime_r(&tv.tv_sec, &tm);
+	ret = snprintf(buf, size, "%04d%02d%02d%02d%02d%02d%03d,%s,%s,%s,%d,%d,%s,%s",
+		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),
+		mmctx->imsi,
+		mmctx->imei,
+		mmctx->msisdn,
+		mmctx->gb.cell_id,
+		mmctx->ra.lac,
+		mmctx->hlr,
+		ev);
+	return ret;
+}
+
 static void cdr_log_mm(struct sgsn_instance *inst, const char *ev,
 			struct sgsn_mm_ctx *mmctx)
 {
 	FILE *cdr_file;
-	struct tm tm;
-	struct timeval tv;
+	char buf[1024];
 
 	if (!inst->cfg.cdr.filename)
 		return;
@@ -86,19 +108,8 @@
 	}
 
 	maybe_print_header(cdr_file);
-	gettimeofday(&tv, NULL);
-	gmtime_r(&tv.tv_sec, &tm);
-	fprintf(cdr_file, "%04d%02d%02d%02d%02d%02d%03d,%s,%s,%s,%d,%d,%s,%s\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),
-		mmctx->imsi,
-		mmctx->imei,
-		mmctx->msisdn,
-		mmctx->gb.cell_id,
-		mmctx->ra.lac,
-		mmctx->hlr,
-		ev);
+	cdr_snprintf_mm(buf, sizeof(buf), ev, mmctx);
+	fprintf(cdr_file, "%s\n", buf);
 
 	fclose(cdr_file);
 }
@@ -124,10 +135,9 @@
 	}
 }
 
-static void cdr_log_pdp(struct sgsn_instance *inst, const char *ev,
+static int cdr_snprintf_pdp(char *buf, size_t size, const char *ev,
 			struct sgsn_pdp_ctx *pdp)
 {
-	FILE *cdr_file;
 	char apni[(pdp->lib ? pdp->lib->apn_use.l : 0) + 1];
 	char ggsn_addr[INET_ADDRSTRLEN + 1];
 	char sgsn_addr[INET_ADDRSTRLEN + 1];
@@ -136,9 +146,7 @@
 	struct timeval tv;
 	time_t duration;
 	struct timespec tp;
-
-	if (!inst->cfg.cdr.filename)
-		return;
+	int ret;
 
 	memset(apni, 0, sizeof(apni));
 	memset(ggsn_addr, 0, sizeof(ggsn_addr));
@@ -154,15 +162,6 @@
 	if (pdp->ggsn)
 		inet_ntop(AF_INET, &pdp->ggsn->gsn->gsnc.s_addr, sgsn_addr, sizeof(sgsn_addr));
 
-	cdr_file = fopen(inst->cfg.cdr.filename, "a");
-	if (!cdr_file) {
-		LOGP(DGPRS, LOGL_ERROR, "Failed to open %s\n",
-			inst->cfg.cdr.filename);
-		return;
-	}
-
-	maybe_print_header(cdr_file);
-
 	clock_gettime(CLOCK_MONOTONIC, &tp);
 	gettimeofday(&tv, NULL);
 
@@ -172,8 +171,8 @@
 	/* Check the duration of the PDP context */
 	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,%s,%ld,%s,%s,%s,%s,%" PRIu64 ",%" PRIu64 ",%u\n",
+	ret = snprintf(buf, size,
+		"%04d%02d%02d%02d%02d%02d%03d,%s,%s,%s,%d,%d,%s,%s,%ld,%s,%s,%s,%s,%" PRIu64 ",%" PRIu64 ",%u",
 		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),
@@ -192,6 +191,28 @@
 		pdp->cdr_bytes_in,
 		pdp->cdr_bytes_out,
 		pdp->cdr_charging_id);
+	return ret;
+}
+
+static void cdr_log_pdp(struct sgsn_instance *inst, const char *ev,
+			struct sgsn_pdp_ctx *pdp)
+{
+	FILE *cdr_file;
+	char buf[1024];
+
+	if (!inst->cfg.cdr.filename)
+		return;
+
+	cdr_file = fopen(inst->cfg.cdr.filename, "a");
+	if (!cdr_file) {
+		LOGP(DGPRS, LOGL_ERROR, "Failed to open %s\n",
+			inst->cfg.cdr.filename);
+		return;
+	}
+
+	maybe_print_header(cdr_file);
+	cdr_snprintf_pdp(buf, sizeof(buf), ev, pdp);
+	fprintf(cdr_file, "%s\n", buf);
 	fclose(cdr_file);
 }
 

-- 
To view, visit https://gerrit.osmocom.org/5086
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0d87df578db1d8c220fd63376e03866895d2aa0d
Gerrit-PatchSet: 1
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Pau Espin Pedrol <pespin at sysmocom.de>