SOURCES: mtr-noraw.patch - updated for 0.74

[paszczus]

Author: paszczus                     Date: Fri Sep  5 13:33:01 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 0.74

---- Files affected:
SOURCES:
   mtr-noraw.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/mtr-noraw.patch
diff -u SOURCES/mtr-noraw.patch:1.2 SOURCES/mtr-noraw.patch:1.3
--- SOURCES/mtr-noraw.patch:1.2	Wed Mar 12 21:37:20 2008
+++ SOURCES/mtr-noraw.patch	Fri Sep  5 15:32:55 2008
@@ -1,7 +1,7 @@
-diff -urN mtr-0.72.org/net.c mtr-0.72/net.c
---- mtr-0.72.org/net.c	2006-09-29 21:31:01.000000000 +0200
-+++ mtr-0.72/net.c	2008-03-12 21:26:21.779967188 +0100
-@@ -252,7 +252,6 @@
+diff -ur mtr-0.74/net.c mtr-0.74.new/net.c
+--- mtr-0.74/net.c	2008-08-19 18:55:48.000000000 +0200
++++ mtr-0.74.new/net.c	2008-09-05 15:26:53.588144321 +0200
+@@ -305,7 +305,6 @@
  
    switch ( af ) {
    case AF_INET:
@@ -9,7 +9,7 @@
      iphsize = 0;
      if ( setsockopt( sendsock, IPPROTO_IP, IP_TOS, &tos, sizeof tos ) ) {
        perror( "setsockopt IP_TOS" );
-@@ -262,22 +261,6 @@
+@@ -315,22 +314,6 @@
        perror( "setsockopt IP_TTL" );
        exit( EXIT_FAILURE );
      }    
@@ -22,7 +22,7 @@
 -  ip->id = 0;
 -  ip->frag = 0;    /* 1, if want to find mtu size? Min */
 -    ip->ttl = ttl;
--  ip->protocol = IPPROTO_ICMP;
+-  ip->protocol = mtrtype;
 -  ip->check = 0;
 -
 -  /* BSD needs the source address here, Linux & others do not... */
@@ -32,19 +32,21 @@
      echotype = ICMP_ECHO;
      salen = sizeof (struct sockaddr_in);
      break;
-@@ -757,26 +740,13 @@
+@@ -900,12 +883,8 @@
  {
    int trueopt = 1;
  
 -#if !defined(IP_HDRINCL) && defined(IP_TOS) && defined(IP_TTL)
-   sendsock4 = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP);
+   sendsock4_icmp = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP);
+   sendsock4_udp = socket(AF_INET, SOCK_RAW, IPPROTO_UDP);
 -#else
 -  sendsock4 = socket(AF_INET, SOCK_RAW, IPPROTO_RAW);
 -#endif
    if (sendsock4 < 0) 
      return -1;
  #ifdef ENABLE_IPV6
-   sendsock6 = socket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6);
+@@ -913,15 +892,6 @@
+   sendsock6_udp = socket(AF_INET6, SOCK_RAW, IPPROTO_UDP);
  #endif
  
 -#ifdef IP_HDRINCL
@@ -59,3 +61,4 @@
    recvsock4 = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP);
    if (recvsock4 < 0)
      return -1;
+Tylko w mtr-0.74.new/: net.c~
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/mtr-noraw.patch?r1=1.2&r2=1.3&f=u