diff options
| author | Ondrej Zajicek <santiago@crfreenet.org> | 2012-01-09 02:40:57 +0100 |
|---|---|---|
| committer | Ondrej Zajicek <santiago@crfreenet.org> | 2012-01-09 02:41:13 +0100 |
| commit | d7f469c15c1fd8315061f85b87a19946c3ea4700 (patch) | |
| tree | 6569c62ceea73f88d436e25c4854ea9bae2c2938 /sysdep/unix | |
| parent | 3f58437405f8e37e9c14d83274a6b82ffd9583f8 (diff) | |
Some minor fixes.
Diffstat (limited to 'sysdep/unix')
| -rw-r--r-- | sysdep/unix/io.c | 12 | ||||
| -rw-r--r-- | sysdep/unix/unix.h | 5 |
2 files changed, 9 insertions, 8 deletions
diff --git a/sysdep/unix/io.c b/sysdep/unix/io.c index d72161f1..2dced67a 100644 --- a/sysdep/unix/io.c +++ b/sysdep/unix/io.c @@ -609,8 +609,8 @@ sk_insert(sock *s) #ifdef IPV6 -static void -fill_in_sockaddr(sockaddr *sa, ip_addr a, struct iface *ifa, unsigned port) +void +fill_in_sockaddr(struct sockaddr_in6 *sa, ip_addr a, struct iface *ifa, unsigned port) { memset(sa, 0, sizeof (struct sockaddr_in6)); sa->sin6_family = AF_INET6; @@ -625,7 +625,7 @@ fill_in_sockaddr(sockaddr *sa, ip_addr a, struct iface *ifa, unsigned port) sa->sin6_scope_id = ifa->index; } -static void +void get_sockaddr(struct sockaddr_in6 *sa, ip_addr *a, struct iface **ifa, unsigned *port, int check) { if (check && sa->sin6_family != AF_INET6) @@ -641,8 +641,8 @@ get_sockaddr(struct sockaddr_in6 *sa, ip_addr *a, struct iface **ifa, unsigned * #else -static void -fill_in_sockaddr(sockaddr *sa, ip_addr a, struct iface *ifa, unsigned port) +void +fill_in_sockaddr(struct sockaddr_in *sa, ip_addr a, struct iface *ifa, unsigned port) { memset (sa, 0, sizeof (struct sockaddr_in)); sa->sin_family = AF_INET; @@ -653,7 +653,7 @@ fill_in_sockaddr(sockaddr *sa, ip_addr a, struct iface *ifa, unsigned port) set_inaddr(&sa->sin_addr, a); } -static void +void get_sockaddr(struct sockaddr_in *sa, ip_addr *a, struct iface **ifa, unsigned *port, int check) { if (check && sa->sin_family != AF_INET) diff --git a/sysdep/unix/unix.h b/sysdep/unix/unix.h index ff31af29..3e85c85c 100644 --- a/sysdep/unix/unix.h +++ b/sysdep/unix/unix.h @@ -45,11 +45,12 @@ static inline int sa_family_check(sockaddr *sa) { return sa->sin_family == AF_IN #endif struct birdsock; +struct iface; void io_init(void); void io_loop(void); -// void fill_in_sockaddr(sockaddr *sa, ip_addr a, struct iface *ifa, unsigned port); -// void get_sockaddr(struct sockaddr_in6 *sa, ip_addr *a, struct iface **ifa, unsigned *port, int check); +void fill_in_sockaddr(sockaddr *sa, ip_addr a, struct iface *ifa, unsigned port); +void get_sockaddr(sockaddr *sa, ip_addr *a, struct iface **ifa, unsigned *port, int check); void sk_open_unix(struct birdsock *s, char *name); void *tracked_fopen(struct pool *, char *name, char *mode); void test_old_bird(char *path); |