diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2013-11-21 21:08:03 +0100 |
|---|---|---|
| committer | Gert Doering <gert@greenie.muc.de> | 2013-11-23 15:32:52 +0100 |
| commit | d3310d2ea46a71c35313a653c9454fc468cb9c55 (patch) | |
| tree | 24511beb12bdc35d9b8dc1a7a2f8e895aa8db53b /src/openvpn/socket.h | |
| parent | 20fe5561dfe7a6f1da3aac07b38d0773c2758e5e (diff) | |
| download | openvpn-d3310d2ea46a71c35313a653c9454fc468cb9c55.tar.gz openvpn-d3310d2ea46a71c35313a653c9454fc468cb9c55.tar.xz openvpn-d3310d2ea46a71c35313a653c9454fc468cb9c55.zip | |
Simplify print_sockaddr_ex function, merge duplicate ipv4/ipv6 logic.
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <1385064495-25877-2-git-send-email-arne@rfc2549.org>
URL: http://article.gmane.org/gmane.network.openvpn.devel/8023
Signed-off-by: Gert Doering <gert@greenie.muc.de>
Diffstat (limited to 'src/openvpn/socket.h')
| -rw-r--r-- | src/openvpn/socket.h | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/openvpn/socket.h b/src/openvpn/socket.h index 549946e..1a8ec0f 100644 --- a/src/openvpn/socket.h +++ b/src/openvpn/socket.h @@ -347,14 +347,26 @@ void sd_close (socket_descriptor_t *sd); #define PS_SHOW_PKTINFO (1<<2) #define PS_DONT_SHOW_ADDR (1<<3) -const char *print_sockaddr_ex (const struct openvpn_sockaddr *addr, +const char *print_sockaddr_ex (const struct sockaddr *addr, const char* separator, const unsigned int flags, struct gc_arena *gc); +static inline +const char *print_openvpn_sockaddr_ex (const struct openvpn_sockaddr *addr, + const char* separator, + const unsigned int flags, + struct gc_arena *gc) +{ + return print_sockaddr_ex(&addr->addr.sa, separator, flags, gc); +} +static inline const char *print_sockaddr (const struct openvpn_sockaddr *addr, - struct gc_arena *gc); + struct gc_arena *gc) +{ + return print_sockaddr_ex (&addr->addr.sa, ":", PS_SHOW_PORT, gc); +} const char *print_link_socket_actual_ex (const struct link_socket_actual *act, const char* separator, |