X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=comstack%2Fxmosi.c;h=ef4725339a0d3c30bad593d1962195f20164698f;hp=3f6a9c20156672ea40c2bc1f9efe893b3f9aaabe;hb=2da1b7c395cd33f03bbb93919c88a4d0fb2de1ed;hpb=29818ed78e32998641adcf5f23d3b854355918b5

diff --git a/comstack/xmosi.c b/comstack/xmosi.c
index 3f6a9c2..ef47253 100644
--- a/comstack/xmosi.c
+++ b/comstack/xmosi.c
@@ -4,7 +4,28 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: xmosi.c,v $
- * Revision 1.7  1995-10-30 12:41:17  quinn
+ * Revision 1.14  1996-07-26 12:34:07  quinn
+ * Porting.
+ *
+ * Revision 1.13  1996/07/06  19:58:30  quinn
+ * System headerfiles gathered in yconfig
+ *
+ * Revision 1.12  1996/05/22  08:34:44  adam
+ * Added ifdef USE_XTIMOSI; so that 'make depend' works.
+ *
+ * Revision 1.11  1996/02/23 10:00:41  quinn
+ * WAIS Work
+ *
+ * Revision 1.10  1996/02/10  12:23:13  quinn
+ * Enablie inetd operations fro TCP/IP stack
+ *
+ * Revision 1.9  1996/01/02  08:57:28  quinn
+ * Changed enums in the ASN.1 .h files to #defines. Changed oident.class to oclass
+ *
+ * Revision 1.8  1995/11/01  13:54:29  quinn
+ * Minor adjustments
+ *
+ * Revision 1.7  1995/10/30  12:41:17  quinn
  * Added hostname lookup for server.
  *
  * Revision 1.6  1995/09/29  17:12:00  quinn
@@ -77,6 +98,7 @@
  *
  */
 
+#ifdef USE_XTIMOSI
 /*
  * Glue layer for Peter Furniss' xtimosi package.
  */
@@ -86,11 +108,16 @@
 #include <string.h>
 #include <assert.h>
 
+<<<<<<< 1.13
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netdb.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
+=======
+#define YNETINCLUDE
+#include <yconfig.h>
+>>>>>>> /tmp/T4a00144
 
 #include <comstack.h>
 #include <xmosi.h>
@@ -138,7 +165,7 @@ static int addopt(struct netbuf *optbuf, unsigned long level, unsigned long
     char *str;
 
     ent.proto = proto;
-    ent.class = class;
+    ent.oclass = class;
     ent.value = value;
     if (!(oid = oid_getoidbyent(&ent)))
     	return -1;
@@ -148,15 +175,18 @@ static int addopt(struct netbuf *optbuf, unsigned long level, unsigned long
     return 0;
 }
 
-COMSTACK mosi_type(int blocking, int protocol)
+COMSTACK mosi_type(int s, int blocking, int protocol)
 {
     COMSTACK r;
     mosi_state *state;
     int flags = O_RDWR;
 
-    if (!(r = malloc(sizeof(*r))))
+    if (s >= 0)
+	return 0;
+
+    if (!(r = xmalloc(sizeof(*r))))
     	return 0;
-    if (!(state = r->private = malloc(sizeof(*state))))
+    if (!(state = r->private = xmalloc(sizeof(*state))))
     	return 0;
 
     state->call = 0;
@@ -209,9 +239,9 @@ int hex2oct(char *hex, char *oct)
  */
 struct netbuf MDF *mosi_strtoaddr(const char *str)
 {
-    struct netbuf *ret = malloc(sizeof(struct netbuf));
-    struct sockaddr_in *add = malloc(sizeof(struct sockaddr_in));
-    struct t_mosiaddr *mosiaddr = malloc(sizeof(struct t_mosiaddr));
+    struct netbuf *ret = xmalloc(sizeof(struct netbuf));
+    struct sockaddr_in *add = xmalloc(sizeof(struct sockaddr_in));
+    struct t_mosiaddr *mosiaddr = xmalloc(sizeof(struct t_mosiaddr));
     struct hostent *hp;
     char *p, *b, buf[512], *nsap;
     short int port = 102;
@@ -388,10 +418,10 @@ COMSTACK mosi_accept(COMSTACK h)
     	h->cerrno = CSOUTSTATE;
 	return 0;
     }
-    if (!(new = malloc(sizeof(*new))))
+    if (!(new = xmalloc(sizeof(*new))))
     	return 0;
     *new = *h;
-    if (!(new->private = ns = malloc(sizeof(*ns))))
+    if (!(new->private = ns = xmalloc(sizeof(*ns))))
     	return 0;
     *ns = *st;
     if (!h->blocking)
@@ -423,11 +453,11 @@ int mosi_get(COMSTACK h, char **buf, int *bufsize)
     {
     	if (!*bufsize)
     	{
-	    if (!(*buf = malloc(*bufsize = CS_MOSI_BUFCHUNK)))
+	    if (!(*buf = xmalloc(*bufsize = CS_MOSI_BUFCHUNK)))
 	    	return -1;
 	}
 	else if (*bufsize - ct->hasread < CS_MOSI_BUFCHUNK)
-	    if (!(*buf = realloc(*buf, *bufsize *= 2)))
+	    if (!(*buf =xrealloc(*buf, *bufsize *= 2)))
 	    	return -1;
 
     	if ((res = u_rcv(h->iofile, *buf + ct->hasread, CS_MOSI_BUFCHUNK,
@@ -469,14 +499,16 @@ int mosi_put(COMSTACK h, char *buf, int size)
 
 int mosi_close(COMSTACK h)
 {
-    free(h->private);
+    xfree(h->private);
     if (h->iofile >= 0)
 	u_close(h->iofile);
-    free(h);
+   xfree(h);
     return 0;
 }    
 
 char *mosi_addrstr(COMSTACK h)
 {
-    return "osi:[UNIMPLEMENTED";
+    return "osi:[UNIMPLEMENTED]";
 }
+
+#endif