[Gd-chatter] r11026 - in trunk/libraries: layer protocols

[hannes at gwydiondylan.org]

Author: hannes
Date: Tue Dec  5 22:34:17 2006
New Revision: 11026

Added:
   trunk/libraries/protocols/cidr.dylan
      - copied, changed from r11025, trunk/libraries/layer/cidr.dylan
Removed:
   trunk/libraries/layer/cidr.dylan
Modified:
   trunk/libraries/layer/layer.hdp
   trunk/libraries/layer/module.dylan
   trunk/libraries/protocols/protocols-library.dylan
   trunk/libraries/protocols/protocols.hdp
Log:
Bug: 7299
moved cidr to protocols


Modified: trunk/libraries/layer/layer.hdp
==============================================================================
--- trunk/libraries/layer/layer.hdp	(original)
+++ trunk/libraries/layer/layer.hdp	Tue Dec  5 22:34:17 2006
@@ -1,7 +1,6 @@
 Library:          layer
 Files:            library
 	module
-	cidr
 	layer
 	tcp
 	udp
\ No newline at end of file

Modified: trunk/libraries/layer/module.dylan
==============================================================================
--- trunk/libraries/layer/module.dylan	(original)
+++ trunk/libraries/layer/module.dylan	Tue Dec  5 22:34:17 2006
@@ -22,6 +22,7 @@
   use ipv4;
   use ethernet;
   use dns, exclude: { ipv4-address };
+  use cidr;
   // Add binding exports here.
 
   export <ethernet-layer>,
@@ -32,8 +33,6 @@
     <icmp-over-ip-adapter>,
     <arp-handler>,
     register-route,
-    <cidr>,
-    broadcast-address,
     init-arp-handler,
     init-ip-layer,
     decapsulator,

Copied: trunk/libraries/protocols/cidr.dylan (from r11025, trunk/libraries/layer/cidr.dylan)
==============================================================================
--- trunk/libraries/layer/cidr.dylan	(original)
+++ trunk/libraries/protocols/cidr.dylan	Tue Dec  5 22:34:17 2006
@@ -1,8 +1,4 @@
-module: layer
-
-
-define open generic cidr-network-address (cidr :: <cidr>) => (res :: <ipv4-address>);
-define open generic cidr-netmask (cidr :: <cidr>) => (res :: <integer>);
+module: cidr
 
 define class <cidr> (<object>)
   constant slot cidr-network-address :: <ipv4-address>,

Modified: trunk/libraries/protocols/protocols-library.dylan
==============================================================================
--- trunk/libraries/protocols/protocols-library.dylan	(original)
+++ trunk/libraries/protocols/protocols-library.dylan	Tue Dec  5 22:34:17 2006
@@ -12,6 +12,7 @@
     dhcp,
     prism2,
     dns;
+    cidr;
 end;
 
 define module logical-link
@@ -361,4 +362,13 @@
 end;
 
 
+define module cidr
+  use dylan;
+  use ipv4, import: { ipv4-address, <ipv4-address> };
+  use print;
+
+  export <cidr>,
+    cidr-network-address, cidr-netmask,
+    ip-in-cidr?, broadcast-address;
+end;
 

Modified: trunk/libraries/protocols/protocols.hdp
==============================================================================
--- trunk/libraries/protocols/protocols.hdp	(original)
+++ trunk/libraries/protocols/protocols.hdp	Tue Dec  5 22:34:17 2006
@@ -9,3 +9,4 @@
 	ieee80211
 	prism2
 	pcap
+	cidr
\ No newline at end of file