From 9416012a011eed1f7d433fab829f3843793ce5a3 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Tue, 1 Jul 2014 19:01:28 +0200 Subject: [PATCH] Fix some awkward NOIPV6 typoes and ommissions --- src/datatypes.c | 2 +- src/structures.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/datatypes.c b/src/datatypes.c index d5dea1d..074b62c 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -69,7 +69,7 @@ static void pr_ip6(struct node *node, CBFUNC cbf, void*cb){ static void pr_sa(struct node *node, CBFUNC cbf, void*cb){ #ifdef NOIPV6 - if(node->value)return pr_ip(node, &((struct sockaddr_in *)node->value)->sin_addr.s_addr) + if(node->value)return pr_ip(node, cbf, cb); #else char buf[64]; buf[0] = '['; diff --git a/src/structures.h b/src/structures.h index 5195131..3b25c06 100644 --- a/src/structures.h +++ b/src/structures.h @@ -112,7 +112,7 @@ int #define SASIZE(sa) (((struct sockaddr_in *)sa)->sin_family == AF_INET6? sizeof(struct sockaddr_in6):sizeof(struct sockaddr_in)) #else #define SAPORT(sa) (&((struct sockaddr_in *)sa)->sin_port) -#define SAADDR(sa) ((unsigned char *)&((struct sockaddr_in *)sa)->sin_addr.a_addr) +#define SAADDR(sa) ((unsigned char *)&((struct sockaddr_in *)sa)->sin_addr.s_addr) #define SAADDRLEN(sa) (4) #define SASOCK(sa) (PF_INET) #define SASIZE(sa) (sizeof(struct sockaddr_in)) @@ -359,7 +359,7 @@ struct srvparam { #ifndef NOIPV6 struct sockaddr_in6 intsa; #else - struct sockaddr_in intsa + struct sockaddr_in intsa; #endif unsigned long extip; pthread_mutex_t counter_mutex; @@ -487,7 +487,7 @@ struct extparam { #ifndef NOIPV6 struct sockaddr_in6 intsa; #else - struct sockaddr_in intsa + struct sockaddr_in intsa; #endif unsigned long extip; unsigned short extport;