diff options
| -rw-r--r-- | hash.h | 2 | ||||
| -rw-r--r-- | radsecproxy.c | 8 | ||||
| -rw-r--r-- | radsecproxy.h | 2 |
3 files changed, 7 insertions, 5 deletions
@@ -6,7 +6,9 @@ * copyright notice and this permission notice appear in all copies. */ +#ifndef SYS_SOLARIS9 #include <stdint.h> +#endif struct hash { struct list *hashlist; diff --git a/radsecproxy.c b/radsecproxy.c index 2cfc48d..89e3622 100644 --- a/radsecproxy.c +++ b/radsecproxy.c @@ -172,12 +172,12 @@ static const struct protodefs protodefs[] = { 1, /* freesrcprotores */ initextradtls /* initextra */ }, - { NULL + { NULL, NULL, 0, NULL, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, 0, NULL } }; uint8_t protoname2int(const char *name) { - int i; + uint8_t i; for (i = 0; protodefs[i].name && strcasecmp(protodefs[i].name, name); i++); return i; @@ -322,7 +322,7 @@ int resolvepeer(struct clsrvconf *conf, int ai_flags) { freeaddrinfo(addrinfo); return 0; } - conf->prefixlen = plen; + conf->prefixlen = (uint8_t)plen; } else conf->prefixlen = 255; } @@ -403,7 +403,7 @@ void freeclsrvres(struct clsrvconf *res) { /* returns 1 if the len first bits are equal, else 0 */ int prefixmatch(void *a1, void *a2, uint8_t len) { static uint8_t mask[] = { 0, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe }; - int r, l = len / 8; + uint8_t r, l = len / 8; if (l && memcmp(a1, a2, l)) return 0; r = len % 8; diff --git a/radsecproxy.h b/radsecproxy.h index a67d88d..fd48964 100644 --- a/radsecproxy.h +++ b/radsecproxy.h @@ -181,7 +181,7 @@ struct rewrite { struct protodefs { char *name; char *secretdefault; - uint8_t socktype; + int socktype; char *portdefault; uint8_t retrycountdefault; uint8_t retrycountmax; |