diff options
Diffstat (limited to 'sysdep/unix')
-rw-r--r-- | sysdep/unix/endian.h | 3 | ||||
-rw-r--r-- | sysdep/unix/io.c | 37 | ||||
-rw-r--r-- | sysdep/unix/krt.c | 2 |
3 files changed, 4 insertions, 38 deletions
diff --git a/sysdep/unix/endian.h b/sysdep/unix/endian.h index 58c746f0..bc486313 100644 --- a/sysdep/unix/endian.h +++ b/sysdep/unix/endian.h @@ -13,5 +13,8 @@ #include <sys/types.h> #include <netinet/in.h> +#ifdef HAVE_STDINT_H +#include <stdint.h> +#endif #endif diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c index b6c7f846..50992fb4 100644 --- a/sysdep/unix/io.c +++ b/sysdep/unix/io.c @@ -738,43 +738,6 @@ sk_set_ttl(sock *s, int ttl) } -/* FIXME: check portability */ - -static int -sk_set_md5_auth_int(sock *s, sockaddr *sa, char *passwd) -{ - struct tcp_md5sig md5; - - memset(&md5, 0, sizeof(md5)); - memcpy(&md5.tcpm_addr, (struct sockaddr *) sa, sizeof(*sa)); - - if (passwd) - { - int len = strlen(passwd); - - if (len > TCP_MD5SIG_MAXKEYLEN) - { - log(L_ERR "MD5 password too long"); - return -1; - } - - md5.tcpm_keylen = len; - memcpy(&md5.tcpm_key, passwd, len); - } - - int rv = setsockopt(s->fd, IPPROTO_TCP, TCP_MD5SIG, &md5, sizeof(md5)); - - if (rv < 0) - { - if (errno == ENOPROTOOPT) - log(L_ERR "Kernel does not support TCP MD5 signatures"); - else - log(L_ERR "sk_set_md5_auth_int: setsockopt: %m"); - } - - return rv; -} - /** * sk_set_md5_auth - add / remove MD5 security association for given socket. * @s: socket diff --git a/sysdep/unix/krt.c b/sysdep/unix/krt.c index 83456b0f..6208f689 100644 --- a/sysdep/unix/krt.c +++ b/sysdep/unix/krt.c @@ -637,8 +637,8 @@ krt_got_route_async(struct krt_proto *p, rte *e, int new UNUSED) DBG("It's a redirect, kill him! Kill! Kill!\n"); krt_set_notify(p, net, NULL, e); break; - case KRT_SRC_ALIEN: #ifdef KRT_ALLOW_LEARN + case KRT_SRC_ALIEN: if (KRT_CF->learn) { krt_learn_async(p, e, new); |