From 31af8299f9ced766090ae050dc7b72fa4c1c9356 Mon Sep 17 00:00:00 2001 From: Tomas 'ZeXx86' Jedrzejek Date: Wed, 13 Aug 2008 13:27:23 +0200 Subject: [PATCH] Fixed ipv6 default address; tunnel broker is by default turned off --- kernel/.config | 2 +- kernel/core/net/if.c | 4 ++-- kernel/core/net/tun6.c | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/kernel/.config b/kernel/.config index 95e7942..bb32263 100644 --- a/kernel/.config +++ b/kernel/.config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # ZeX/OS version: .. -# Wed Aug 13 12:45:18 2008 +# Wed Aug 13 13:25:36 2008 # # diff --git a/kernel/core/net/if.c b/kernel/core/net/if.c index dd03723..792a8e5 100644 --- a/kernel/core/net/if.c +++ b/kernel/core/net/if.c @@ -99,8 +99,8 @@ netif_t *netif_create (struct netdev_t *dev) netif_gw_addr (netif, DEFAULT_GW_ADDRESS); net_ipv6 ipv6; - //NET_IPV6_TO_ADDR (ipv6, 0xfc00, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x10); - NET_IPV6_TO_ADDR (ipv6, 0x2001, 0x470, 0x1f0a, 0x4d3, 0x0, 0x0, 0x0, 0x2); + NET_IPV6_TO_ADDR (ipv6, 0xfc00, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x10); + //NET_IPV6_TO_ADDR (ipv6, 0x2002, 0x470, 0x1f0a, 0x4d3, 0x0, 0x0, 0x0, 0x1); netif_ipv6_addr (netif, ipv6); diff --git a/kernel/core/net/tun6.c b/kernel/core/net/tun6.c index f31ee04..32922a0 100644 --- a/kernel/core/net/tun6.c +++ b/kernel/core/net/tun6.c @@ -116,8 +116,7 @@ unsigned net_proto_tun6_handler (packet_t *packet, proto_ip_t *ip, char *buf, un unsigned init_net_proto_tun6 () { - tun6_addr (DEFAULT_TUN6_ADDRESS); - + tun6_addr (0); return 1; } -- 2.11.4.GIT