X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=comstack%2Ftcpip.c;h=dae32b9b982251c4945b3e38b012e6944ccc6e44;hp=3fdb3e240fded8e2b37b424d30df756460299745;hb=d296bf4d8d017e615b5030f422b99053c4e382e0;hpb=63cafe41a93427118959a74201b3e331169a71d9

diff --git a/comstack/tcpip.c b/comstack/tcpip.c
index 3fdb3e2..dae32b9 100644
--- a/comstack/tcpip.c
+++ b/comstack/tcpip.c
@@ -4,7 +4,13 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: tcpip.c,v $
- * Revision 1.6  1995-09-29 17:12:00  quinn
+ * Revision 1.8  1995-11-01 13:54:27  quinn
+ * Minor adjustments
+ *
+ * Revision 1.7  1995/10/30  12:41:16  quinn
+ * Added hostname lookup for server.
+ *
+ * Revision 1.6  1995/09/29  17:12:00  quinn
  * Smallish
  *
  * Revision 1.5  1995/09/29  17:01:48  quinn
@@ -111,6 +117,7 @@ int tcpip_rcvconnect(COMSTACK h);
 int tcpip_bind(COMSTACK h, void *address, int mode);
 int tcpip_listen(COMSTACK h, char *addrp, int *addrlen);
 COMSTACK tcpip_accept(COMSTACK h);
+char *tcpip_addrstr(COMSTACK h);
 
 int completeBER(unsigned char *buf, int len);
 
@@ -125,7 +132,7 @@ static int initialized = 0;
 typedef struct tcpip_state
 {
     char *altbuf; /* alternate buffer for surplus data */
-    int altsize;  /* size as malloced */
+    int altsize;  /* size as xmalloced */
     int altlen;   /* length of data or 0 if none */
 
     int written;  /* -1 if we aren't writing */
@@ -164,9 +171,9 @@ COMSTACK tcpip_type(int blocking, int protocol)
     if ((s = socket(AF_INET, SOCK_STREAM, 0)) < 0)
 #endif
         return 0;
-    if (!(p = malloc(sizeof(struct comstack))))
+    if (!(p = xmalloc(sizeof(struct comstack))))
         return 0;
-    if (!(state = p->private = malloc(sizeof(tcpip_state))))
+    if (!(state = p->private = xmalloc(sizeof(tcpip_state))))
         return 0;
 #ifdef WINDOWS
     if (!(p->blocking = blocking) && ioctlsocket(s, FIONBIO, &tru) < 0)
@@ -187,6 +194,7 @@ COMSTACK tcpip_type(int blocking, int protocol)
     p->f_bind = tcpip_bind;
     p->f_listen = tcpip_listen;
     p->f_accept = tcpip_accept;
+    p->f_addrstr = tcpip_addrstr;
 
     p->state = CS_UNBND;
     p->event = CS_NONE;
@@ -342,14 +350,14 @@ COMSTACK tcpip_accept(COMSTACK h)
         h->cerrno = CSOUTSTATE;
         return 0;
     }
-    if (!(new = malloc(sizeof(*new))))
+    if (!(new = xmalloc(sizeof(*new))))
     {
         h->cerrno = CSYSERR;
         return 0;
     }
     memcpy(new, h, sizeof(*h));
     new->iofile = h->newfd;
-    if (!(state = new->private = malloc(sizeof(tcpip_state))))
+    if (!(state = new->private = xmalloc(sizeof(tcpip_state))))
     {
         h->cerrno = CSYSERR;
         return 0;
@@ -399,11 +407,11 @@ int tcpip_get(COMSTACK h, char **buf, int *bufsize)
     {
         if (!*bufsize)
         {
-            if (!(*buf = malloc(*bufsize = CS_TCPIP_BUFCHUNK)))
+            if (!(*buf = xmalloc(*bufsize = CS_TCPIP_BUFCHUNK)))
                 return -1;
         }
         else if (*bufsize - hasread < CS_TCPIP_BUFCHUNK)
-            if (!(*buf = realloc(*buf, *bufsize *= 2)))
+            if (!(*buf =xrealloc(*buf, *bufsize *= 2)))
                 return -1;
         if ((res = recv(h->iofile, *buf + hasread, CS_TCPIP_BUFCHUNK, 0)) < 0)
 #ifdef WINDOWS
@@ -430,10 +438,10 @@ int tcpip_get(COMSTACK h, char **buf, int *bufsize)
             req += CS_TCPIP_BUFCHUNK - rest;
         if (!sp->altbuf)
         {
-            if (!(sp->altbuf = malloc(sp->altsize = req)))
+            if (!(sp->altbuf = xmalloc(sp->altsize = req)))
                 return -1;
         } else if (sp->altsize < req)
-            if (!(sp->altbuf = realloc(sp->altbuf, sp->altsize = req)))
+            if (!(sp->altbuf =xrealloc(sp->altbuf, sp->altsize = req)))
                 return -1;
         TRC(fprintf(stderr, "  Moving %d bytes to altbuf(0x%x)\n", tomove,
             (unsigned) sp->altbuf));
@@ -498,8 +506,31 @@ int tcpip_close(COMSTACK h)
     TRC(fprintf(stderr, "tcpip_close\n"));
     close(h->iofile);
     if (sp->altbuf)
-        free(sp->altbuf);
-    free(sp);
-    free(h);
+        xfree(sp->altbuf);
+    xfree(sp);
+    xfree(h);
     return 0;
 }
+
+char *tcpip_addrstr(COMSTACK h)
+{
+    struct sockaddr_in addr;
+    static char buf[64];
+    char *r;
+    int len;
+    struct hostent *host;
+
+    len = sizeof(addr);
+    if (getpeername(h->iofile, (struct sockaddr*) &addr, &len) < 0)
+    {
+	h->cerrno = CSYSERR;
+	return 0;
+    }
+    if ((host = gethostbyaddr((char*)&addr.sin_addr, sizeof(addr.sin_addr),
+	AF_INET)))
+	r = (char*) host->h_name;
+    else
+	r = inet_ntoa(addr.sin_addr);
+    sprintf(buf, "tcp:%s", r);
+    return buf;
+}