openggsn[master]: libgtp: expand logging

2017-08-24 Thread Harald Welte 

Patch Set 3: Code-Review+2

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I0f8ad8687acb7f6f0eeeb962f007e87cca0c4c27
Gerrit-PatchSet: 3
Gerrit-Project: openggsn
Gerrit-Branch: master
Gerrit-Owner: Max 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: daniel 
Gerrit-HasComments: No

[MERGED] openggsn[master]: libgtp: expand logging

2017-08-24 Thread Harald Welte 
Harald Welte has submitted this change and it was merged.

Change subject: libgtp: expand logging
..


libgtp: expand logging

* print destination address on sendto error
* print address length on conversion error
* log listening address
* log GTP version on PDP context errors
* fix incorrect logging message for unknown GSN peer

Related: SYS#3610
Change-Id: I0f8ad8687acb7f6f0eeeb962f007e87cca0c4c27
---
M gtp/gtp.c
1 file changed, 7 insertions(+), 10 deletions(-)

Approvals:
  Pau Espin Pedrol: Looks good to me, but someone else must approve
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/gtp/gtp.c b/gtp/gtp.c
index 012aa79..a3f6eb2 100644
--- a/gtp/gtp.c
+++ b/gtp/gtp.c
@@ -394,9 +394,8 @@
if (sendto(fd, packet, len, 0,
   (struct sockaddr *), sizeof(addr)) < 0) {
gsn->err_sendto++;
-   LOGP(DLGTP, LOGL_ERROR,
-   "Sendto(fd=%d, msg=%lx, len=%d) failed: Error = %s\n", 
fd,
-   (unsigned long), len, strerror(errno));
+   LOGP(DLGTP, LOGL_ERROR, "Sendto(fd=%d, msg=%lx, len=%d, dst=%s) 
failed: Error = %s\n", fd,
+(unsigned long), len, inet_ntoa(addr.sin_addr), 
strerror(errno));
return -1;
}
 
