Skip to content

Commit

Permalink
cleanup renaming of packetizer -> binary-data, and use binary-data as…
Browse files Browse the repository at this point in the history
… external submodule
  • Loading branch information
hannesm committed Dec 17, 2013
1 parent d4667d2 commit 0539ec9
Show file tree
Hide file tree
Showing 45 changed files with 76 additions and 4,007 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[submodule "ext/monday"]
path = ext/monday
url = git://github.com/dylan-lang/monday.git
[submodule "ext/binary-data"]
path = ext/binary-data
url = git://github.com/dylan-lang/binary-data.git
4 changes: 2 additions & 2 deletions dns-server/library.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module: dylan-user
define library dns-server
use common-dylan;
use io;
use packetizer;
use binary-data;
use protocols;
use flow;
use network-flow;
Expand All @@ -19,7 +19,7 @@ define module dns-server
use streams;
use format;
use file-system;
use packetizer;
use binary-data;
use dns;
use ipv4;
use flow;
Expand Down
1 change: 1 addition & 0 deletions ext/binary-data
Submodule binary-data added at b796aa
4 changes: 2 additions & 2 deletions gui-sniffer/library.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ define library gui-sniffer
use system;
use commands;
use environment-commands;
use packetizer;
use binary-data;
use packet-filter;
use flow;
use network-flow;
Expand Down Expand Up @@ -93,7 +93,7 @@ define module gui-sniffer
use date;
use file-system;
use operating-system;
use packetizer, exclude: { hexdump };
use binary-data, exclude: { hexdump };
use packet-filter;
use network-flow;
use flow;
Expand Down
4 changes: 2 additions & 2 deletions id3v2/library.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ define library id3v2
use flow;
use network-flow;
use system;
use packetizer;
use binary-data;

export id3v2;
end;
Expand All @@ -25,7 +25,7 @@ define module id3v2
use flow;
use network-flow;
use command-line-parser;
use packetizer;
use binary-data;

export <id3v2-reader>, <id3v2-tag>;
end;
4 changes: 2 additions & 2 deletions layer/library.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ define library layer
use io;
use network-flow;
use flow;
use packetizer;
use binary-data;
use packet-filter;
use timer;
use network-interfaces;
Expand All @@ -34,7 +34,7 @@ define module layer
use format-out;
use threads;
use network-flow;
use packetizer;
use binary-data;
use packet-filter;
use timer;
use flow;
Expand Down
4 changes: 2 additions & 2 deletions network-flow/library.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ license: see license.txt in this distribution
define library network-flow
use common-dylan;
use flow;
use packetizer;
use binary-data;
use packet-filter;
use io;
use system;
Expand All @@ -23,7 +23,7 @@ define module network-flow
use streams;
use standard-io;
use flow;
use packetizer;
use binary-data;
use packet-filter;
use file-system;
use pcap, import: { packets, <pcap-file-header>, <pcap-packet>, <pcap-file> };
Expand Down
4 changes: 2 additions & 2 deletions network-interfaces/pcap-library-unix.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ define library network-interfaces
use dylan;
use flow;
use network;
use packetizer;
use binary-data;

use protocols, import: { ethernet, ipv4, cidr };

