Changeset 295 for trunk/src/sh_utmp.c

Timestamp:

Oct 31, 2010, 10:36:04 AM (14 years ago)

Author:

katerina

Message:

Support for IPv6 (ticket #222).

File:

• trunk/src/sh_utmp.c (modified) (4 diffs)

trunk/src/sh_utmp.c

@@ -179 +179 @@
   char                name[UT_NAMESIZE+1];
   char                ut_host[UT_HOSTSIZE+1];
-  char                ut_ship[16]; /* IP address */
+  char                ut_ship[SH_IP_BUF]; /* IP address */
   time_t              time;
   struct log_user   * next;
@@ -454 +454 @@
 
 #ifdef HAVE_UTADDR
-#ifdef HAVE_INET_ATON
-static char * my_inet_ntoa(struct in_addr in)
-{
-  return /*@-unrecog@*/inet_ntoa(in)/*@+unrecog@*/;
-}
-#else
-static char * my_inet_ntoa(struct in_addr in)
-{
-  unsigned char a, b, c, d;
-  static char   foo[16];
-  char          bar[4];
-  memcpy (bar, &(in.s_addr), 4); /* memory alignment (?) */
-  memcpy (&a, &bar[0], 1);
-  memcpy (&b, &bar[1], 1);
-  memcpy (&c, &bar[2], 1);
-  memcpy (&d, &bar[3], 1);
-  sprintf(foo, _("%d.%d.%d.%d"),                        /* known to fit  */
-          (int) a, (int) b, (int) c, (int) d);
-  return foo;
+#ifdef HAVE_UTADDR_V6
+static char * my_inet_ntoa(SINT32 * ut_addr_v6, char * buf, size_t buflen)
+{
+  struct in_addr in;
+
+  buf[0] = '\0';
+
+  if (0 == (ut_addr_v6[1] + ut_addr_v6[2] + ut_addr_v6[3]))
+    {
+      memcpy(&in, ut_addr_v6, sizeof(struct in_addr));
+      sl_strlcpy(buf, inet_ntoa(in), buflen);
+    }
+  else
+    {
+      inet_ntop(AF_INET6, ut_addr_v6, buf, buflen);
+    }
+  return buf;
+}
+#else
+static char * my_inet_ntoa(SINT32 ut_addr, char * buf, size_t buflen)
+{
+  struct in_addr in;
+
+  buf[0] = '\0';
+
+  memcpy(&in, ut_addr, sizeof(struct in_addr));
+  sl_strlcpy(buf, inet_ntoa(in), buflen);
+  return buf;
 }
 #endif
@@ -915 +924 @@
 #endif
 #ifdef HAVE_UTADDR
-      /*@-type@*//* ut_addr does exist !!! */
-      {
-        struct in_addr saddr;
-        memcpy (&saddr, &(ut->ut_addr), sizeof(struct in_addr));
-        (void) sl_strlcpy((char*)(user->ut_ship), 
-                          my_inet_ntoa(saddr), 16);
-      }
-      /*@+type@*/
+#ifdef HAVE_UTADDR_V6
+      my_inet_ntoa(ut->ut_addr_v6, user->ut_ship, SH_IP_BUF);
+#else
+      my_inet_ntoa(ut->ut_addr, user->ut_ship, SH_IP_BUF);
+#endif
 #endif
       user->time = ut->ut_time;
@@ -1059 +1065 @@
 #endif
 #ifdef HAVE_UTADDR
-      sl_strlcpy(user->ut_ship,my_inet_ntoa((struct in_addr)ut->ut_addr),16);
+#ifdef HAVE_UTADDR_V6
+      my_inet_ntoa(ut->ut_addr_v6, user->ut_ship, SH_IP_BUF);
+#else
+      my_inet_ntoa(ut->ut_addr, user->ut_ship, SH_IP_BUF);
+#endif
 #endif
       user->time       = ut->ut_time;