| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657 |
- $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
- --- chillispot-1.1.0.orig/src/tun.c 2006-09-24 19:48:25.000000000 +0200
- +++ chillispot-1.1.0/src/tun.c 2009-05-21 20:51:19.000000000 +0200
- @@ -366,7 +366,7 @@ int tun_addaddr(struct tun_t *this,
- this->addrs++;
- return 0;
-
- -#elif defined (__FreeBSD__) defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__)
- +#elif defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__)
-
- int fd;
- struct ifaliasreq areq;
- @@ -445,7 +445,7 @@ int tun_setaddr(struct tun_t *this,
- #if defined(__linux__)
- ifr.ifr_netmask.sa_family = AF_INET;
-
- -#elif defined(__FreeBSD__) defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__)
- +#elif defined(__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__)
- ((struct sockaddr_in *) &ifr.ifr_addr)->sin_len =
- sizeof (struct sockaddr_in);
- ((struct sockaddr_in *) &ifr.ifr_dstaddr)->sin_len =
- @@ -497,7 +497,7 @@ int tun_setaddr(struct tun_t *this,
- ((struct sockaddr_in *) &ifr.ifr_netmask)->sin_addr.s_addr =
- netmask->s_addr;
-
- -#elif defined(__FreeBSD__) defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__)
- +#elif defined(__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__)
- ((struct sockaddr_in *) &ifr.ifr_addr)->sin_addr.s_addr =
- netmask->s_addr;
-
- @@ -585,7 +585,7 @@ int tun_route(struct tun_t *this,
- close(fd);
- return 0;
-
- -#elif defined(__FreeBSD__) defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__)
- +#elif defined(__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__)
-
- struct {
- struct rt_msghdr rt;
- @@ -674,7 +674,7 @@ int tun_new(struct tun_t **tun)
- #if defined(__linux__)
- struct ifreq ifr;
-
- -#elif defined(__FreeBSD__) defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__)
- +#elif defined(__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__)
- char devname[IFNAMSIZ+5]; /* "/dev/" + ifname */
- int devnum;
- struct ifaliasreq areq;
- @@ -722,7 +722,7 @@ int tun_new(struct tun_t **tun)
- ioctl((*tun)->fd, TUNSETNOCSUM, 1); /* Disable checksums */
- return 0;
-
- -#elif defined(__FreeBSD__) defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__)
- +#elif defined(__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__) || defined (__APPLE__)
-
- /* Find suitable device */
- for (devnum = 0; devnum < 255; devnum++) { /* TODO 255 */
|
