print fix, network fixes in lua code (was typo). Still doesn't work though

diff --git a/host2str.c b/host2str.c
index 9570e6a140cbc8dbd3895a4cb7040e0833733038..0641b32fddf88e83404e0cfbc4cbef0bd071a808 100644 (file)
--- a/host2str.c
+++ b/host2str.c
@@ -879,7 +879,7 @@ ldns_pktheader2buffer_str(ldns_buffer *output, ldns_pkt *pkt)
        } else {
                ldns_buffer_printf(output, "rcode: ?? (%u), ", ldns_pkt_rcode(pkt));
        }
-       ldns_buffer_printf(output, "id %d\n", ldns_pkt_id(pkt));
+       ldns_buffer_printf(output, "id: %d\n", ldns_pkt_id(pkt));
        ldns_buffer_printf(output, ";; flags: ");
 
        if (ldns_pkt_qr(pkt)) {

diff --git a/lua/lua-rns.c b/lua/lua-rns.c
index 050b47d59dc6fccbeecb82cc7c43cf05798f10ca..f2c74e5e5907c10730b2c9c93672e7a983dfa3a3 100644 (file)
--- a/lua/lua-rns.c
+++ b/lua/lua-rns.c
@@ -283,8 +283,8 @@ l_write_wire_udp(lua_State *L)
 {
        int sockfd = (int)lua_tonumber(L, 1);
        ldns_buffer *pktbuf = (ldns_buffer*) lua_touserdata(L, 2);
-       ldns_rdf *rdf_to = (ldns_rdf*)lua_touserdata(L, 2);
-       uint16_t port = (uint16_t)lua_tonumber(L, 3); /* port number */
+       ldns_rdf *rdf_to = (ldns_rdf*)lua_touserdata(L, 3);
+       uint16_t port = (uint16_t)lua_tonumber(L, 4); /* port number */
 
        struct sockaddr_storage *to;
        size_t socklen;
@@ -314,7 +314,7 @@ l_read_wire_udp(lua_State *L)
        ldns_pkt *pkt;
        ldns_buffer *pktbuf;
 
-       pktbuf = ldns_buffer_new(100); /* this /should/ happen in buf_new_frm_data */
+       pktbuf = ldns_buffer_new(LDNS_MIN_BUFLEN); /* this /should/ happen in buf_new_frm_data */
        
        if (!pktbuf_raw) {
                return 0;
@@ -406,14 +406,11 @@ l_pkt2buf(lua_State *L)
        }
 
        /* resize! XXX */
-       b = ldns_buffer_new(LDNS_MAX_PACKETLEN);
+       b = ldns_buffer_new(LDNS_MIN_BUFLEN);
 
        if (ldns_pkt2buffer_wire(b, p) != LDNS_STATUS_OK) {
                return 0;
        }
-       /* resize to current usage */
-       ldns_buffer_reserve(b, (size_t)
-                       ldns_buffer_position(b));
        lua_pushlightuserdata(L, b);
        return 1;
 }

diff --git a/lua/rns.lua b/lua/rns.lua
index a5583e17e96a96bec14f69535912f59eddce6c11..cc354ec77074440350a3020d27ece2bf99cdd814 100644 (file)
--- a/lua/rns.lua
+++ b/lua/rns.lua
@@ -38,11 +38,13 @@ if wirebuf == nil then
 else
        -- somebody is listening
        wirepkt = l_buf2pkt(wirebuf)
-       lua_debug("receveid from the interface")
+       lua_debug("received from the interface")
        l_pkt_print(wirepkt)
 
        wirebuf2 = l_pkt2buf(pkt)
-       l_write_wire_udp(socket, wirebuf2, rdf_ip, 5353);
+       bytes = l_write_wire_udp(socket, wirebuf2, rdf_ip, 5353);
+       print("wrote bytes", bytes)
+       l_pkt_print(pkt)
        
 end
 

diff --git a/rdata.c b/rdata.c
index e567420d90bed5e0c50433e97619654da7c81c87..355ef8f0e40eab044996c8e3f239ce94dbe035cf 100644 (file)
--- a/rdata.c
+++ b/rdata.c
@@ -128,7 +128,6 @@ ldns_rdf2native_sockaddr_storage(ldns_rdf *rd, uint16_t port, size_t *size)
        if (!data) {
                return NULL;
        }
-
        if (port == 0) {
                port =  LDNS_PORT;
        }