Expand All @@ -34,7 +34,7 @@ define module network-interfaces
use ethernet, import: { <ethernet-frame> };
use ipv4, import: { <ipv4-address> };
use cidr, import: { <cidr>, netmask-from-byte-vector };
use packetizer,
use binary-data,
import: { parse-frame,
<frame>,
assemble-frame,
Expand Down
4 changes: 2 additions & 2 deletions network-interfaces/pcap-library-win32.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ define library network-interfaces
use dylan;
use flow;
use network;
use packetizer;
use binary-data;

use protocols, import: { ethernet, ipv4, cidr };

Expand All @@ -34,7 +34,7 @@ define module network-interfaces
use ethernet, import: { <ethernet-frame> };
use ipv4, import: { <ipv4-address> };
use cidr, import: { <cidr>, netmask-from-byte-vector };
use packetizer,
use binary-data,
import: { parse-frame,
<frame>,
assemble-frame,
Expand Down
4 changes: 2 additions & 2 deletions network-interfaces/raw-interface-library.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ define library network-interfaces
use C-FFI;
use io;
use flow;
use packetizer;
use binary-data;
use protocols, import: { ethernet, prism2, ieee80211 };

export network-interfaces;
Expand All @@ -30,7 +30,7 @@ define module network-interfaces
use C-FFI;
use dylan-direct-c-ffi;
use flow;
use packetizer, import: { parse-frame, assemble-frame, packet };
use binary-data, import: { parse-frame, assemble-frame, packet };
use ethernet, import: { <ethernet-frame> };
use ieee80211, import: { <ieee80211-frame> };
use prism2, import: { <prism2-frame>, <bsd-80211-radio-frame> };
Expand Down
4 changes: 2 additions & 2 deletions network/ip-stack/layers/media-access/802-1q/library.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ license: see license.txt in this distribution
define library ieee802-1q
use common-dylan;
use layer;
use packetizer;
use binary-data;
use protocols;
use flow;
use network-flow;
Expand All @@ -16,7 +16,7 @@ define module ieee802-1q
use common-dylan;
use new-layer;
use ethernet;
use packetizer;
use binary-data;
use flow;
use network-flow;
use socket;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ license: see license.txt in this distribution
define library bridge-group
use common-dylan;
use layer;
use packetizer;
use binary-data;
use protocols;
use flow;
use network-flow;
Expand All @@ -16,7 +16,7 @@ define module bridge-group
use common-dylan;
use new-layer;
use ethernet;
use packetizer;
use binary-data;
use flow;
use network-flow;
use socket;
Expand Down
4 changes: 2 additions & 2 deletions network/ip-stack/layers/media-access/ethernet/library.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ license: see license.txt in this distribution
define library ethernet
use common-dylan;
use layer;
use packetizer;
use binary-data;
use protocols, rename: { ethernet => ethernet-frame };
use flow;
use network-flow;
Expand All @@ -18,7 +18,7 @@ define module ethernet
use common-dylan;
use new-layer;
use ethernet-frame;
use packetizer;
use binary-data;
use flow;
use network-flow;
use socket;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ license: see license.txt in this distribution
define library ppp-over-ethernet
use common-dylan;
use layer;
use packetizer;
use binary-data;
use protocols;
use flow;
use network-flow;
Expand All @@ -18,7 +18,7 @@ define module ppp-over-ethernet
use common-dylan;
use new-layer;
use pppoe, rename: { session-id => pppoe-session-id };
use packetizer;
use binary-data;
use ethernet, import: { mac-address };
use flow;
use network-flow;
Expand Down
4 changes: 2 additions & 2 deletions network/ip-stack/layers/network/arp/library.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ define library arp
use io;
use system;
use layer;
use packetizer;
use binary-data;
use protocols, rename: { ethernet => protocols-ethernet };
use flow;
use network-flow;
Expand All @@ -27,7 +27,7 @@ define module arp
use new-layer;
use ipv4;
use cidr;
use packetizer;
use binary-data;
use flow;
use network-flow;
use socket;
Expand Down
4 changes: 2 additions & 2 deletions network/ip-stack/layers/network/ip-adapter/library.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ define library ip-adapter
use common-dylan;
use io;
use layer;
use packetizer;
use binary-data;
use protocols;
use flow;
use network-flow;
Expand All @@ -21,7 +21,7 @@ define module ip-adapter
use new-layer;
use ipv4;
use cidr;
use packetizer;
use binary-data;
use flow;
use network-flow;
use socket;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ define library ip-over-ethernet
use common-dylan;
use io;
use layer;
use packetizer;
use binary-data;
use protocols;
use flow;
use network-flow;
Expand All @@ -22,7 +22,7 @@ define module ip-over-ethernet
use new-layer;
use ipv4;
use cidr;
use packetizer;
use binary-data;
use flow;
use network-flow;
use socket;
Expand Down
4 changes: 2 additions & 2 deletions network/ip-stack/layers/network/ip/library.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ define library ip
use common-dylan;
use io;
use layer;
use packetizer;
use binary-data;
use protocols;
use flow;
use network-flow;
Expand All @@ -22,7 +22,7 @@ define module ip
use new-layer;
use print;
use ipv4;
use packetizer;
use binary-data;
use flow;
use network-flow;
use socket;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ define library pcap-live-interface
use flow;
use network-flow;
use network;
use packetizer;
use binary-data;
use protocols, import: { ethernet, prism2, ieee80211 };
end;

Expand All @@ -38,7 +38,7 @@ define module pcap-live-interface
use dylan-direct-c-ffi;
use flow;
use network-flow;
use packetizer, import: { parse-frame, assemble-frame, packet };
use binary-data, import: { parse-frame, assemble-frame, packet };
use ethernet, import: { <ethernet-frame> };
use ieee80211, import: { <ieee80211-frame> };
use prism2, import: { <prism2-frame>, <bsd-80211-radio-frame> };
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ define library pcap-live-interface
use flow;
use network-flow;
use network;
use packetizer;
use binary-data;
use protocols, import: { ethernet, ipv4, cidr };
end;

Expand All @@ -39,7 +39,7 @@ define module pcap-live-interface
use ethernet, import: { <ethernet-frame> };
use ipv4, import: { <ipv4-address> };
use cidr, import: { <cidr>, netmask-from-byte-vector };
use packetizer,
use binary-data,
import: { parse-frame,
<frame>,
assemble-frame!,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ define library pcap-live-interface
use flow;
use network-flow;
use network;
use packetizer;
use binary-data;
use protocols, import: { ethernet, ipv4, cidr };
end;

Expand All @@ -39,7 +39,7 @@ define module pcap-live-interface
use ethernet, import: { <ethernet-frame> };
use ipv4, import: { <ipv4-address> };
use cidr, import: { <cidr>, netmask-from-byte-vector };
use packetizer,
use binary-data,
import: { parse-frame,
<frame>,
assemble-frame!,
Expand Down
4 changes: 2 additions & 2 deletions packet-filter/library.dylan
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ define library packet-filter
use simple-parser;
use regular;

use packetizer;
use binary-data;

export packet-filter;
end library packet-filter;
Expand All @@ -30,7 +30,7 @@ define module packet-filter
use source-location-rangemap;
use grammar;
use simple-lexical-scanner;
use packetizer;
use binary-data;

export
<filter-expression>,
Expand Down
Loading

0 comments on commit 0539ec9

Please sign in to comment.