ChronosXYZ/netsukuku
1
0
Fork 0
mirror of https://github.com/ChronosX88/netsukuku.git synced 2024-11-22 18:22:18 +00:00
Code Issues Projects Releases Wiki Activity

Oh my god! I fixed the tunl0 issues by renaming it to tunl1 and creating tunl1 on my system first, Amongst other things I don't remember.

Browse Source
This commit is contained in:
MissValeska 2014-03-16 04:17:57 -07:00
parent 1dadd0e8b4
commit 15baa56a87
4 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/andns.c
View File

@ -603,7 +603,7 @@ int andns_gethostbyname(char *hname, inet_prefix *ip)
error(err_str); error(err_str);
err_ret(ERR_RSLRSL,-1); err_ret(ERR_RSLRSL,-1);
} }
fprintf(stderr, "Addr is %p, rdata is %p\n", (void*)addr, (void*) dp->pkt_answ->rdata); fprintf(stderr, "Addr is %p, rdata is %p rawr %p hai %p\n", (void*)&addr, (void*) dp->pkt_answ->rdata, (void*) dp->pkt_answ, (void*) dp);
if ((dp == NULL) || (dp->pkt_answ == NULL) || (dp->pkt_answ->rdata == NULL)) return -1; if ((dp == NULL) || (dp->pkt_answ == NULL) || (dp->pkt_answ->rdata == NULL)) return -1;
memcpy(&addr, dp->pkt_answ->rdata, sizeof(uint32_t)); memcpy(&addr, dp->pkt_answ->rdata, sizeof(uint32_t));
addr=ntohl(addr); addr=ntohl(addr);

39
src/iptunnel.c
View File

