Add cnid.lua to distribution, fix bug #3404322

diff --git a/configure.in b/configure.in
index e64a0e6f3f707f1bf13eaecd3de7c7243dc8a251..e9facb2f13686ed6de9544c19b58a1f74977cd0c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1322,6 +1322,7 @@ AC_OUTPUT([Makefile
        contrib/Makefile
        contrib/macusers/Makefile
        contrib/macusers/macusers
+       contrib/misc/Makefile
        contrib/printing/Makefile
        contrib/shell_utils/Makefile
        contrib/shell_utils/apple_dump

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 5652b1bb74d2ad283927a2c398cc40cba3b43da9..0d2f10741ae95fa8f208fba46270e6fbe7013fcb 100644 (file)
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,6 +1,6 @@
 # Makefile.am for contrib/
 
-SUBDIRS = macusers shell_utils
+SUBDIRS = macusers misc shell_utils
 
 if COMPILE_TIMELORD
 SUBDIRS += timelord

diff --git a/contrib/misc/Makefile.am b/contrib/misc/Makefile.am
new file mode 100644 (file)
index 0000000..d25d876
--- /dev/null
+++ b/contrib/misc/Makefile.am
@@ -0,0 +1,3 @@
+# Makefile for contrib/misc/
+
+EXTRA_DIST = cnid.lua

diff --git a/contrib/misc/cnid.lua b/contrib/misc/cnid.lua
new file mode 100644 (file)
index 0000000..3b21723
--- /dev/null
+++ b/contrib/misc/cnid.lua
@@ -0,0 +1,123 @@
+-- 
+-- Netatalk DBD protocol 
+-- wireshark -X lua_script:cnid.lua
+-- don't forget to comment out the line disable_lua = true; do return end;
+-- in /etc/wireshark/init.lua
+
+-- global environment
+local b = _G
+
+-- declare our protocol
+local dbd_proto = Proto("dbd","Netatalk Dbd Wire Protocol")
+
+local cmd = ProtoField.uint32("dbd.cmd", "Request") -- , base.HEX
+local len = ProtoField.uint32("dbd.name.len", "Name Length")
+local filename = ProtoField.string("dbd.name", "Name")
+local error = ProtoField.uint32("dbd.error", "Error code")
+local cnid = ProtoField.uint32("dbd.cnid", "Cnid")
+local did  = ProtoField.uint32("dbd.did", "Parent Directory Id")
+local dev  = ProtoField.uint64("dbd.dev", "Device number")
+local ino  = ProtoField.uint64("dbd.ino", "Inode number")
+local type = ProtoField.uint32("dbd.type", "File type")
+
+dbd_proto.fields = {cmd, error, cnid, did, dev, ino, type, filename, len}
+
+--- Request list
+local Cmd = { [3] = "add", 
+             [4] = "get", 
+             [5] = "resolve", 
+             [6] = "lookup", 
+             [7] = "update", 
+             [8] = "delete", 
+             [11] = "timestamp" 
+           }
+
+--- display a filename 
+local function fname(buffer, pinfo, tree, len, ofs)
+
+    pinfo.cols.info:append(" Name=" .. buffer(ofs +4, len):string())
+
+    local subtree = tree:add(buffer(ofs, len +4), buffer(ofs +4, len):string())
+    subtree:add(filename, buffer(ofs +4, len))
+
+    return subtree
+end
+
+-- create a function to dissect it
+function dbd_proto.dissector(buffer, pinfo, tree)
+
+
+    pinfo.cols.protocol = "DBD"
+
+    local subtree = tree:add(dbd_proto,buffer(),"Netatalk DBD Wire Protocol")
+
+    if pinfo.dst_port == 4700 then
+           pinfo.cols.info = "Query"
+           local val = buffer(0,4):uint()
+           local item = subtree:add(cmd, buffer(0,4))
+           if Cmd[val] then
+               item:append_text(" (" .. Cmd[val] .. ")")
+               pinfo.cols.info = Cmd[val]
+
+               local val = buffer(4,4):uint()
+               if val ~= 0 then
+                       pinfo.cols.info:append(" Cnid=" .. val)
+               end
+               subtree:add(cnid, buffer(4, 4))
+               subtree:add(dev, buffer(8, 8))
+               subtree:add(ino, buffer(16, 8))
+               subtree:add(type, buffer(24, 4))
+
+               local val = buffer(28,4):uint()
+               if val ~= 0 then
+                  pinfo.cols.info:append(" Did=" .. val)
+               end
+               subtree:add(did, buffer(28, 4))
+
+               local val = buffer(36,4):uint()
+               if val ~= 0 then
+                  item = fname(buffer, pinfo, subtree, val, 36)
+                  item:add(len, buffer(36, 4))
+                       
+               end
+           end
+    else
+           pinfo.cols.info = "Reply"
+
+           local rply = {}
+           
+           local val = buffer(0,4):uint()
+           rply.error = val
+           subtree:add(error, buffer(0,4))
+           if val ~= 0 then
+               pinfo.cols.info:append(" Error=" .. val)
+           end
+
+           val = buffer(4,4):uint()
+           rply.cnid = val
+           subtree:add(cnid, buffer(4,4))
+           if val ~= 0 then
+               pinfo.cols.info:append(" Cnid=" .. val)
+           end
+
+           val = buffer(8,4):uint()
+           rply.did = val
+           subtree:add(did, buffer(8,4))
+           if val ~= 0 then
+               pinfo.cols.info:append(" Did=" .. val)
+           end
+
+           val = buffer(16,4):uint()
+           rply.len = val
+           
+           if rply.error == 0 and rply.did ~= 0 then
+              subtree = fname(buffer, pinfo, subtree, val, 16)
+              subtree:add(len, buffer(16,4))
+           end
+    end
+end
+
+-- load the tcp.port table
+local tcp_table = DissectorTable.get("tcp.port")
+-- register our protocol 
+tcp_table:add(4700, dbd_proto)

diff --git a/contrib/wireshark/cnid.lua b/contrib/wireshark/cnid.lua
deleted file mode 100644 (file)
index 3b21723..0000000
--- a/contrib/wireshark/cnid.lua
+++ /dev/null
@@ -1,123 +0,0 @@
--- 
--- Netatalk DBD protocol 
--- wireshark -X lua_script:cnid.lua
--- don't forget to comment out the line disable_lua = true; do return end;
--- in /etc/wireshark/init.lua
-
--- global environment
-local b = _G
-
--- declare our protocol
-local dbd_proto = Proto("dbd","Netatalk Dbd Wire Protocol")
-
-local cmd = ProtoField.uint32("dbd.cmd", "Request") -- , base.HEX
-local len = ProtoField.uint32("dbd.name.len", "Name Length")
-local filename = ProtoField.string("dbd.name", "Name")
-local error = ProtoField.uint32("dbd.error", "Error code")
-local cnid = ProtoField.uint32("dbd.cnid", "Cnid")
-local did  = ProtoField.uint32("dbd.did", "Parent Directory Id")
-local dev  = ProtoField.uint64("dbd.dev", "Device number")
-local ino  = ProtoField.uint64("dbd.ino", "Inode number")
-local type = ProtoField.uint32("dbd.type", "File type")
-
-dbd_proto.fields = {cmd, error, cnid, did, dev, ino, type, filename, len}
-
---- Request list
-local Cmd = { [3] = "add", 
-             [4] = "get", 
-             [5] = "resolve", 
-             [6] = "lookup", 
-             [7] = "update", 
-             [8] = "delete", 
-             [11] = "timestamp" 
-           }
-
---- display a filename 
-local function fname(buffer, pinfo, tree, len, ofs)
-
-    pinfo.cols.info:append(" Name=" .. buffer(ofs +4, len):string())
-
-    local subtree = tree:add(buffer(ofs, len +4), buffer(ofs +4, len):string())
-    subtree:add(filename, buffer(ofs +4, len))
-
-    return subtree
-end
-
--- create a function to dissect it
-function dbd_proto.dissector(buffer, pinfo, tree)
-
-
-    pinfo.cols.protocol = "DBD"
-
-    local subtree = tree:add(dbd_proto,buffer(),"Netatalk DBD Wire Protocol")
-
-    if pinfo.dst_port == 4700 then
-           pinfo.cols.info = "Query"
-           local val = buffer(0,4):uint()
-           local item = subtree:add(cmd, buffer(0,4))
-           if Cmd[val] then
-               item:append_text(" (" .. Cmd[val] .. ")")
-               pinfo.cols.info = Cmd[val]
-
-               local val = buffer(4,4):uint()
-               if val ~= 0 then
-                       pinfo.cols.info:append(" Cnid=" .. val)
-               end
-               subtree:add(cnid, buffer(4, 4))
-               subtree:add(dev, buffer(8, 8))
-               subtree:add(ino, buffer(16, 8))
-               subtree:add(type, buffer(24, 4))
-
-               local val = buffer(28,4):uint()
-               if val ~= 0 then
-                  pinfo.cols.info:append(" Did=" .. val)
-               end
-               subtree:add(did, buffer(28, 4))
-
-               local val = buffer(36,4):uint()
-               if val ~= 0 then
-                  item = fname(buffer, pinfo, subtree, val, 36)
-                  item:add(len, buffer(36, 4))
-                       
-               end
-           end
-    else
-           pinfo.cols.info = "Reply"
-
-           local rply = {}
-           
-           local val = buffer(0,4):uint()
-           rply.error = val
-           subtree:add(error, buffer(0,4))
-           if val ~= 0 then
-               pinfo.cols.info:append(" Error=" .. val)
-           end
-
-           val = buffer(4,4):uint()
-           rply.cnid = val
-           subtree:add(cnid, buffer(4,4))
-           if val ~= 0 then
-               pinfo.cols.info:append(" Cnid=" .. val)
-           end
-
-           val = buffer(8,4):uint()
-           rply.did = val
-           subtree:add(did, buffer(8,4))
-           if val ~= 0 then
-               pinfo.cols.info:append(" Did=" .. val)
-           end
-
-           val = buffer(16,4):uint()
-           rply.len = val
-           
-           if rply.error == 0 and rply.did ~= 0 then
-              subtree = fname(buffer, pinfo, subtree, val, 16)
-              subtree:add(len, buffer(16,4))
-           end
-    end
-end
-
--- load the tcp.port table
-local tcp_table = DissectorTable.get("tcp.port")
--- register our protocol 
-tcp_table:add(4700, dbd_proto)