rpms/iputils/devel iputils-20100418-convtoint.patch, NONE, 1.1 iputils-20100418-flowlabel.patch, NONE, 1.1 iputils-20020927-arping-infiniband.patch, 1.4, NONE iputils-20070202-arping_timeout.patch, 1.3, NONE

[Jiri Skala]

Author: jskala

Update of /cvs/extras/rpms/iputils/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv30643

Added Files:
	iputils-20100418-convtoint.patch 
	iputils-20100418-flowlabel.patch 
Removed Files:
	iputils-20020927-arping-infiniband.patch 
	iputils-20070202-arping_timeout.patch 
Log Message:
* Tue Apr 20 2010 Jiri Skala <jskala at redhat.com> - 20100418-1
- update to latest upstream
- enables flowlabel feature (-F option)


iputils-20100418-convtoint.patch:
 tracepath.c  |    2 +-
 tracepath6.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE iputils-20100418-convtoint.patch ---
diff -up iputils-s20100418/tracepath6.c.convtoint iputils-s20100418/tracepath6.c
--- iputils-s20100418/tracepath6.c.convtoint	2010-04-23 11:28:15.294593391 +0200
+++ iputils-s20100418/tracepath6.c	2010-04-23 11:28:23.544605551 +0200
@@ -89,7 +89,7 @@ void print_host(const char *a, const cha
 	}
 	if (plen >= HOST_COLUMN_SIZE)
 		plen = HOST_COLUMN_SIZE - 1;
-	printf("%*s", HOST_COLUMN_SIZE - plen, "");
+	printf("%*s", HOST_COLUMN_SIZE - (int)plen, "");
 }
 
 int recverr(int fd, int ttl)
diff -up iputils-s20100418/tracepath.c.convtoint iputils-s20100418/tracepath.c
--- iputils-s20100418/tracepath.c.convtoint	2010-04-23 11:26:20.273555629 +0200
+++ iputils-s20100418/tracepath.c	2010-04-23 11:26:20.281562493 +0200
@@ -77,7 +77,7 @@ void print_host(const char *a, const cha
 	}
 	if (plen >= HOST_COLUMN_SIZE)
 		plen = HOST_COLUMN_SIZE - 1;
-	printf("%*s", HOST_COLUMN_SIZE - plen, "");
+	printf("%*s", HOST_COLUMN_SIZE - (int)plen, "");
 }
 
 int recverr(int fd, int ttl)

iputils-20100418-flowlabel.patch:
 Makefile        |    2 +-
 in6_flowlabel.h |   40 ++++++++++++++++++++++++++++++++++++++++
 ping6.c         |    1 +
 3 files changed, 42 insertions(+), 1 deletion(-)

--- NEW FILE iputils-20100418-flowlabel.patch ---
diff -up iputils-s20100418/in6_flowlabel.h.flowlabel iputils-s20100418/in6_flowlabel.h
--- iputils-s20100418/in6_flowlabel.h.flowlabel	2010-05-17 13:54:03.422586206 +0200
+++ iputils-s20100418/in6_flowlabel.h	2010-05-17 13:54:03.422586206 +0200
@@ -0,0 +1,40 @@
+/*
+   It is just a stripped copy of the kernel header "linux/in6.h"
+
+   "Flow label" things are still not defined in "netinet/in*.h" headers,
+   but we cannot use "linux/in6.h" immediately because it currently
+   conflicts with "netinet/in.h" .
+*/
+
+struct in6_flowlabel_req
+{
+	struct in6_addr	flr_dst;
+	__u32	flr_label;
+	__u8	flr_action;
+	__u8	flr_share;
+	__u16	flr_flags;
+	__u16 	flr_expires;
+	__u16	flr_linger;
+	__u32	__flr_pad;
+	/* Options in format of IPV6_PKTOPTIONS */
+};
+
+#define IPV6_FL_A_GET	0
+#define IPV6_FL_A_PUT	1
+#define IPV6_FL_A_RENEW	2
+
+#define IPV6_FL_F_CREATE	1
+#define IPV6_FL_F_EXCL		2
+
+#define IPV6_FL_S_NONE		0
+#define IPV6_FL_S_EXCL		1
+#define IPV6_FL_S_PROCESS	2
+#define IPV6_FL_S_USER		3
+#define IPV6_FL_S_ANY		255
+
+#define IPV6_FLOWINFO_FLOWLABEL		0x000fffff
+#define IPV6_FLOWINFO_PRIORITY		0x0ff00000
+
+#define IPV6_FLOWLABEL_MGR	32
+#define IPV6_FLOWINFO_SEND	33
+
diff -up iputils-s20100418/Makefile.flowlabel iputils-s20100418/Makefile
--- iputils-s20100418/Makefile.flowlabel	2010-05-17 13:54:03.339556213 +0200
+++ iputils-s20100418/Makefile	2010-05-17 13:54:03.423585869 +0200
@@ -35,7 +35,7 @@ ping: ping.o ping_common.o
 ping6: ping6.o ping_common.o
 	$(CC) $(CFLAGS) ping6.o ping_common.o -lresolv -lcrypto -o ping6
 
-ping.o ping6.o ping_common.o: ping_common.h
+ping.o ping6.o ping_common.o: ping_common.h in6_flowlabel.h
 tftpd.o tftpsubs.o: tftp.h
 
 rdisc_srv: rdisc_srv.o
diff -up iputils-s20100418/ping6.c.flowlabel iputils-s20100418/ping6.c
--- iputils-s20100418/ping6.c.flowlabel	2010-05-17 13:55:34.012839691 +0200
+++ iputils-s20100418/ping6.c	2010-05-17 13:55:36.411557280 +0200
@@ -74,6 +74,7 @@ char copyright[] =
 #include <resolv.h>
 
 #include "ping6_niquery.h"
+#include "in6_flowlabel.h"
 
 #ifndef SOL_IPV6
 #define SOL_IPV6 IPPROTO_IPV6


--- iputils-20020927-arping-infiniband.patch DELETED ---


--- iputils-20070202-arping_timeout.patch DELETED ---