Skip to content

Commit

Permalink
Simplify print_sockaddr_ex function, merge duplicate ipv4/ipv6 logic.
Browse files Browse the repository at this point in the history 
Acked-by: Gert Doering <[email protected]>
Message-Id: <[email protected]>
URL: http://article.gmane.org/gmane.network.openvpn.devel/8023

Signed-off-by: Gert Doering <[email protected]>
  • Loading branch information
@schwabe @cron2
schwabe authored and cron2 committed Nov 23, 2013
1 parent 20fe556 commit d3310d2
Show file tree
Hide file tree
Showing 3 changed files with 67 additions and 65 deletions.
4 changes: 2 additions & 2 deletions src/openvpn/ps.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -330,8 +330,8 @@ journal_add (const char *journal_dir, struct proxy_connection *pc, struct proxy_
if (!getpeername (pc->sd, (struct sockaddr *) &from.addr.sa, &slen)
&& !getsockname (cp->sd, (struct sockaddr *) &to.addr.sa, &dlen))
{
const char *f = print_sockaddr_ex (&from, ":", PS_SHOW_PORT, &gc);
const char *t = print_sockaddr_ex (&to, ":", PS_SHOW_PORT, &gc);
const char *f = print_sockaddr (&from, &gc);
const char *t = print_sockaddr (&to, &gc);
fnlen = strlen(journal_dir) + strlen(t) + 2;
jfn = (char *) malloc(fnlen);
check_malloc_return (jfn);
Expand Down
112 changes: 51 additions & 61 deletions src/openvpn/socket.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1746,7 +1746,7 @@ link_socket_init_phase2 (struct link_socket *sock,
msg (msglevel, "%s link local%s: %s",
proto2ascii (sock->info.proto, true),
(sock->bind_local ? " (bound)" : ""),
print_sockaddr_ex (&sock->info.lsa->local, ":", sock->bind_local ? PS_SHOW_PORT : 0, &gc));
print_openvpn_sockaddr_ex (&sock->info.lsa->local, ":", sock->bind_local ? PS_SHOW_PORT : 0, &gc));

/* print active remote address */
msg (msglevel, "%s link remote: %s",
Expand Down Expand Up @@ -1831,17 +1831,14 @@ setenv_trusted (struct env_set *es, const struct link_socket_info *info)
static void
ipchange_fmt (const bool include_cmd, struct argv *argv, const struct link_socket_info *info, struct gc_arena *gc)
{
const char *ip = print_sockaddr_ex (&info->lsa->actual.dest, NULL, 0, gc);
const char *port = print_sockaddr_ex (&info->lsa->actual.dest, NULL, PS_DONT_SHOW_ADDR|PS_SHOW_PORT, gc);
const char *host = print_sockaddr_ex (&info->lsa->actual.dest.addr.sa, " ", PS_SHOW_PORT , gc);
if (include_cmd)
argv_printf (argv, "%sc %s %s",
argv_printf (argv, "%sc %s",
info->ipchange_command,
ip,
port);
host);
else
argv_printf (argv, "%s %s",
ip,
port);
argv_printf (argv, "%s", host);

}

void
Expand Down Expand Up @@ -2155,67 +2152,60 @@ socket_listen_event_handle (struct link_socket *s)
*/

const char *
print_sockaddr (const struct openvpn_sockaddr *addr, struct gc_arena *gc)
{
return print_sockaddr_ex (addr, ":", PS_SHOW_PORT, gc);
}

const char *
print_sockaddr_ex (const struct openvpn_sockaddr *addr,
const char* separator,
const unsigned int flags,
struct gc_arena *gc)
print_sockaddr_ex (const struct sockaddr *sa,
const char* separator,
const unsigned int flags,
struct gc_arena *gc)
{
struct buffer out = alloc_buf_gc (128, gc);
bool addr_is_defined;
addr_is_defined = addr_defined (addr);
if (!addr_is_defined) {
return "[undef]";
}
switch(addr->addr.sa.sa_family)
char hostaddr[NI_MAXHOST] = "";
char servname[NI_MAXSERV] = "";
int status;

socklen_t salen;
switch(sa->sa_family)
{
case AF_INET:
{
const int port= ntohs (addr->addr.in4.sin_port);
buf_puts (&out, "[AF_INET]");

if (!(flags & PS_DONT_SHOW_ADDR))
buf_printf (&out, "%s", (addr_defined (addr) ? inet_ntoa (addr->addr.in4.sin_addr) : "[undef]"));

if (((flags & PS_SHOW_PORT) || (addr_defined (addr) && (flags & PS_SHOW_PORT_IF_DEFINED)))
&& port)
{
if (separator)
buf_printf (&out, "%s", separator);

buf_printf (&out, "%d", port);
}
}
buf_puts (&out, "[AF_INET]");
salen = sizeof (struct sockaddr_in);
addr_is_defined = ((struct sockaddr_in*) sa)->sin_addr.s_addr != 0;
break;
case AF_INET6:
{
const int port= ntohs (addr->addr.in6.sin6_port);
char buf[INET6_ADDRSTRLEN] = "";
buf_puts (&out, "[AF_INET6]");
if (addr_is_defined)
{
getnameinfo(&addr->addr.sa, sizeof (struct sockaddr_in6),
buf, sizeof (buf), NULL, 0, NI_NUMERICHOST);
buf_puts (&out, buf);
}
if (((flags & PS_SHOW_PORT) || (addr_is_defined && (flags & PS_SHOW_PORT_IF_DEFINED)))
&& port)
{
if (separator)
buf_puts (&out, separator);

buf_printf (&out, "%d", port);
}
}
buf_puts (&out, "[AF_INET6]");
salen = sizeof (struct sockaddr_in6);
addr_is_defined = !IN6_IS_ADDR_UNSPECIFIED(&((struct sockaddr_in6*) sa)->sin6_addr);
break;
case AF_UNSPEC:
return "[AF_UNSPEC]";
default:
ASSERT(0);
}

status = getnameinfo(sa, salen, hostaddr, sizeof (hostaddr),
servname, sizeof(servname), NI_NUMERICHOST | NI_NUMERICSERV);

if(status!=0) {
buf_printf(&out,"[nameinfo() err: %s]",gai_strerror(status));
return BSTR(&out);
}

if (!(flags & PS_DONT_SHOW_ADDR))
{
if (addr_is_defined)
buf_puts (&out, hostaddr);
else
buf_puts (&out, "[undef]");
}

if ((flags & PS_SHOW_PORT) || (flags & PS_SHOW_PORT_IF_DEFINED))
{
if (separator)
buf_puts (&out, separator);

buf_puts (&out, servname);
}

return BSTR (&out);
}

Expand All @@ -2239,7 +2229,7 @@ print_link_socket_actual_ex (const struct link_socket_actual *act,
{
char ifname[IF_NAMESIZE] = "[undef]";
struct buffer out = alloc_buf_gc (128, gc);
buf_printf (&out, "%s", print_sockaddr_ex (&act->dest, separator, flags, gc));
buf_printf (&out, "%s", print_sockaddr_ex (&act->dest.addr.sa, separator, flags, gc));
#if ENABLE_IP_PKTINFO
if ((flags & PS_SHOW_PKTINFO) && addr_defined_ipi(act))
{
Expand All @@ -2260,7 +2250,7 @@ print_link_socket_actual_ex (const struct link_socket_actual *act,
#error ENABLE_IP_PKTINFO is set without IP_PKTINFO xor IP_RECVDSTADDR (fix syshead.h)
#endif
buf_printf (&out, " (via %s%%%s)",
print_sockaddr_ex (&sa, separator, 0, gc),
print_sockaddr_ex (&sa.addr.sa, separator, 0, gc),
ifname);
}
break;
Expand Down
16 changes: 14 additions & 2 deletions src/openvpn/socket.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit d3310d2

Please sign in to comment.