@ -17,7 +17,7 @@
* Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
* *
* -- * --
* This code derives from iproute2/iprule.c, it was modified to fit in * This code derives from iproute2/iprule.c, it was modified to fit in
* Netsukuku. * Netsukuku.
* *
* Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru> * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
@ -49,13 +49,14 @@ int do_del(inet_prefix *remote, inet_prefix *local, char *dev,
int tunnel_add(inet_prefix *remote, inet_prefix *local, char *dev, int tunnel_add(inet_prefix *remote, inet_prefix *local, char *dev,
char *tunl_prefix, int tunl_number) char *tunl_prefix, int tunl_number)
{ {
return do_add(SIOCADDTUNNEL, remote, local, dev, tunl_prefix, return do_add(SIOCADDTUNNEL, remote, local, dev, tunl_prefix,
tunl_number); tunl_number);
} }
int tunnel_change(inet_prefix *remote, inet_prefix *local, char *dev, int tunnel_change(inet_prefix *remote, inet_prefix *local, char *dev,
char *tunl_prefix, int tunl_number) char *tunl_prefix, int tunl_number)
{ {
error("The value of siocchgtunnel is: %d", SIOCCHGTUNNEL);
return do_add(SIOCCHGTUNNEL, remote, local, dev, tunl_prefix, return do_add(SIOCCHGTUNNEL, remote, local, dev, tunl_prefix,
tunl_number); tunl_number);
} }
@ -150,6 +151,7 @@ static int do_add_ioctl(int cmd, const char *basedev, struct ip_tunnel_parm *p)
ifr.ifr_ifru.ifru_data = (void*)p; ifr.ifr_ifru.ifru_data = (void*)p;
fd = socket(AF_INET, SOCK_DGRAM, 0); fd = socket(AF_INET, SOCK_DGRAM, 0);
err = ioctl(fd, cmd, &ifr); err = ioctl(fd, cmd, &ifr);
error("Socket File Descriptor Is: %i cmd is: %i err is: %i ifr is: %s Errno is: %d", fd, cmd, err, &ifr, errno);
if (err) if (err)
error(ERROR_MSG "ioctl: %s",ERROR_POS, strerror(errno)); error(ERROR_MSG "ioctl: %s",ERROR_POS, strerror(errno));
close(fd); close(fd);
@ -179,7 +181,7 @@ static int do_del_ioctl(const char *basedev, struct ip_tunnel_parm *p)
* fill_tunnel_parm: fills the `p' struct. * fill_tunnel_parm: fills the `p' struct.
* `remote' and `local' must be in host order * `remote' and `local' must be in host order
*/ */
static int fill_tunnel_parm(int cmd, inet_prefix *remote, inet_prefix *local, static int fill_tunnel_parm(int cmd, inet_prefix *remote, inet_prefix *local,
char *dev, char *tunl_prefix, int tunl_number, char *dev, char *tunl_prefix, int tunl_number,
struct ip_tunnel_parm *p) struct ip_tunnel_parm *p)
{ {
@ -229,7 +231,7 @@ static int fill_tunnel_parm(int cmd, inet_prefix *remote, inet_prefix *local,
return 0; return 0;
} }
/* /*
* do_get: returns 1 if the tunnel named `dev' exists. * do_get: returns 1 if the tunnel named `dev' exists.
*/ */
int do_get(char *dev) int do_get(char *dev)
@ -246,9 +248,10 @@ int do_get(char *dev)
static int do_add(int cmd, inet_prefix *remote, inet_prefix *local, char *dev, static int do_add(int cmd, inet_prefix *remote, inet_prefix *local, char *dev,
char *tunl_prefix, int tunl_number) char *tunl_prefix, int tunl_number)
{ {
error("This is the do_add function.");
struct ip_tunnel_parm p; struct ip_tunnel_parm p;
if (fill_tunnel_parm(cmd, remote, local, dev, tunl_prefix, if (fill_tunnel_parm(cmd, remote, local, dev, tunl_prefix,
tunl_number, &p) < 0) tunl_number, &p) < 0)
return -1; return -1;
@ -258,7 +261,7 @@ static int do_add(int cmd, inet_prefix *remote, inet_prefix *local, char *dev,
switch (p.iph.protocol) { switch (p.iph.protocol) {
case IPPROTO_IPIP: case IPPROTO_IPIP:
return do_add_ioctl(cmd, DEFAULT_TUNL_IF, &p); return do_add_ioctl(cmd, DEFAULT_TUNL_IF, &p);
default: default:
fatal("cannot determine tunnel mode (ipip, gre or sit)\n"); fatal("cannot determine tunnel mode (ipip, gre or sit)\n");
} }
return -1; return -1;
@ -276,14 +279,14 @@ int do_del(inet_prefix *remote, inet_prefix *local, char *dev, char *tunl_prefix
switch (p.iph.protocol) { switch (p.iph.protocol) {
case IPPROTO_IPIP: case IPPROTO_IPIP:
return do_del_ioctl(DEFAULT_TUNL_IF, &p); return do_del_ioctl(DEFAULT_TUNL_IF, &p);
default: default:
return do_del_ioctl(p.name, &p); return do_del_ioctl(p.name, &p);
} }
return -1; return -1;
} }
/* /*
* tun_add_tunl: it adds in the `ifs' array a new struct which refers to * tun_add_tunl: it adds in the `ifs' array a new struct which refers to
* the tunnel "tunlX", where X is a number equal to `tunl'. * the tunnel "tunlX", where X is a number equal to `tunl'.
*/ */
int tun_add_tunl(interface *ifs, char *tunl_prefix, u_char tunl_number) int tun_add_tunl(interface *ifs, char *tunl_prefix, u_char tunl_number)
@ -298,7 +301,7 @@ int tun_add_tunl(interface *ifs, char *tunl_prefix, u_char tunl_number)
return 0; return 0;
} }
/* /*
* tun_del_tunl: it removes from the `ifs' array, which must have at least * tun_del_tunl: it removes from the `ifs' array, which must have at least
* MAX_TUNNEL_IFS members, the struct which refers the tunnel "tunlX", where X * MAX_TUNNEL_IFS members, the struct which refers the tunnel "tunlX", where X
* is a number equal to `tunl'. * is a number equal to `tunl'.
@ -308,7 +311,7 @@ int tun_del_tunl(interface *ifs, char *tunl_prefix, u_char tunl_number)
{ {
char tunl_name[IFNAMSIZ]; char tunl_name[IFNAMSIZ];
int i; int i;
sprintf(tunl_name, TUNL_STRING, TUNL_N(tunl_prefix, tunl_number)); sprintf(tunl_name, TUNL_STRING, TUNL_N(tunl_prefix, tunl_number));
for(i=0; i<MAX_TUNNEL_IFS; i++) for(i=0; i<MAX_TUNNEL_IFS; i++)
@ -316,7 +319,7 @@ int tun_del_tunl(interface *ifs, char *tunl_prefix, u_char tunl_number)
memset(&ifs[i], 0, sizeof(interface)); memset(&ifs[i], 0, sizeof(interface));
return 0; return 0;
} }
return -1; return -1;
} }
@ -328,7 +331,7 @@ void init_tunnels_ifs(void)
} }
/* /*
* first_free_tunnel_if: returns the position of the first member of the * first_free_tunnel_if: returns the position of the first member of the
* `tunnel_ifs' array which isn't used yet. * `tunnel_ifs' array which isn't used yet.
* If the whole array is full, -1 is returned. * If the whole array is full, -1 is returned.
*/ */
@ -369,14 +372,14 @@ int add_tunnel_if(inet_prefix *remote, inet_prefix *local, char *dev,
char *tunl_prefix, int tunl_number, inet_prefix *tunl_ip) char *tunl_prefix, int tunl_number, inet_prefix *tunl_ip)
{ {
char tunl_name[IFNAMSIZ]; char tunl_name[IFNAMSIZ];
/* /*
* tunl0 zero is a special tunnel, it cannot be created nor destroyed. * tunl0 zero is a special tunnel, it cannot be created nor destroyed.
* It's pure energy. * It's pure energy.
*/ */
if(!strcmp(tunl_prefix, DEFAULT_TUNL_PREFIX) && !tunl_number) if(!strcmp(tunl_prefix, DEFAULT_TUNL_PREFIX) && !tunl_number)
goto skip_krnl_add_tunl; goto skip_krnl_add_tunl;
if(tunnel_add(remote, local, dev, tunl_prefix, tunl_number) < 0) { if(tunnel_add(remote, local, dev, tunl_prefix, tunl_number) < 0) {
error("Cannot add the \"" TUNL_STRING "\" tunnel", error("Cannot add the \"" TUNL_STRING "\" tunnel",
TUNL_N(tunl_prefix, tunl_number)); TUNL_N(tunl_prefix, tunl_number));
@ -396,14 +399,14 @@ skip_krnl_add_tunl:
if(set_tunnel_ip(tunl_prefix, tunl_number, tunl_ip) < 0) if(set_tunnel_ip(tunl_prefix, tunl_number, tunl_ip) < 0)
return -1; return -1;
/* /*
* ip route append tunl_ip_subnet dev tunnel proto kernel \ * ip route append tunl_ip_subnet dev tunnel proto kernel \
* scope link src `tunl_ip' * scope link src `tunl_ip'
*/ */
sprintf(tunl_name, TUNL_STRING, TUNL_N(tunl_prefix, tunl_number)); sprintf(tunl_name, TUNL_STRING, TUNL_N(tunl_prefix, tunl_number));
rt_append_subnet_src(tunl_ip, tunl_name); rt_append_subnet_src(tunl_ip, tunl_name);
if(route_rp_filter_all_dev(my_family, &tunnel_ifs[tunl_number], if(route_rp_filter_all_dev(my_family, &tunnel_ifs[tunl_number],
1, 0) < 0) 1, 0) < 0)
return -1; return -1;
@ -434,7 +437,7 @@ skip_krnl_del_tunl:
return 0; return 0;
} }
void del_all_tunnel_ifs(inet_prefix *remote, inet_prefix *local, char *dev, void del_all_tunnel_ifs(inet_prefix *remote, inet_prefix *local, char *dev,
char *tunl_prefix) char *tunl_prefix)
{ {
char tunl_name[IFNAMSIZ]; char tunl_name[IFNAMSIZ];

10
src/iptunnel.h
View File

@ -22,8 +22,8 @@
#include "if.h" #include "if.h"
#define DEFAULT_TUNL_PREFIX "tunl" #define DEFAULT_TUNL_PREFIX "tunl"
#define DEFAULT_TUNL_NUMBER 0 /* The permanent tunl0 device */ #define DEFAULT_TUNL_NUMBER 1 /* The permanent tunl0 device */
#define DEFAULT_TUNL_IF "tunl0" #define DEFAULT_TUNL_IF "tunl1"
#define NTK_TUNL_PREFIX "ntk_tunl" #define NTK_TUNL_PREFIX "ntk_tunl"
/* Usage: printf(TUNL_STRING, TUNL_NUMBER("tunl", x)); */ /* Usage: printf(TUNL_STRING, TUNL_NUMBER("tunl", x)); */
@ -31,7 +31,7 @@
#define TUNL_N(prefix, x) prefix, x #define TUNL_N(prefix, x) prefix, x
#define MAX_TUNNEL_IFS 24 /* it must be >= MAX_MULTIPATH_ROUTES, #define MAX_TUNNEL_IFS 24 /* it must be >= MAX_MULTIPATH_ROUTES,
since in igs.c we are using a tunnel since in igs.c we are using a tunnel
for each nexthop inet-gw */ for each nexthop inet-gw */
/* /*
@ -41,7 +41,7 @@
interface tunnel_ifs[MAX_TUNNEL_IFS]; interface tunnel_ifs[MAX_TUNNEL_IFS];
/* /*
* Functions declaration * Functions declaration
*/ */
@ -63,6 +63,6 @@ int add_tunnel_if(inet_prefix *remote, inet_prefix *local, char *dev,
char *tunl_prefix, int tunl_number, inet_prefix *tunl_ip); char *tunl_prefix, int tunl_number, inet_prefix *tunl_ip);
int del_tunnel_if(inet_prefix *remote, inet_prefix *local, char *dev, int del_tunnel_if(inet_prefix *remote, inet_prefix *local, char *dev,
char *tunl_prefix, int tunl_number); char *tunl_prefix, int tunl_number);
void del_all_tunnel_ifs(inet_prefix *remote, inet_prefix *local, char *dev, void del_all_tunnel_ifs(inet_prefix *remote, inet_prefix *local, char *dev,
char *tunl_prefix); char *tunl_prefix);
#endif /* IPTUNNEL_H */ #endif /* IPTUNNEL_H */

1
src/mark.c
View File

@ -105,6 +105,7 @@ int commit_rules(iptc_handle_t *t)
{ {
int res; int res;
res=iptc_commit(t); res=iptc_commit(t);
error("This is the value of res: %i This is the value of t is: %s", res, t);
if (!res) { if (!res) {
error("In commit_rules: %s.",iptc_strerror(errno)); error("In commit_rules: %s.",iptc_strerror(errno));
err_ret(ERR_NETCOM,-1); err_ret(ERR_NETCOM,-1);