Commit a2867cd9 authored by Martin Mareš's avatar Martin Mareš

Better order of includes.

set_inaddr() moved to sysio.h.
parent 12a9d139
......@@ -7,10 +7,25 @@
*/
#ifdef IPV6
#include <linux/in6.h> /* FIXMEv6: glibc variant? */
static inline void
set_inaddr(struct in6_addr *ia, ip_addr a)
{
ipa_hton(a);
memcpy(ia, &a, sizeof(a));
}
#else
static inline void
set_inaddr(struct in_addr *ia, ip_addr a)
{
ipa_hton(a);
memcpy(&ia->s_addr, &a, sizeof(a));
}
/*
* Multicasting in Linux systems is a real mess. Not only different kernels
* have different interfaces, but also different libc's export it in different
......
......@@ -27,6 +27,7 @@
#include "nest/iface.h"
#include "lib/unix.h"
#include "lib/sysio.h"
/*
* Random Numbers
......@@ -379,13 +380,6 @@ sk_new(pool *p)
#ifdef IPV6
static inline void
set_inaddr(struct in6_addr *ia, ip_addr a)
{
ipa_hton(a);
memcpy(ia, &a, sizeof(a));
}
void
fill_in_sockaddr(sockaddr *sa, ip_addr a, unsigned port)
{
......@@ -408,13 +402,6 @@ get_sockaddr(sockaddr *sa, ip_addr *a, unsigned *port)
#else
static inline void
set_inaddr(struct in_addr *ia, ip_addr a)
{
ipa_hton(a);
memcpy(&ia->s_addr, &a, sizeof(a));
}
void
fill_in_sockaddr(sockaddr *sa, ip_addr a, unsigned port)
{
......@@ -436,8 +423,6 @@ get_sockaddr(sockaddr *sa, ip_addr *a, unsigned *port)
#endif
#include "lib/sysio.h"
static char *
sk_setup(sock *s)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment