Raw: expose encoding functions

diff --git a/raw/include/nsdp/Makefile.am b/raw/include/nsdp/Makefile.am
index c2c9d40cf9f464211cd66d29444dccc7bb9d7e4b..ccce647fefac17aca8f89c8647c3d3d54a5f3217 100644 (file)
--- a/raw/include/nsdp/Makefile.am
+++ b/raw/include/nsdp/Makefile.am
@@ -1,3 +1,3 @@
 
-noinst_HEADERS = attr.h list.h misc.h net.h protocol.h
+noinst_HEADERS = attr.h encoding.h list.h misc.h net.h protocol.h
 

diff --git a/raw/include/nsdp/encoding.h b/raw/include/nsdp/encoding.h
new file mode 100644 (file)
index 0000000..27ec812
--- /dev/null
+++ b/raw/include/nsdp/encoding.h
@@ -0,0 +1,51 @@
+
+#ifndef DEF_ENCODING
+#define DEF_ENCODING
+
+
+#include <stdbool.h>
+
+#include <netinet/ether.h>
+
+#include <nsdp/protocol.h>
+#include <nsdp/net.h>
+#include <nsdp/list.h>
+
+
+struct nsdp_packet {
+       union {
+               unsigned char *buffer;
+               struct nsdp_header *nh;
+       };
+       int maxlen;
+       struct attr_header *ah;
+};
+
+
+
+void initNsdpHeader (struct nsdp_header *nh, const struct nsdp_cmd *nc);
+
+
+bool extractNsdpHeader (const struct nsdp_header *nh, struct nsdp_cmd *nc);
+
+
+static inline void initNsdpPacket (struct nsdp_packet *np)
+{
+       np->ah = (struct attr_header*)np->nh->data;
+}
+
+
+static inline int getPacketTotalSize (const struct nsdp_packet *np)
+{
+       return ((unsigned char*)np->ah) - np->buffer;
+}
+
+
+int addPacketAttributes (struct nsdp_packet *np, const List* attr, unsigned char ports);
+
+
+int extractPacketAttributes (struct nsdp_packet *np, List *attr, unsigned char ports);
+
+
+#endif
+

diff --git a/raw/src/Makefile.am b/raw/src/Makefile.am
index b0ca5db32196de11cb4f69aa33c5e8e863eace66..cc047c9a7c7ae67875c2390c7a0a8281cef48ed4 100644 (file)
--- a/raw/src/Makefile.am
+++ b/raw/src/Makefile.am
@@ -1,5 +1,6 @@
 
 noinst_LTLIBRARIES = librawnsdp.la
+noinst_HEADERS = encoding_attr.h
 
 librawnsdp_la_SOURCES = attr.c encoding.c encoding_attr.c list.c misc.c net.c
 librawnsdp_la_CPPFLAGS = -I$(top_srcdir)/raw/include/ -I$(top_srcdir)/lib/include/

diff --git a/raw/src/encoding.c b/raw/src/encoding.c
index a21c3729f915a0f5483be477594f75228dc8e441..0d8e889977711b5b1534bfb83fc1267941e27847 100644 (file)
--- a/raw/src/encoding.c
+++ b/raw/src/encoding.c
@@ -3,7 +3,7 @@
 #include <errno.h>
 
 #include <nsdp/attr.h>
-#include "encoding.h"
+#include <nsdp/encoding.h>
 #include "encoding_attr.h"
 
 

diff --git a/raw/src/encoding.h b/raw/src/encoding.h
deleted file mode 100644 (file)
index 27ec812..0000000
--- a/raw/src/encoding.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-#ifndef DEF_ENCODING
-#define DEF_ENCODING
-
-
-#include <stdbool.h>
-
-#include <netinet/ether.h>
-
-#include <nsdp/protocol.h>
-#include <nsdp/net.h>
-#include <nsdp/list.h>
-
-
-struct nsdp_packet {
-       union {
-               unsigned char *buffer;
-               struct nsdp_header *nh;
-       };
-       int maxlen;
-       struct attr_header *ah;
-};
-
-
-
-void initNsdpHeader (struct nsdp_header *nh, const struct nsdp_cmd *nc);
-
-
-bool extractNsdpHeader (const struct nsdp_header *nh, struct nsdp_cmd *nc);
-
-
-static inline void initNsdpPacket (struct nsdp_packet *np)
-{
-       np->ah = (struct attr_header*)np->nh->data;
-}
-
-
-static inline int getPacketTotalSize (const struct nsdp_packet *np)
-{
-       return ((unsigned char*)np->ah) - np->buffer;
-}
-
-
-int addPacketAttributes (struct nsdp_packet *np, const List* attr, unsigned char ports);
-
-
-int extractPacketAttributes (struct nsdp_packet *np, List *attr, unsigned char ports);
-
-
-#endif
-

diff --git a/raw/src/net.c b/raw/src/net.c
index c94f4ebd0b6e5127a243903313bdcca4cf68a01b..e5af939c39d72f89bd4aa91b2a7201f825dac7c7 100644 (file)
--- a/raw/src/net.c
+++ b/raw/src/net.c
@@ -8,7 +8,7 @@
 #include <poll.h>
 
 #include <nsdp/net.h>
-#include "encoding.h"
+#include <nsdp/encoding.h>
 
 
 static inline void timespec_add (struct timespec *tsa, const struct timespec *tsb)