mtp: Turn error messages into full sentences.

Turn the error messages into full sentences that
end with a full stop. Try to put the link set name
and the link number into these messages.

4 files changed, 31 insertions, 21 deletions

diff --git a/src/link_udp.c b/src/link_udp.c
index ab6e8b9..bcf8ec6 100644
--- a/src/link_udp.c
+++ b/src/link_udp.c
@@ -114,7 +114,8 @@ static int udp_read_cb(struct bsc_fd *fd)
 	}
 
 	if (hdr->data_type == UDP_DATA_RETR_COMPL || hdr->data_type == UDP_DATA_RETR_IMPOS) {
-		LOGP(DINP, LOGL_ERROR, "Link retrieval done. Restarting the link.\n");
+		LOGP(DINP, LOGL_ERROR, "Link retrieval done on %s/%d.\n",
+		     link->set->name, link->link_no);
 		mtp_link_failure(link);
 		goto exit;
 	} else if (hdr->data_type == UDP_DATA_LINK_UP) {
@@ -128,29 +129,33 @@ static int udp_read_cb(struct bsc_fd *fd)
 		mtp_link_failure(link);
 		goto exit;
 	} else if (hdr->data_type > UDP_DATA_MSU_PRIO_3) {
-		LOGP(DINP, LOGL_ERROR, "Link failure. retrieved message.\n");
+		LOGP(DINP, LOGL_ERROR, "Link failue on %s/%d.\n",
+		     link->set->name, link->link_no);
 		mtp_link_failure(link);
 		goto exit;
 	}
 
 	/* throw away data as the link is down */
 	if (link->set->available == 0) {
-		LOGP(DINP, LOGL_ERROR, "The link is down. Not forwarding.\n");
+		LOGP(DINP, LOGL_ERROR, "Link %s/%d is down. Not forwarding.\n",
+		     link->set->name, link->link_no);
 		rc = 0;
 		goto exit;
 	}
 
 	length = ntohl(hdr->data_length);
 	if (length + sizeof(*hdr) > (unsigned int) rc) {
-		LOGP(DINP, LOGL_ERROR, "The MSU payload does not fit: %u + %u > %d \n",
-		     length, sizeof(*hdr), rc);
+		LOGP(DINP, LOGL_ERROR,
+		     "The MSU payload does not fit: %u + %u > %d on %s/%d.\n",
+		     length, sizeof(*hdr), rc, link->set->name, link->link_no);
 		rc = -1;
 		goto exit;
 	}
 
 	msg->l2h = msgb_put(msg, length);
 
-	LOGP(DINP, LOGL_DEBUG, "MSU data on: %p data %s.\n", link, hexdump(msg->data, msg->len));
+	LOGP(DINP, LOGL_DEBUG, "MSU data on: %s/%d data %s.\n",
+	     link->set->name, link->link_no, hexdump(msg->data, msg->len));
 	mtp_handle_pcap(link, NET_IN, msg->l2h, msgb_l2len(msg));
 	mtp_link_set_data(link, msg);
 
@@ -204,7 +209,8 @@ static int udp_link_write(struct mtp_link *link, struct msgb *msg)
 	msg->cb[0] = ulnk->link_index;
 
 	if (write_queue_enqueue(&ulnk->data->write_queue, msg) != 0) {
-		LOGP(DINP, LOGL_ERROR, "Failed to enqueue msg.\n");
+		LOGP(DINP, LOGL_ERROR, "Failed to enqueue msg on %s/%d.\n",
+		     link->set->name, link->link_no);
 		msgb_free(msg);
 		return -1;
 	}
@@ -214,7 +220,6 @@ static int udp_link_write(struct mtp_link *link, struct msgb *msg)
 
 static int udp_link_start(struct mtp_link *link)
 {
-	LOGP(DINP, LOGL_NOTICE, "UDP input is ready.\n");
 	do_start(link);
 	return 0;
 }
@@ -310,12 +315,13 @@ void snmp_mtp_callback(struct snmp_mtp_session *session,
 
 	ulink = session->data;
 	if (!ulink)
-		return LOGP(DINP, LOGL_ERROR, "Failed to find link %d\n", link_id);
+		return LOGP(DINP, LOGL_ERROR, "Failed to find link_id %d\n", link_id);
 
 	link = &ulink->base;
 
 	if (res == SNMP_STATUS_TIMEOUT && !link->blocked) {
-		LOGP(DINP, LOGL_ERROR, "Failed to restart link: %d\n", link_id);
+		LOGP(DINP, LOGL_ERROR, "Failed to restart link: %s/%d\n",
+		     link->set->name, link->link_no);
 		udp_link_reset(link);
 		return;
 	}
@@ -335,10 +341,12 @@ void snmp_mtp_callback(struct snmp_mtp_session *session,
 			link->link_activate.data = link;
 			bsc_schedule_timer(&link->link_activate, ulink->reset_timeout, 0);
 			LOGP(DINP, LOGL_NOTICE,
-			     "Will restart SLTM transmission in %d seconds.\n", ulink->reset_timeout);
+			     "Will bring up link %s/%d in %d seconds.\n",
+			     link->set->name, link->link_no, ulink->reset_timeout);
 		}
 		break;
 	default:
