Changeset ba88ae7 for message.c

Timestamp:

Oct 19, 2009, 10:40:02 PM (15 years ago)

Author:

Alejandro R. Sedeño <asedeno@mit.edu>

Branches:

master, release-1.10, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

68f358c

Parents:

26255f0

git-author:

Alejandro R. Sedeño <asedeno@mit.edu> (10/13/09 21:37:51)

git-committer:

Alejandro R. Sedeño <asedeno@mit.edu> (10/19/09 22:40:02)

Message:

Prepare for libzephyr4's sockaddr support.

File:

• message.c (modified) (2 diffs)

message.c

@@ -736 +736 @@
 void owl_message_create_from_znotice(owl_message *m, const ZNotice_t *n)
 {
+#ifdef ZNOTICE_SOCKADDR
+  char hbuf[NI_MAXHOST];
+#else /* !ZNOTICE_SOCKADDR */
   struct hostent *hent;
+#endif /* ZNOTICE_SOCKADDR */
   const char *ptr;
   char *tmp, *tmp2;
@@ -810 +814 @@
 
   /* save the hostname */
+#ifdef ZNOTICE_SOCKADDR
+  owl_function_debugmsg("About to do getnameinfo");
+  if (getnameinfo(&n->z_sender_sockaddr.sa, sizeof(n->z_sender_sockaddr), hbuf, sizeof(hbuf), NULL, 0, 0) == 0)
+    owl_message_set_hostname(m, hbuf);
+#else /* !ZNOTICE_SOCKADDR */
   owl_function_debugmsg("About to do gethostbyaddr");
-  hent=gethostbyaddr(&(n->z_uid.zuid_addr), sizeof(n->z_uid.zuid_addr), AF_INET);
-  if (hent && hent->h_name) {
+  hent = gethostbyaddr(&n->z_uid.zuid_addr, sizeof(n->z_uid.zuid_addr), AF_INET);
+  if (hent && hent->h_name)
     owl_message_set_hostname(m, hent->h_name);
-  } else {
+  else
     owl_message_set_hostname(m, inet_ntoa(n->z_sender_addr));
-  }
+#endif /* ZNOTICE_SOCKADDR */
 
   /* set the body */