Change in osmo-sip-connector[master]: logging from sofia: add missing newline

[laforge]

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-sip-connector/+/16220 )

Change subject: logging from sofia: add missing newline
......................................................................

logging from sofia: add missing newline

Sometimes, logging from sofia lacks the final newline character, messing up log
output. First snprintf() to a buffer, add '\n' if necessary and then log.

Change-Id: Ia26c0b57a0166cf7de87c49471ce6f528a366dd5
---
M src/sip.c
1 file changed, 13 insertions(+), 1 deletion(-)

Approvals:
  laforge: Looks good to me, approved
  pespin: Looks good to me, but someone else must approve
  Jenkins Builder: Verified



diff --git a/src/sip.c b/src/sip.c
index 2b28b4e..c635542 100644
--- a/src/sip.c
+++ b/src/sip.c
@@ -666,7 +666,19 @@
 	 * the log handler call-back function, so we have no clue what log level the
 	 * currently logged message was sent for :(  As a result, we can only use one
 	 * hard-coded LOGL_NOTICE here */
-	osmo_vlogp(DSIP, LOGL_NOTICE, "", 0, 0, fmt, ap);
+	if (!log_check_level(DSIP, LOGL_NOTICE))
+		return;
+	/* The sofia-sip log line *sometimes* lacks a terminating '\n'. Add it. */
+	char log_line[256];
+	int rc = vsnprintf(log_line, sizeof(log_line), fmt, ap);
+	if (rc > 0) {
+		/* since we're explicitly checking for sizeof(log_line), we can use vsnprintf()'s return value (which,
+		 * alone, would possibly cause writing past the buffer's end). */
+		char *end = log_line + OSMO_MIN(rc, sizeof(log_line) - 2);
+		osmo_strlcpy(end, "\n", 2);
+		LOGP(DSIP, LOGL_NOTICE, "%s", log_line);
+	} else
+		LOGP(DSIP, LOGL_NOTICE, "unknown logging from sip\n");
 }
 
 void sip_agent_init(struct sip_agent *agent, struct app_config *app)

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-sip-connector/+/16220
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-sip-connector
Gerrit-Branch: master
Gerrit-Change-Id: Ia26c0b57a0166cf7de87c49471ce6f528a366dd5
Gerrit-Change-Number: 16220
Gerrit-PatchSet: 3
Gerrit-Owner: neels <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: neels <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20191217/af56ecbf/attachment.htm>