Changeset d4849a

Timestamp:

11/25/10 19:07:59 (18 months ago)

Author:

Laurent Ghigonis <laurent@…>

Branches:

master

Children:

66d942

Parents:

9c3343

git-author:

Laurent Ghigonis <laurent@…> (11/25/10 19:07:59)

git-committer:

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

Message:

Add support for openbsd routing domain, #95

Files:

• CHANGELOG (modified) (1 diff)
• man/iodine.8 (modified) (2 diffs)
• src/iodine.c (modified) (4 diffs)
• src/util.c (modified) (1 diff)
• src/util.h (modified) (1 diff)

CHANGELOG

@@ -34 +34 @@
         - Handle spaces when entering password interactively, fixes #93.
                 Patch by Hagar.
+        - Add -R option to set OpenBSD routing domain for the DNS socket.
+                Patch by laurent at gouloum fr, fixes #95.
 
 2009-06-01: 0.5.2 "WifiFree"

man/iodine.8

@@ -18 +18 @@
 .B ] [-d
 .I device
+.B ] [-R
+.I rdomain
 .B ] [-m
 .I fragsize
@@ -129 +131 @@
 of the iodined host and test if it is reachable directly. If it is, traffic
 will be sent to the server instead of the DNS relay.
+.TP
+.B -R rdomain
+Use OpenBSD routing domain 'rdomain' for the DNS connection.
 .TP
 .B -m fragsize

src/iodine.c

@@ -137 +137 @@
         int selecttimeout;
         int hostname_maxlen;
+        int rtable = 0;
 
         nameserv_addr = NULL;
@@ -175 +176 @@
 #endif
 
-        while ((choice = getopt(argc, argv, "vfhru:t:d:P:m:M:F:T:O:L:I:")) != -1) {
+        while ((choice = getopt(argc, argv, "vfhru:t:d:R:P:m:M:F:T:O:L:I:")) != -1) {
                 switch(choice) {
                 case 'v':
@@ -198 +199 @@
                 case 'd':
                         device = optarg;
+                        break;
+                case 'R':
+                        rtable = atoi(optarg);
                         break;
                 case 'P':
@@ -326 +330 @@
                 goto cleanup2;
         }
+#ifdef OPENBSD
+        if (rtable > 0)
+                socket_setrtable(dns_fd, rtable);
+#endif
 
         signal(SIGINT, sighandler);

src/util.c

@@ -68 +68 @@
 }
 
+#ifdef OPENBSD
+void
+socket_setrtable(int fd, int rtable)
+{
+        if (setsockopt (fd, IPPROTO_IP, SO_RTABLE, &rtable, sizeof(rtable)) == -1)
+            err(1, "Failed to set routing table %d", rtable);
+}
+#endif

src/util.h

@@ -3 +3 @@
 
 char *get_resolvconf_addr();
+void socket_setrtable(int fd, int rtable);
 
 #endif