Raw: refactor attribute encoding and decoding

[ngadmin] / raw / src / net.c

diff --git a/raw/src/net.c b/raw/src/net.c
index e5af939c39d72f89bd4aa91b2a7201f825dac7c7..83a69f3c9ad68a4f9405676e7798354a6de4b20e 100644 (file)
--- a/raw/src/net.c
+++ b/raw/src/net.c
@@ -8,7 +8,7 @@
 #include <poll.h>
 
 #include <nsdp/net.h>
-#include <nsdp/encoding.h>
+#include <nsdp/packet.h>
 
 
 static inline void timespec_add (struct timespec *tsa, const struct timespec *tsb)
@@ -57,7 +57,7 @@ int sendNsdpPacket (int sock, const struct nsdp_cmd *nc, const List *attr)
        initNsdpPacket(&np);
        initNsdpHeader(np.nh, nc);
        
-       ret = addPacketAttributes(&np, attr, nc->ports);
+       ret = addPacketAttributes(&np, attr);
        if (ret < 0)
                return ret;
        
@@ -139,7 +139,7 @@ int recvNsdpPacket (int sock, struct nsdp_cmd *nc, List *attr, const struct time
                    (nc->remote_addr.sin_port != 0 && remote.sin_port != nc->remote_addr.sin_port) ||
                    len < (int)sizeof(struct nsdp_header) ||
                    !extractNsdpHeader(np.nh, nc) ||
-                   extractPacketAttributes(&np, attr, nc->ports) < 0)
+                   extractPacketAttributes(&np, attr) < 0)
                        continue;
                
                nc->remote_addr = remote;