From eae058561c5ff1e818a1778782858753b214f3a1 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Wed, 15 Oct 2003 15:21:43 +0000 Subject: move keyid into RoutingForward --- src/org/noreply/fancydress/type3/routing/RoutingIP4.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'src/org/noreply/fancydress/type3/routing/RoutingIP4.java') diff --git a/src/org/noreply/fancydress/type3/routing/RoutingIP4.java b/src/org/noreply/fancydress/type3/routing/RoutingIP4.java index 08e1ce1..e0527a0 100644 --- a/src/org/noreply/fancydress/type3/routing/RoutingIP4.java +++ b/src/org/noreply/fancydress/type3/routing/RoutingIP4.java @@ -23,10 +23,6 @@ public class RoutingIP4 extends RoutingForward { * Port at which the Type III server is listening */ private int port; - /** - * Keyid of the next hop's Packet Key - */ - private byte[] keyid; /** * Constructor that creates the routing as either FWD/IP4 or SWAP-FWD/IP4 @@ -37,7 +33,7 @@ public class RoutingIP4 extends RoutingForward { * @param boolean if true, have a SWAP-FWD/IP4 routing type, FWD/IP4 otherwhise */ private RoutingIP4(InetAddress ip, int port, byte[] keyid, boolean asSwap) { - super (asSwap ? RoutingType.SWAP_FWD_IP4 : RoutingType.FWD_IP4); + super (asSwap ? RoutingType.SWAP_FWD_IP4 : RoutingType.FWD_IP4, keyid); if (keyid.length != CryptoPrimitives.HASH_LEN) throw new Error("keyid must be HASH_LEN bytes long."); @@ -46,7 +42,6 @@ public class RoutingIP4 extends RoutingForward { this.ip = ip; this.port = port; - this.keyid = keyid; } /** -- cgit v1.2.3