Pārlūkot izejas kodu

Fix some awkward NOIPV6 typoes and ommissions

Lubomir Rintel 11 gadi atpakaļ
vecāks
revīzija
9416012a01
2 mainītis faili ar 4 papildinājumiem un 4 dzēšanām
  1. 1 1
      src/datatypes.c
  2. 3 3
      src/structures.h

+ 1 - 1
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] = '[';

+ 3 - 3
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;