wok diff busybox/stuff/busybox-1.12.0-iptunnel.u @ rev 4294

firefox-dev: fix version hack (typo)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sat Sep 26 20:38:12 2009 +0200 (2009-09-26)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/busybox/stuff/busybox-1.12.0-iptunnel.u	Sat Sep 26 20:38:12 2009 +0200
     1.3 @@ -0,0 +1,51 @@
     1.4 +--- busybox-1.12.0/networking/libiproute/iptunnel.c
     1.5 ++++ busybox-1.12.0/networking/libiproute/iptunnel.c
     1.6 +@@ -21,7 +21,47 @@
     1.7 + #ifndef __constant_htons
     1.8 + #define __constant_htons htons
     1.9 + #endif
    1.10 +-#include <linux/if_tunnel.h>
    1.11 ++// FYI: #define SIOCDEVPRIVATE 0x89F0
    1.12 ++
    1.13 ++/* From linux/if_tunnel.h. #including it proved troublesome
    1.14 ++ * (redefiniton errors due to name collisions in linux/ and net[inet]/) */
    1.15 ++#define SIOCGETTUNNEL   (SIOCDEVPRIVATE + 0)
    1.16 ++#define SIOCADDTUNNEL   (SIOCDEVPRIVATE + 1)
    1.17 ++#define SIOCDELTUNNEL   (SIOCDEVPRIVATE + 2)
    1.18 ++#define SIOCCHGTUNNEL   (SIOCDEVPRIVATE + 3)
    1.19 ++//#define SIOCGETPRL      (SIOCDEVPRIVATE + 4)
    1.20 ++//#define SIOCADDPRL      (SIOCDEVPRIVATE + 5)
    1.21 ++//#define SIOCDELPRL      (SIOCDEVPRIVATE + 6)
    1.22 ++//#define SIOCCHGPRL      (SIOCDEVPRIVATE + 7)
    1.23 ++#define GRE_CSUM        __constant_htons(0x8000)
    1.24 ++//#define GRE_ROUTING     __constant_htons(0x4000)
    1.25 ++#define GRE_KEY         __constant_htons(0x2000)
    1.26 ++#define GRE_SEQ         __constant_htons(0x1000)
    1.27 ++//#define GRE_STRICT      __constant_htons(0x0800)
    1.28 ++//#define GRE_REC         __constant_htons(0x0700)
    1.29 ++//#define GRE_FLAGS       __constant_htons(0x00F8)
    1.30 ++//#define GRE_VERSION     __constant_htons(0x0007)
    1.31 ++struct ip_tunnel_parm {
    1.32 ++	char            name[IFNAMSIZ];
    1.33 ++	int             link;
    1.34 ++	uint16_t        i_flags;
    1.35 ++	uint16_t        o_flags;
    1.36 ++	uint32_t        i_key;
    1.37 ++	uint32_t        o_key;
    1.38 ++	struct iphdr    iph;
    1.39 ++};
    1.40 ++/* SIT-mode i_flags */
    1.41 ++//#define SIT_ISATAP 0x0001
    1.42 ++//struct ip_tunnel_prl {
    1.43 ++//	uint32_t          addr;
    1.44 ++//	uint16_t          flags;
    1.45 ++//	uint16_t          __reserved;
    1.46 ++//	uint32_t          datalen;
    1.47 ++//	uint32_t          __reserved2;
    1.48 ++//	/* data follows */
    1.49 ++//};
    1.50 ++///* PRL flags */
    1.51 ++//#define PRL_DEFAULT 0x0001
    1.52 + 
    1.53 + #include "ip_common.h"  /* #include "libbb.h" is inside */
    1.54 + #include "rt_names.h"