bughz/3proxy
1
0
Fork 0
mirror of https://github.com/3proxy/3proxy.git synced 2025-02-23 18:45:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix some awkward NOIPV6 typoes and ommissions

Browse Source
This commit is contained in:
Lubomir Rintel 2014-07-01 19:01:28 +02:00 committed by z3APA3A
parent 5cccf7cbdd
commit 9416012a01
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/datatypes.c
View File

@ -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){ static void pr_sa(struct node *node, CBFUNC cbf, void*cb){
#ifdef NOIPV6 #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 #else
char buf[64]; char buf[64];
buf[0] = '['; buf[0] = '[';

6
src/structures.h
View File

@ -112,7 +112,7 @@ int
#define SASIZE(sa) (((struct sockaddr_in *)sa)->sin_family == AF_INET6? sizeof(struct sockaddr_in6):sizeof(struct sockaddr_in)) #define SASIZE(sa) (((struct sockaddr_in *)sa)->sin_family == AF_INET6? sizeof(struct sockaddr_in6):sizeof(struct sockaddr_in))
#else #else
#define SAPORT(sa) (&((struct sockaddr_in *)sa)->sin_port) #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 SAADDRLEN(sa) (4)
#define SASOCK(sa) (PF_INET) #define SASOCK(sa) (PF_INET)
#define SASIZE(sa) (sizeof(struct sockaddr_in)) #define SASIZE(sa) (sizeof(struct sockaddr_in))
@ -359,7 +359,7 @@ struct srvparam {
#ifndef NOIPV6 #ifndef NOIPV6
struct sockaddr_in6 intsa; struct sockaddr_in6 intsa;
#else #else
struct sockaddr_in intsa struct sockaddr_in intsa;
#endif #endif
unsigned long extip; unsigned long extip;
pthread_mutex_t counter_mutex; pthread_mutex_t counter_mutex;
@ -487,7 +487,7 @@ struct extparam {
#ifndef NOIPV6 #ifndef NOIPV6
struct sockaddr_in6 intsa; struct sockaddr_in6 intsa;
#else #else
struct sockaddr_in intsa struct sockaddr_in intsa;
#endif #endif
unsigned long extip; unsigned long extip;
unsigned short extport; unsigned short extport;