Changeset 460786f in code

Timestamp:

Mar 6, 2014, 3:30:44 PM (11 years ago)

Author:

Mike Belopuhov <mike@…>

Branches:

master

Children:

be3ad87

Parents:

f3c60e6

git-author:

Mike Belopuhov <mike@…> (03/06/14 15:29:27)

git-committer:

Mike Belopuhov <mike@…> (03/06/14 15:30:44)

Message:

Add command line switch '-n' to disable DNS

Files:

• dns.c (modified) (4 diffs)
• icbd.8 (modified) (2 diffs)
• icbd.c (modified) (3 diffs)
• icbd.h (modified) (1 diff)

dns.c

@@ -39 +39 @@
 void dns_done(int, short, void *);
 
-int dns_pipe;
-
 struct icbd_dnsquery {
         uint64_t                        sid;
@@ -48 +46 @@
         } u;
 };
+
+int dns_pipe;
+
+extern int dodns;
 
 int
@@ -173 +175 @@
 }
 
-int
+void
 dns_rresolv(struct icb_session *is, struct sockaddr_storage *ss)
 {
         struct icbd_dnsquery q;
+
+        if (!dodns)
+                return;
 
         if (verbose)
@@ -186 +191 @@
         if (write(dns_pipe, &q, sizeof q) != sizeof q) {
                 syslog(LOG_ERR, "write: %m");
-                exit (EX_OSERR);
+                exit(EX_OSERR);
         }
-
-        return 0;
 }

icbd.8

@@ -23 +23 @@
 .Nm icbd
 .Bk -words
-.Op Fl 46Cdv
+.Op Fl 46Cdnv
 .Oo
 .Fl G Ar group1 Ns Op , Ns Ar ...
@@ -81 +81 @@
 file contains one nick per line; empty lines and lines starting with
 a hash symbol are ignored.
+.Ir Fl n
+Disable DNS resolver.
 .It Fl S Ar name
 Set the server's name to

icbd.c

@@ -50 +50 @@
 int  foreground;
 char logprefix[MAXPATHLEN/2];
+int  dodns = 1;
 int  dologging;
 int  verbose;
@@ -89 +90 @@
         icb_init(&ic);
 
-        while ((ch = getopt(argc, argv, "46CdG:M:L:S:v")) != -1)
+        while ((ch = getopt(argc, argv, "46CdG:M:nL:S:v")) != -1)
                 switch (ch) {
                 case '4':
@@ -112 +113 @@
                 case 'M':
                         icbd_modtab(optarg);
+                        break;
+                case 'n':
+                        dodns = 0;
                         break;
                 case 'S':

icbd.h

@@ -30 +30 @@
 struct sockaddr_storage;
 int     dns_init(void);
-int     dns_rresolv(struct icb_session *, struct sockaddr_storage *);
+void    dns_rresolv(struct icb_session *, struct sockaddr_storage *);
 
 /* logger.c */