Changeset b22e3d

Timestamp:

02/08/10 17:50:45 (2 years ago)

Author:

Erik Ekman <yarrick@…>

Branches:

master

Children:

0be433

Parents:

465cfe

git-author:

Erik Ekman <yarrick@…> (02/08/10 17:50:45)

git-committer:

Erik Ekman <erik@…> (02/04/12 20:34:05)

Message:

#89, use remote ip as second ip in ifconfig on FreeBSD

Location:

src

Files:

• client.c (modified) (1 diff)
• iodined.c (modified) (3 diffs)
• tun.c (modified) (2 diffs)
• tun.h (modified) (1 diff)
• user.c (modified) (1 diff)
• user.h (modified) (1 diff)

src/client.c

@@ -1493 +1493 @@
                                         server[64] = 0;
                                         client[64] = 0;
-                                        if (tun_setip(client, netmask) == 0 && 
+                                        if (tun_setip(client, server, netmask) == 0 && 
                                                 tun_setmtu(mtu) == 0) {
 

src/iodined.c

@@ -2410 +2410 @@
         }
 
+        created_users = init_users(my_ip, netmask);
+
         if ((tun_fd = open_tun(device)) == -1) {
                 retval = 1;
@@ -2415 +2417 @@
         }
         if (!skipipconfig) {
-                if (tun_setip(argv[0], netmask) != 0 || tun_setmtu(mtu) != 0) {
+                if (tun_setip(argv[0], users_get_first_ip(), netmask) != 0 || tun_setmtu(mtu) != 0) {
                         retval = 1;
                         goto cleanup1;
@@ -2432 +2434 @@
 
         my_mtu = mtu;
-
-        created_users = init_users(my_ip, netmask);
         
         if (created_users < USERS) {

src/tun.c

@@ -427 +427 @@
 
 int
-tun_setip(const char *ip, int netbits)
+tun_setip(const char *ip, const char *remoteip, int netbits)
 {
         char cmdline[512];
@@ -459 +459 @@
                         if_name,
                         ip,
+#ifdef FREEBSD
+                        remoteip, /* FreeBSD wants other IP as second IP */
+#else
                         ip,
+#endif
                         inet_ntoa(net));
         

src/tun.h

@@ -22 +22 @@
 int write_tun(int, char *, size_t);
 ssize_t read_tun(int, char *, size_t);
-int tun_setip(const char *, int);
+int tun_setip(const char *, const char *, int);
 int tun_setmtu(const unsigned);
 

src/user.c

@@ -86 +86 @@
 }
 
+const char*
+users_get_first_ip()
+{
+        struct in_addr ip;
+        ip.s_addr = users[0].tun_ip;
+        return inet_ntoa(ip);
+}
+
 int
 users_waiting_on_reply()

src/user.h

@@ -77 +77 @@
 
 int init_users(in_addr_t, int);
+const char* users_get_first_ip();
 int users_waiting_on_reply();
 int find_user_by_ip(uint32_t);