pespin submitted this change.

View Change

Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve pespin: Looks good to me, approved
gtp: Log retrans queue register&free entries

Change-Id: I4e12376652fc7a6a96fbdcb579dbe916c1473012
---
M gtp/gtp.c
1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/gtp/gtp.c b/gtp/gtp.c
index 608e5f9..672c5f0 100644
--- a/gtp/gtp.c
+++ b/gtp/gtp.c
@@ -400,15 +400,13 @@
time_t now;
struct qmsg_t *qmsg;
now = time(NULL);
- /*printf("Retrans: New beginning %d\n", (int) now); */

/* get first element in queue, as long as the timeout of that
* element has expired */
while ((!queue_getfirst(gsn->queue_req, &qmsg)) &&
(qmsg->timeout <= now)) {
- /*printf("Retrans timeout found: %d\n", (int) time(NULL)); */
if (qmsg->retrans > N3_REQUESTS) { /* To many retrans */
- LOGP(DLGTP, LOGL_NOTICE, "Timeout of seq %" PRIu16 "\n",
+ LOGP(DLGTP, LOGL_NOTICE, "Retransmit req queue timeout of seq %" PRIu16 "\n",
qmsg->seq);
if (gsn->cb_conf)
gsn->cb_conf(qmsg->type, EOF, NULL, qmsg->cbp);
@@ -434,7 +432,8 @@
/* Also clean up reply timeouts */
while ((!queue_getfirst(gsn->queue_resp, &qmsg)) &&
(qmsg->timeout < now)) {
- /*printf("Retrans (reply) timeout found: %d\n", (int) time(NULL)); */
+ LOGP(DLGTP, LOGL_DEBUG, "Retransmit resp queue seq %"
+ PRIu16 " expired, removing from queue\n", qmsg->seq);
queue_freemsg(gsn->queue_resp, qmsg);
}

@@ -633,6 +632,8 @@
LOGP(DLGTP, LOGL_ERROR, "Retransmit req queue is full (seq=%" PRIu16 ")\n",
gsn->seq_next);
} else {
+ LOGP(DLGTP, LOGL_DEBUG, "Registering seq=%" PRIu16
+ " in restransmit req queue\n", gsn->seq_next);
memcpy(&qmsg->p, packet, sizeof(union gtp_packet));
qmsg->l = len;
qmsg->timeout = time(NULL) + T3_REQUEST; /* When to timeout */
@@ -660,6 +661,7 @@
{
struct qmsg_t *qmsg;

+ LOGP(DLGTP, LOGL_INFO, "Clearing req & resp retransmit queues\n");
while (!queue_getfirst(gsn->queue_req, &qmsg)) {
queue_freemsg(gsn->queue_req, qmsg);
}
@@ -689,10 +691,14 @@
return EOF;
}

+ GTP_LOGPKG(LOGL_DEBUG, peer, packet, len,
+ "Freeing seq=%" PRIu16 " from retransmit req queue\n",
+ seq);
if (queue_freemsg_seq(gsn->queue_req, peer, seq, type, cbp)) {
gsn->err_seq++;
GTP_LOGPKG(LOGL_ERROR, peer, packet, len,
- "Confirmation packet not found in queue\n");
+ "Confirmation packet not found in retransmit req queue (seq=%"
+ PRIu16 ")\n", seq);
return EOF;
}

@@ -761,6 +767,8 @@
LOGP(DLGTP, LOGL_ERROR, "Retransmit resp queue is full (seq=%" PRIu16 ")\n",
seq);
} else {
+ LOGP(DLGTP, LOGL_DEBUG, "Registering seq=%" PRIu16
+ " in restransmit resp queue\n", seq);
memcpy(&qmsg->p, packet, sizeof(union gtp_packet));
qmsg->l = len;
qmsg->timeout = time(NULL) + 60; /* When to timeout */

To view, visit change 27417. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: osmo-ggsn
Gerrit-Branch: master
Gerrit-Change-Id: I4e12376652fc7a6a96fbdcb579dbe916c1473012
Gerrit-Change-Number: 27417
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge@osmocom.org>
Gerrit-Reviewer: osmith <osmith@sysmocom.de>
Gerrit-Reviewer: pespin <pespin@sysmocom.de>
Gerrit-MessageType: merged