Inicio Explorar Axuda
Iniciar sesión
metalmajor
/
openadk
Fork de oss/openadk
1
0
Fork 0
Ficheiros
Árbore: d401a2e190
Ramas Etiquetas
openadk
/
package
/
chillispot
/
patches
/
patch-src_tun_c

patch-src_tun_c 2.5 KB
Histórico Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657 
  1. $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
    2. 

  2. --- chillispot-1.1.0.orig/src/tun.c	2006-09-24 19:48:25.000000000 +0200
    3. 

  3. +++ chillispot-1.1.0/src/tun.c	2009-05-21 20:51:19.000000000 +0200
    4. 

  4. @@ -366,7 +366,7 @@ int tun_addaddr(struct tun_t *this,
    5. 

  5.    this->addrs++;
    6. 

  6.    return 0;
    7. 

  7.  
    8. 

  8. -#elif defined (__FreeBSD__) defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__)
    9. 

  9. +#elif defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__)
    10. 

  10.  
    11. 

  11.    int fd;
    12. 

  12.    struct ifaliasreq      areq;
    13. 

  13. @@ -445,7 +445,7 @@ int tun_setaddr(struct tun_t *this,
    14. 

  14.  #if defined(__linux__)
    15. 

  15.    ifr.ifr_netmask.sa_family = AF_INET;
    16. 

  16.  
    17. 

  17. -#elif defined(__FreeBSD__) defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__)
    18. 

  18. +#elif defined(__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__)
    19. 

  19.    ((struct sockaddr_in *) &ifr.ifr_addr)->sin_len = 
    20. 

  20.      sizeof (struct sockaddr_in);
    21. 

  21.    ((struct sockaddr_in *) &ifr.ifr_dstaddr)->sin_len = 
    22. 

  22. @@ -497,7 +497,7 @@ int tun_setaddr(struct tun_t *this,
    23. 

  23.      ((struct sockaddr_in *) &ifr.ifr_netmask)->sin_addr.s_addr = 
    24. 

  24.        netmask->s_addr;
    25. 

  25.  
    26. 

  26. -#elif defined(__FreeBSD__) defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__)
    27. 

  27. +#elif defined(__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__)
    28. 

  28.      ((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr.s_addr = 
    29. 

  29.        netmask->s_addr;
    30. 

  30.  
    31. 

  31. @@ -585,7 +585,7 @@ int tun_route(struct tun_t *this,
    32. 

  32.    close(fd);
    33. 

  33.    return 0;
    34. 

  34.    
    35. 

  35. -#elif defined(__FreeBSD__) defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__)
    36. 

  36. +#elif defined(__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__)
    37. 

  37.  
    38. 

  38.  struct {
    39. 

  39.    struct rt_msghdr rt;
    40. 

  40. @@ -674,7 +674,7 @@ int tun_new(struct tun_t **tun)
    41. 

  41.  #if defined(__linux__)
    42. 

  42.    struct ifreq ifr;
    43. 

  43.  
    44. 

  44. -#elif defined(__FreeBSD__) defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__)
    45. 

  45. +#elif defined(__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__)
    46. 

  46.    char devname[IFNAMSIZ+5]; /* "/dev/" + ifname */
    47. 

  47.    int devnum;
    48. 

  48.    struct ifaliasreq areq;
    49. 

  49. @@ -722,7 +722,7 @@ int tun_new(struct tun_t **tun)
    50. 

  50.    ioctl((*tun)->fd, TUNSETNOCSUM, 1); /* Disable checksums */
    51. 

  51.    return 0;
    52. 

  52.    
    53. 

  53. -#elif defined(__FreeBSD__) defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__)
    54. 

  54. +#elif defined(__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__)
    55. 

  55.  
    56. 

  56.    /* Find suitable device */
    57. 

  57.    for (devnum = 0; devnum < 255; devnum++) { /* TODO 255 */ 
    58.