Changeset a785c27 in code

Timestamp:

Jan 8, 2010, 1:16:34 PM (15 years ago)

Author:

Mike Belopuhov <mike.belopuhov@…>

Branches:

master

Children:

c45628b

Parents:

8bf5a0a

Message:

allow specifying a server name; do hostname evaluation only once

Files:

• icb.c (modified) (3 diffs)
• icbd.c (modified) (3 diffs)

icb.c

@@ -29 +29 @@
 
 extern int creategroups;
+extern char srvname[MAXHOSTNAMELEN];
 
 void   icb_command(struct icb_session *, char *, char *);
@@ -46 +47 @@
 
         LIST_INIT(&groups);
+
+        if (strlen(srvname) == 0)
+                (void)gethostname(srvname, sizeof srvname);
+        /*
+         * MAXHOSTNAMELEN is usually greater than what we
+         * can actually send, hence truncation:
+         */
+        if (strlen(srvname) > 200)
+                srvname[200] = '\0';
 }
 
@@ -54 +64 @@
 icb_start(struct icb_session *is)
 {
-        char hname[MAXHOSTNAMELEN];
-
-        bzero(hname, sizeof hname);
-        (void)gethostname(hname, sizeof hname);
-        icb_sendfmt(is, "%c%c%c%s%c%s", ICB_M_PROTO, '1', ICB_M_SEP, hname,
+        icb_sendfmt(is, "%c%c%c%s%c%s", ICB_M_PROTO, '1', ICB_M_SEP, srvname,
             ICB_M_SEP, "icbd");
         SETF(is->flags, ICB_SF_PROTOSENT);

icbd.c

@@ -42 +42 @@
 extern char *__progname;
 
-int creategroups;
-int foreground;
-int verbose;
+char srvname[MAXHOSTNAMELEN];
+int  creategroups;
+int  foreground;
+int  verbose;
 
 void usage(void);
@@ -72 +73 @@
         icb_init(&ic);
 
-        while ((ch = getopt(argc, argv, "46CdG:v")) != -1)
+        while ((ch = getopt(argc, argv, "46CdG:S:v")) != -1)
                 switch (ch) {
                 case '4':
@@ -88 +89 @@
                 case 'G':
                         icbd_grplist(optarg);
+                        break;
+                case 'S':
+                        strlcpy(srvname, optarg, sizeof srvname);
                         break;
                 case 'v':