lynxis lazus has uploaded this change for review.

View Change

gtp: internal LOGP_WITH_ADDR macro: use point of peer

Using a pointer is more universal for the macro.
Further the upcoming SGSN Context Req/Response/Ack code will use
a peer pointer instead of the direct object.

Change-Id: Iab11a8b07eb177c479e1920cd7fa8be2099a4b7b
---
M gtp/gsn.c
M gtp/gtp.c
2 files changed, 3 insertions(+), 3 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/34/40434/1
diff --git a/gtp/gsn.c b/gtp/gsn.c
index b8b752f..2409566 100644
--- a/gtp/gsn.c
+++ b/gtp/gsn.c
@@ -69,7 +69,7 @@

#define LOGP_WITH_ADDR(ss, level, addr, fmt, args...) \
LOGP(ss, level, "addr(%s:%d) " fmt, \
- inet_ntoa((addr).sin_addr), ntohs((addr).sin_port), \
+ inet_ntoa((addr)->sin_addr), ntohs((addr)->sin_port), \
##args)

static const struct rate_ctr_desc gsn_ctr_description[] = {
@@ -453,7 +453,7 @@

if (bind(*fd, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
rate_ctr_inc2(gsn->ctrg, GSN_CTR_ERR_SOCKET);
- LOGP_WITH_ADDR(DLGTP, LOGL_ERROR, addr,
+ LOGP_WITH_ADDR(DLGTP, LOGL_ERROR, &addr,
"%s bind(fd=%d) failed: Error = %s\n",
name, *fd, strerror(errno));
return -errno;
diff --git a/gtp/gtp.c b/gtp/gtp.c
index aaed27b..3074776 100644
--- a/gtp/gtp.c
+++ b/gtp/gtp.c
@@ -74,7 +74,7 @@

#define LOGP_WITH_ADDR(ss, level, addr, fmt, args...) \
LOGP(ss, level, "addr(%s:%d) " fmt, \
- inet_ntoa((addr).sin_addr), htons((addr).sin_port), \
+ inet_ntoa((addr)->sin_addr), htons((addr)->sin_port), \
##args);

TALLOC_CTX *tall_libgtp_ctx = NULL;

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

Gerrit-MessageType: newchange
Gerrit-Project: osmo-ggsn
Gerrit-Branch: master
Gerrit-Change-Id: Iab11a8b07eb177c479e1920cd7fa8be2099a4b7b
Gerrit-Change-Number: 40434
Gerrit-PatchSet: 1
Gerrit-Owner: lynxis lazus <lynxis@fe80.eu>