Fix IP address serialization, and quick format to header decls

diff --git a/src/rtr/primitive_writer.c b/src/rtr/primitive_writer.c
index 31c8490cb2e97c64096babaf8a01723bbf9ad429..0252de42083013834263dde92178cf44359dfa24 100644 (file)
--- a/src/rtr/primitive_writer.c
+++ b/src/rtr/primitive_writer.c
@@ -30,14 +30,14 @@ write_int32(char *buf, u_int32_t value)
 char *
 write_in_addr(char *buf, struct in_addr value)
 {
-       return write_int32(buf, value.s_addr);
+       return write_int32(buf, ntohl(value.s_addr));
 }
 
 char *
 write_in6_addr(char *buf, struct in6_addr value)
 {
-       buf = write_int32(buf, value.s6_addr32[0]);
-       buf = write_int32(buf, value.s6_addr32[1]);
-       buf = write_int32(buf, value.s6_addr32[2]);
-       return write_int32(buf, value.s6_addr32[3]);
+       buf = write_int32(buf, ntohl(value.s6_addr32[3]));
+       buf = write_int32(buf, ntohl(value.s6_addr32[2]));
+       buf = write_int32(buf, ntohl(value.s6_addr32[1]));
+       return write_int32(buf, ntohl(value.s6_addr32[0]));
 }

diff --git a/src/rtr/primitive_writer.h b/src/rtr/primitive_writer.h
index 7a12251f33c96930d2b85296cdde59181bd8c8f3..1ecb1c7c3741549a55f59c176a7b4671a2890091 100644 (file)
--- a/src/rtr/primitive_writer.h
+++ b/src/rtr/primitive_writer.h
@@ -1,14 +1,14 @@
 #ifndef RTR_PRIMITIVE_WRITER_H_
 #define RTR_PRIMITIVE_WRITER_H_
 
-#include <netinet/ip.h>
+#include <netinet/in.h>
 
 __BEGIN_DECLS
-char * write_int8(char *, u_int8_t);
-char * write_int16(char *, u_int16_t);
-char * write_int32(char *, u_int32_t);
-char * write_in_addr(char *, struct in_addr);
-char * write_in6_addr(char *, struct in6_addr);
+char *write_int8(char *, u_int8_t);
+char *write_int16(char *, u_int16_t);
+char *write_int32(char *, u_int32_t);
+char *write_in_addr(char *, struct in_addr);
+char *write_in6_addr(char *, struct in6_addr);
 __END_DECLS
 
 #endif /* RTR_PRIMITIVE_WRITER_H_ */