This commit integrates the upstream version of the linux-atm tools version 2.5.1. It simplify the patchset but keeps the debian-patches, prevent the usage of libflex on the target, and let the package compiles every tools. The Makefile only installs atmarp & atmarpd, but some useful debug programs are also included (like aread/awrite, atmdump,...) in the makefile, but commented by default. Signed-off-by: Obinou <obconseil@gmail.com> SVN-Revision: 20216master
Travis Kemen
15 years ago
parent
80d6e3b245
commit
6457d34586
File diff suppressed because it is too large
Load Diff
@ -1,162 +0,0 @@ |
||||
Index: linux-atm-2.4.1/configure.in
|
||||
===================================================================
|
||||
--- linux-atm-2.4.1.orig/configure.in 2007-10-20 19:19:10.594232210 +0200
|
||||
+++ linux-atm-2.4.1/configure.in 2007-10-20 19:19:16.214552491 +0200
|
||||
@@ -153,26 +153,5 @@
|
||||
src/Makefile \
|
||||
src/include/Makefile \
|
||||
src/lib/Makefile \
|
||||
- src/test/Makefile \
|
||||
- src/debug/Makefile \
|
||||
- src/qgen/Makefile \
|
||||
- src/saal/Makefile \
|
||||
- src/sigd/Makefile \
|
||||
- src/maint/Makefile \
|
||||
- src/arpd/Makefile \
|
||||
- src/ilmid/Makefile \
|
||||
- src/ilmid/asn1/Makefile \
|
||||
- src/man/Makefile \
|
||||
- src/led/Makefile \
|
||||
- src/lane/Makefile \
|
||||
- src/mpoad/Makefile \
|
||||
- src/switch/Makefile \
|
||||
- src/switch/debug/Makefile \
|
||||
- src/switch/tcp/Makefile \
|
||||
- src/config/Makefile \
|
||||
- src/config/init-redhat/Makefile \
|
||||
- src/extra/Makefile \
|
||||
- src/extra/linux-atm.spec \
|
||||
- src/extra/ANS/Makefile
|
||||
)
|
||||
|
||||
Index: linux-atm-2.4.1/src/Makefile.am
|
||||
===================================================================
|
||||
--- linux-atm-2.4.1.orig/src/Makefile.am 2007-10-20 19:19:10.602232664 +0200
|
||||
+++ linux-atm-2.4.1/src/Makefile.am 2007-10-20 19:19:16.218552720 +0200
|
||||
@@ -1,3 +1,2 @@
|
||||
-SUBDIRS = include lib test debug qgen saal sigd maint arpd ilmid man led lane \
|
||||
- mpoad switch config extra
|
||||
+SUBDIRS = include lib
|
||||
|
||||
Index: linux-atm-2.4.1/src/include/linux/atmbr2684.h
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ linux-atm-2.4.1/src/include/linux/atmbr2684.h 2007-10-20 19:19:16.230553402 +0200
|
||||
@@ -0,0 +1,117 @@
|
||||
+#ifndef _LINUX_ATMBR2684_H
|
||||
+#define _LINUX_ATMBR2684_H
|
||||
+
|
||||
+#include <linux/atm.h>
|
||||
+#include <linux/if.h> /* For IFNAMSIZ */
|
||||
+#include <linux/if_ether.h> /* ETH_P_* */
|
||||
+
|
||||
+/*
|
||||
+ * Type of media we're bridging (ethernet, token ring, etc) Currently only
|
||||
+ * ethernet is supported
|
||||
+ */
|
||||
+#define BR2684_MEDIA_ETHERNET (0) /* 802.3 */
|
||||
+#define BR2684_MEDIA_802_4 (1) /* 802.4 */
|
||||
+#define BR2684_MEDIA_TR (2) /* 802.5 - token ring */
|
||||
+#define BR2684_MEDIA_FDDI (3)
|
||||
+#define BR2684_MEDIA_802_6 (4) /* 802.6 */
|
||||
+
|
||||
+/*
|
||||
+ * Is there FCS inbound on this VC? This currently isn't supported.
|
||||
+ */
|
||||
+#define BR2684_FCSIN_NO (0)
|
||||
+#define BR2684_FCSIN_IGNORE (1)
|
||||
+#define BR2684_FCSIN_VERIFY (2)
|
||||
+
|
||||
+/*
|
||||
+ * Is there FCS outbound on this VC? This currently isn't supported.
|
||||
+ */
|
||||
+#define BR2684_FCSOUT_NO (0)
|
||||
+#define BR2684_FCSOUT_SENDZERO (1)
|
||||
+#define BR2684_FCSOUT_GENERATE (2)
|
||||
+
|
||||
+/*
|
||||
+ * Does this VC include LLC encapsulation?
|
||||
+ */
|
||||
+#define BR2684_ENCAPS_VC (0) /* VC-mux */
|
||||
+#define BR2684_ENCAPS_LLC (1)
|
||||
+#define BR2684_ENCAPS_AUTODETECT (2) /* Unsuported */
|
||||
+
|
||||
+/*
|
||||
+ * Is this VC bridged or routed?
|
||||
+ */
|
||||
+
|
||||
+#define BR2684_PAYLOAD_ROUTED (0)
|
||||
+#define BR2684_PAYLOAD_BRIDGED (1)
|
||||
+
|
||||
+
|
||||
+/*
|
||||
+ * This is for the ATM_NEWBACKENDIF call - these are like socket families:
|
||||
+ * the first element of the structure is the backend number and the rest
|
||||
+ * is per-backend specific
|
||||
+ */
|
||||
+struct atm_newif_br2684 {
|
||||
+ atm_backend_t backend_num; /* ATM_BACKEND_BR2684 */
|
||||
+ int media; /* BR2684_MEDIA_* */
|
||||
+ char ifname[IFNAMSIZ];
|
||||
+ int mtu;
|
||||
+ int payload; /* bridged or routed */
|
||||
+};
|
||||
+
|
||||
+/*
|
||||
+ * This structure is used to specify a br2684 interface - either by a
|
||||
+ * positive integer (returned by ATM_NEWBACKENDIF) or the interfaces name
|
||||
+ */
|
||||
+#define BR2684_FIND_BYNOTHING (0)
|
||||
+#define BR2684_FIND_BYNUM (1)
|
||||
+#define BR2684_FIND_BYIFNAME (2)
|
||||
+struct br2684_if_spec {
|
||||
+ int method; /* BR2684_FIND_* */
|
||||
+ union {
|
||||
+ char ifname[IFNAMSIZ];
|
||||
+ int devnum;
|
||||
+ } spec;
|
||||
+};
|
||||
+
|
||||
+/*
|
||||
+ * This is for the ATM_SETBACKEND call - these are like socket families:
|
||||
+ * the first element of the structure is the backend number and the rest
|
||||
+ * is per-backend specific
|
||||
+ */
|
||||
+struct atm_backend_br2684 {
|
||||
+ atm_backend_t backend_num; /* ATM_BACKEND_BR2684 */
|
||||
+ struct br2684_if_spec ifspec;
|
||||
+ int fcs_in; /* BR2684_FCSIN_* */
|
||||
+ int fcs_out; /* BR2684_FCSOUT_* */
|
||||
+ int fcs_auto; /* 1: fcs_{in,out} disabled if no FCS rx'ed */
|
||||
+ int encaps; /* BR2684_ENCAPS_* */
|
||||
+ int payload; /* BR2684_PAYLOAD_* */
|
||||
+ int has_vpiid; /* 1: use vpn_id - Unsupported */
|
||||
+ __u8 vpn_id[7];
|
||||
+ int send_padding; /* unsupported */
|
||||
+ int min_size; /* we will pad smaller packets than this */
|
||||
+};
|
||||
+
|
||||
+/*
|
||||
+ * The BR2684_SETFILT ioctl is an experimental mechanism for folks
|
||||
+ * terminating a large number of IP-only vcc's. When netfilter allows
|
||||
+ * efficient per-if in/out filters, this support will be removed
|
||||
+ */
|
||||
+struct br2684_filter {
|
||||
+ __u32 prefix; /* network byte order */
|
||||
+ __u32 netmask; /* 0 = disable filter */
|
||||
+};
|
||||
+
|
||||
+struct br2684_filter_set {
|
||||
+ struct br2684_if_spec ifspec;
|
||||
+ struct br2684_filter filter;
|
||||
+};
|
||||
+
|
||||
+enum br2684_payload {
|
||||
+ p_routed = BR2684_PAYLOAD_ROUTED,
|
||||
+ p_bridged = BR2684_PAYLOAD_BRIDGED,
|
||||
+};
|
||||
+
|
||||
+#define BR2684_SETFILT _IOW( 'a', ATMIOC_BACKEND + 0, \
|
||||
+ struct br2684_filter_set)
|
||||
+
|
||||
+#endif /* _LINUX_ATMBR2684_H */
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,13 +0,0 @@ |
||||
Index: linux-atm-2.4.1/src/include/stdint.h
|
||||
===================================================================
|
||||
--- linux-atm-2.4.1.orig/src/include/stdint.h 2007-10-20 19:19:10.194209414 +0200
|
||||
+++ linux-atm-2.4.1/src/include/stdint.h 2007-10-20 19:19:18.282670346 +0200
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
#if __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1
|
||||
|
||||
-#include "/usr/include/stdint.h"
|
||||
+#include_next <stdint.h>
|
||||
|
||||
#elif __GLIBC__ >= 2
|
||||
|
||||
@ -1,53 +0,0 @@ |
||||
Index: linux-atm-2.4.1/configure
|
||||
===================================================================
|
||||
--- linux-atm-2.4.1.orig/configure 2007-10-20 19:19:17.578630228 +0200
|
||||
+++ linux-atm-2.4.1/configure 2007-10-20 19:19:18.630690180 +0200
|
||||
@@ -8825,7 +8825,7 @@
|
||||
fi;
|
||||
|
||||
|
||||
- ac_config_files="$ac_config_files Makefile doc/Makefile m4/Makefile src/Makefile src/include/Makefile src/lib/Makefile"
|
||||
+ ac_config_files="$ac_config_files Makefile doc/Makefile m4/Makefile src/Makefile src/include/Makefile src/lib/Makefile src/arpd/Makefile"
|
||||
cat >confcache <<\_ACEOF
|
||||
# This file is a shell script that caches the results of configure
|
||||
# tests run on this system so they can be shared between configure
|
||||
@@ -9367,6 +9367,7 @@
|
||||
"src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
|
||||
"src/include/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/include/Makefile" ;;
|
||||
"src/lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/Makefile" ;;
|
||||
+ "src/arpd/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/arpd/Makefile" ;;
|
||||
"default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
|
||||
"config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
|
||||
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
|
||||
Index: linux-atm-2.4.1/configure.in
|
||||
===================================================================
|
||||
--- linux-atm-2.4.1.orig/configure.in 2007-10-20 19:19:16.214552491 +0200
|
||||
+++ linux-atm-2.4.1/configure.in 2007-10-20 19:19:18.642690862 +0200
|
||||
@@ -153,5 +153,6 @@
|
||||
src/Makefile \
|
||||
src/include/Makefile \
|
||||
src/lib/Makefile \
|
||||
+ src/arpd/Makefile \
|
||||
)
|
||||
|
||||
Index: linux-atm-2.4.1/src/Makefile.am
|
||||
===================================================================
|
||||
--- linux-atm-2.4.1.orig/src/Makefile.am 2007-10-20 19:19:16.218552720 +0200
|
||||
+++ linux-atm-2.4.1/src/Makefile.am 2007-10-20 19:19:18.650691320 +0200
|
||||
@@ -1,2 +1,2 @@
|
||||
-SUBDIRS = include lib
|
||||
+SUBDIRS = include lib arpd
|
||||
|
||||
Index: linux-atm-2.4.1/src/Makefile.in
|
||||
===================================================================
|
||||
--- linux-atm-2.4.1.orig/src/Makefile.in 2007-10-20 19:19:17.650634330 +0200
|
||||
+++ linux-atm-2.4.1/src/Makefile.in 2007-10-20 19:19:18.678692917 +0200
|
||||
@@ -96,7 +96,7 @@
|
||||
VERSION = @VERSION@
|
||||
YACC = @YACC@
|
||||
|
||||
-SUBDIRS = include lib
|
||||
+SUBDIRS = include lib arpd
|
||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||
CONFIG_HEADER = ../config.h
|
||||
CONFIG_CLEAN_FILES =
|
||||
@ -1,42 +0,0 @@ |
||||
Index: linux-atm-2.4.1/src/arpd/arp.c
|
||||
===================================================================
|
||||
--- linux-atm-2.4.1.orig/src/arpd/arp.c 2007-10-20 19:19:10.002198470 +0200
|
||||
+++ linux-atm-2.4.1/src/arpd/arp.c 2007-10-20 19:19:19.138719139 +0200
|
||||
@@ -15,7 +15,6 @@
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h> /* for linux/if_arp.h */
|
||||
#include <netinet/in.h> /* for ntohs, etc. */
|
||||
-#define _LINUX_NETDEVICE_H /* very crude hack for glibc2 */
|
||||
#include <linux/if_arp.h>
|
||||
#include <linux/if_ether.h>
|
||||
#include <atm.h>
|
||||
Index: linux-atm-2.4.1/src/arpd/io.c
|
||||
===================================================================
|
||||
--- linux-atm-2.4.1.orig/src/arpd/io.c 2007-10-20 19:19:09.994198016 +0200
|
||||
+++ linux-atm-2.4.1/src/arpd/io.c 2007-10-20 19:19:19.154720039 +0200
|
||||
@@ -16,12 +16,11 @@
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/ioctl.h>
|
||||
-#include <net/if.h>
|
||||
+#include <linux/if.h>
|
||||
#include <netinet/in.h>
|
||||
#include <atm.h>
|
||||
#include <linux/atmclip.h> /* for CLIP_DEFAULT_IDLETIMER */
|
||||
#include <linux/atmarp.h>
|
||||
-#define _LINUX_NETDEVICE_H /* glibc2 */
|
||||
#include <linux/if_arp.h>
|
||||
|
||||
#include "atmd.h"
|
||||
Index: linux-atm-2.4.1/src/arpd/itf.c
|
||||
===================================================================
|
||||
--- linux-atm-2.4.1.orig/src/arpd/itf.c 2007-10-20 19:19:10.010198930 +0200
|
||||
+++ linux-atm-2.4.1/src/arpd/itf.c 2007-10-20 19:19:19.186721859 +0200
|
||||
@@ -12,7 +12,6 @@
|
||||
#include <sys/types.h>
|
||||
#include <linux/atmclip.h>
|
||||
#include <sys/socket.h>
|
||||
-#define _LINUX_NETDEVICE_H /* glibc2 */
|
||||
#include <linux/if_arp.h>
|
||||
|
||||
#include "atmd.h"
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in new issue