-		LOGP(DINP, LOGL_ERROR, "Unknown event %d\n", area);
+		LOGP(DINP, LOGL_ERROR, "Unknown event %d on %s/%d.\n",
+		     area, link->set->name, link->link_no);
 	}
 }
diff --git a/src/links.c b/src/links.c
index 941a006..af8f9d0 100644
--- a/src/links.c
+++ b/src/links.c
@@ -153,7 +153,7 @@ int link_init(struct bsc_data *bsc)
 		bsc->start_timer.data = &bsc;
 		bsc_schedule_timer(&bsc->start_timer, lnk->reset_timeout, 0);
 		LOGP(DMSC, LOGL_NOTICE,
-		     "Making sure SLTM will timeout on %s/%d\n",
+		     "Forcing link alignment on %s/%d.\n",
 		      lnk->base.set->name, lnk->base.link_no);
 	}
 
diff --git a/src/mtp_layer3.c b/src/mtp_layer3.c
index 3a59b4f..69374aa 100644
--- a/src/mtp_layer3.c
+++ b/src/mtp_layer3.c
@@ -320,9 +320,9 @@ static int mtp_link_sign_msg(struct mtp_link_set *link, struct mtp_level_3_hdr *
 	case MTP_TRF_RESTR_MSG_GRP:
 		switch (cmn->h1) {
 		case MTP_RESTR_MSG_ALLWED:
-			LOGP(DINP, LOGL_INFO, "Received Restart Allowed. SST could be next: %s\n", link->name);
+			LOGP(DINP, LOGL_INFO, "Received Restart Allowed. SST could be next: %s.\n", link->name);
 			link->sccp_up = 1;
-			LOGP(DINP, LOGL_INFO, "SCCP traffic allowed. %s\n", link->name);
+			LOGP(DINP, LOGL_INFO, "SCCP traffic allowed on %s.\n", link->name);
 			return 0;
 			break;
 		}
diff --git a/src/mtp_link.c b/src/mtp_link.c
index 37f9635..009547c 100644
--- a/src/mtp_link.c
+++ b/src/mtp_link.c
@@ -61,7 +61,8 @@ static void mtp_send_sltm(struct mtp_link *link)
 	link->sltm_pending = 1;
 	msg = mtp_create_sltm(link);
 	if (!msg) {
-		LOGP(DINP, LOGL_ERROR, "Failed to allocate SLTM.\n");
+		LOGP(DINP, LOGL_ERROR, "Failed to allocate SLTM on %s/%d.\n",
+		     link->set->name, link->link_no);
 		return;
 	}
 
@@ -76,14 +77,14 @@ static void mtp_sltm_t1_timeout(void *_link)
 
 	if (link->slta_misses == 0) {
 		LOGP(DINP, LOGL_ERROR,
-		     "No SLTM response. Retrying. Link: %s/%d\n",
+		     "No SLTM response on link %s/%d.\n",
 		     link->set->name, link->link_no);
 		++link->slta_misses;
 		mtp_send_sltm(link);
 		bsc_schedule_timer(&link->t1_timer, MTP_T1);
 	} else {
 		LOGP(DINP, LOGL_ERROR,
-		     "Two missing SLTAs. Restart link: %s/%d\n",
+		     "Two missing SLTAs on link %s/%d.\n",
 		     link->set->name, link->link_no);
 		bsc_del_timer(&link->t2_timer);
 		mtp_link_failure(link);
@@ -96,7 +97,7 @@ static void mtp_sltm_t2_timeout(void *_link)
 
 	if (!link->set->running) {
 		LOGP(DINP, LOGL_INFO,
-		     "The linkset is not active. Stopping SLTM now. %s/%d\n",
+		     "The linkset is not active. Stopping the link test on %s/%d.\n",
 		     link->set->name, link->link_no);
 		return;
 	}
@@ -107,7 +108,8 @@ static void mtp_sltm_t2_timeout(void *_link)
 	bsc_schedule_timer(&link->t1_timer, MTP_T1);
 
 	if (link->set->sltm_once && link->was_up)
-		LOGP(DINP, LOGL_INFO, "Not sending SLTM again as configured.\n");
+		LOGP(DINP, LOGL_INFO, "Not sending SLTM again as configured on %s/%d.\n",
+		     link->set->name, link->link_no);
 	else
 		bsc_schedule_timer(&link->t2_timer, MTP_T2);
 }
@@ -175,7 +177,7 @@ void mtp_link_failure(struct mtp_link *link)
 		return;
 	}
 
-	LOGP(DINP, LOGL_ERROR, "Link has failed. Resetting it: %s/%d\n",
+	LOGP(DINP, LOGL_ERROR, "Link %s/%d has failed, going to reset it.\n",
 	     link->set->name, link->link_no);
 	rate_ctr_inc(&link->ctrg->ctr[MTP_LNK_ERROR]);
 	link->reset(link);