/apps/net/traceroute/traceroute-2.0.3-diet.patch

https://github.com/tenchman/TTLinux · Patch · 72 lines · 64 code · 8 blank · 0 comment · 0 complexity · bac5997c4f13535d1d5993d01ad54557 MD5 · raw file 

    

  1. --- traceroute-2.0.3/traceroute/traceroute.c.diet	2007-01-09 13:37:54.000000000 +0100
    2. 

  2. +++ traceroute-2.0.3/traceroute/traceroute.c	2007-05-14 17:27:19.000000000 +0200
    3. 

  3. @@ -29,7 +29,9 @@
    4. 

  4.  #include <linux/errqueue.h>
    5. 

  5.  
    6. 

  6.  /*  XXX: Remove this when things will be defined properly in netinet/ ...  */
    7. 

  7. +#ifndef __dietlibc__
    8. 

  8.  #include "flowlabel.h"
    9. 

  9. +#endif
    10. 

  10.  
    11. 

  11.  #include <clif.h>
    12. 

  12.  #include "version.h"
    13. 

  13. @@ -48,6 +50,9 @@
    14. 

  14.  #define IPV6_RECVHOPLIMIT IPV6_HOPLIMIT
    15. 

  15.  #endif
    16. 

  16.  
    17. 

  17. +#ifndef IPV6_RTHDR_TYPE_0
    18. 

  18. +#define IPV6_RTHDR_TYPE_0 0
    19. 

  19. +#endif
    20. 

  20.  
    21. 

  21.  #define MAX_HOPS	255
    22. 

  22.  #define MAX_PROBES	10
    23. 

  23. @@ -159,7 +164,9 @@
    24. 

  24.  
    25. 

  25.  	memset (&hints, 0, sizeof (hints));
    26. 

  26.  	hints.ai_family = af;
    27. 

  27. +#ifndef __dietlibc__
    28. 

  28.  	hints.ai_flags = AI_IDN;
    29. 

  29. +#endif
    30. 

  30.  
    31. 

  31.  	ret = getaddrinfo (name, NULL, &hints, &res);
    32. 

  32.  	if (ret) {
    33. 

  33. @@ -613,8 +620,13 @@
    34. 

  34.  	    char buf[1024];
    35. 

  35.  
    36. 

  36.  	    buf[0] = '\0';
    37. 

  37. +#ifndef __dietlibc__
    38. 

  38.  	    getnameinfo (&res->sa, sizeof (*res), buf, sizeof (buf),
    39. 

  39.  							    0, 0, NI_IDN);
    40. 

  40. +#else
    41. 

  41. +	    getnameinfo (&res->sa, sizeof (*res), buf, sizeof (buf),
    42. 

  42. +							    0, 0, 0);
    43. 

  43. +#endif
    44. 

  44.  	    /*  foo on errors.  */
    45. 

  45.  
    46. 

  46.  	    printf (" %s (%s)", buf, str);
    47. 

  47. --- traceroute-2.0.3/include/linux/errqueue.h.diet	2007-05-14 17:12:35.000000000 +0200
    48. 

  48. +++ traceroute-2.0.3/include/linux/errqueue.h	2007-05-14 17:11:16.000000000 +0200
    49. 

  49. @@ -0,0 +1,23 @@
    50. 

  50. +#ifndef _LINUX_ERRQUEUE_H
    51. 

  51. +#define _LINUX_ERRQUEUE_H 1
    52. 

  52. +
    53. 

  53. +struct sock_extended_err
    54. 

  54. +{
    55. 

  55. +	__u32	ee_errno;	
    56. 

  56. +	__u8	ee_origin;
    57. 

  57. +	__u8	ee_type;
    58. 

  58. +	__u8	ee_code;
    59. 

  59. +	__u8	ee_pad;
    60. 

  60. +	__u32   ee_info;
    61. 

  61. +	__u32   ee_data;
    62. 

  62. +};
    63. 

  63. +
    64. 

  64. +#define SO_EE_ORIGIN_NONE	0
    65. 

  65. +#define SO_EE_ORIGIN_LOCAL	1
    66. 

  66. +#define SO_EE_ORIGIN_ICMP	2
    67. 

  67. +#define SO_EE_ORIGIN_ICMP6	3
    68. 

  68. +
    69. 

  69. +#define SO_EE_OFFENDER(ee)	((struct sockaddr*)((ee)+1))
    70. 

  70. +
    71. 

  71. +
    72. 

  72. +#endif
    73.