@@ -697,7 +696,7 @@
 {
struct sockaddr_in addr;
 
-   LOGP(DLGTP, LOGL_NOTICE, "GTP: gtp_newgsn() started\n");
+   LOGP(DLGTP, LOGL_NOTICE, "GTP: gtp_newgsn() started at %s\n", 
inet_ntoa(*listen));
 
*gsn = calloc(sizeof(struct gsn_t), 1); /* TODO */
 
@@ -2293,8 +2292,7 @@
 
if (gsna2in_addr(, >gsnrc)) {
gsn->err_address++;
-   LOGP(DLGTP, LOGL_ERROR,
-   "GSN address conversion failed\n");
+   LOGP(DLGTP, LOGL_ERROR, "GSN address (len=%u) conversion 
failed\n", pdp->gsnrc.l);
return EOF;
}
 
@@ -2642,7 +2640,7 @@
(, ntoh16(((union gtp_packet *)pack)->gtp0.h.flow))) {
gsn->err_unknownpdp++;
GTP_LOGPKG(LOGL_ERROR, peer, pack,
-   len, "Unknown PDP context\n");
+   len, "Unknown PDP context, GTPv0\n");
return gtp_error_ind_resp(gsn, version, peer, fd, pack,
  len);
}
@@ -2652,7 +2650,7 @@
(, ntoh32(((union gtp_packet *)pack)->gtp1l.h.tei))) {
gsn->err_unknownpdp++;
GTP_LOGPKG(LOGL_ERROR, peer, pack,
-   len, "Unknown PDP context\n");
+   len, "Unknown PDP context, GTPv1\n");
return gtp_error_ind_resp(gsn, version, peer, fd, pack,
  len);
}
@@ -2670,8 +2668,7 @@
/* If the GPDU was not from the peer GSN tell him to delete context */
if (memcmp(>sin_addr, pdp->gsnru.v, pdp->gsnru.l)) {  /* TODO 
Range? */
gsn->err_unknownpdp++;
-   GTP_LOGPKG(LOGL_ERROR, peer, pack, len,
-   "Unknown PDP context\n");
+   GTP_LOGPKG(LOGL_ERROR, peer, pack, len, "Unknown GSN peer 
%s\n", inet_ntoa(peer->sin_addr));
return gtp_error_ind_resp(gsn, version, peer, fd, pack, len);
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0f8ad8687acb7f6f0eeeb962f007e87cca0c4c27
Gerrit-PatchSet: 3
Gerrit-Project: openggsn
Gerrit-Branch: master
Gerrit-Owner: Max 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: daniel

openggsn[master]: libgtp: expand logging

2017-08-22 Thread Pau Espin Pedrol 

Patch Set 3: Code-Review+1

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I0f8ad8687acb7f6f0eeeb962f007e87cca0c4c27
Gerrit-PatchSet: 3
Gerrit-Project: openggsn
Gerrit-Branch: master
Gerrit-Owner: Max 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: daniel 
Gerrit-HasComments: No

[PATCH] openggsn[master]: libgtp: expand logging

2017-08-22 Thread Max 
Hello Jenkins Builder,

I'd like you to reexamine a change.  Please visit

https://gerrit.osmocom.org/3573

to look at the new patch set (#3).

libgtp: expand logging

* print destination address on sendto error
* print address length on conversion error
* log listening address
* log GTP version on PDP context errors
* fix incorrect logging message for unknown GSN peer

Related: SYS#3610
Change-Id: I0f8ad8687acb7f6f0eeeb962f007e87cca0c4c27
---
M gtp/gtp.c
1 file changed, 7 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/openggsn refs/changes/73/3573/3

diff --git a/gtp/gtp.c b/gtp/gtp.c
index 012aa79..a3f6eb2 100644
--- a/gtp/gtp.c
+++ b/gtp/gtp.c
@@ -394,9 +394,8 @@
if (sendto(fd, packet, len, 0,
   (struct sockaddr *), sizeof(addr)) < 0) {
gsn->err_sendto++;
-   LOGP(DLGTP, LOGL_ERROR,
-   "Sendto(fd=%d, msg=%lx, len=%d) failed: Error = %s\n", 
fd,
-   (unsigned long), len, strerror(errno));
+   LOGP(DLGTP, LOGL_ERROR, "Sendto(fd=%d, msg=%lx, len=%d, dst=%s) 
failed: Error = %s\n", fd,
+(unsigned long), len, inet_ntoa(addr.sin_addr), 
strerror(errno));
return -1;
}
 
@@ -697,7 +696,7 @@
 {
struct sockaddr_in addr;
 
-   LOGP(DLGTP, LOGL_NOTICE, "GTP: gtp_newgsn() started\n");
+   LOGP(DLGTP, LOGL_NOTICE, "GTP: gtp_newgsn() started at %s\n", 
inet_ntoa(*listen));
 
*gsn = calloc(sizeof(struct gsn_t), 1); /* TODO */
 
@@ -2293,8 +2292,7 @@
 
if (gsna2in_addr(, >gsnrc)) {
gsn->err_address++;
-   LOGP(DLGTP, LOGL_ERROR,
-   "GSN address conversion failed\n");
+   LOGP(DLGTP, LOGL_ERROR, "GSN address (len=%u) conversion 
failed\n", pdp->gsnrc.l);
return EOF;
}
 
@@ -2642,7 +2640,7 @@
(, ntoh16(((union gtp_packet *)pack)->gtp0.h.flow))) {
gsn->err_unknownpdp++;
GTP_LOGPKG(LOGL_ERROR, peer, pack,
-   len, "Unknown PDP context\n");
+   len, "Unknown PDP context, GTPv0\n");
return gtp_error_ind_resp(gsn, version, peer, fd, pack,
  len);
}
@@ -2652,7 +2650,7 @@
(, ntoh32(((union gtp_packet *)pack)->gtp1l.h.tei))) {
gsn->err_unknownpdp++;
GTP_LOGPKG(LOGL_ERROR, peer, pack,
-   len, "Unknown PDP context\n");
+   len, "Unknown PDP context, GTPv1\n");
return gtp_error_ind_resp(gsn, version, peer, fd, pack,
  len);
}
@@ -2670,8 +2668,7 @@
/* If the GPDU was not from the peer GSN tell him to delete context */
if (memcmp(>sin_addr, pdp->gsnru.v, pdp->gsnru.l)) {  /* TODO 
Range? */
gsn->err_unknownpdp++;
-   GTP_LOGPKG(LOGL_ERROR, peer, pack, len,
-   "Unknown PDP context\n");
+   GTP_LOGPKG(LOGL_ERROR, peer, pack, len, "Unknown GSN peer 
%s\n", inet_ntoa(peer->sin_addr));
return gtp_error_ind_resp(gsn, version, peer, fd, pack, len);
}
 

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

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I0f8ad8687acb7f6f0eeeb962f007e87cca0c4c27
Gerrit-PatchSet: 3
Gerrit-Project: openggsn
Gerrit-Branch: master
Gerrit-Owner: Max 
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Pau Espin Pedrol 
Gerrit-Reviewer: daniel