X-Git-Url: http://git.indexdata.com/?p=simpleserver-moved-to-github.git;a=blobdiff_plain;f=SimpleServer.xs;h=230cd26bc7223d089de27c3584faa02a64120fcf;hp=b233e6950a75ef3fa3578e7bee3ee9a3b455d1d6;hb=159d2f7d178c6870b07bb10fc8bcea009ad3e786;hpb=e1b6b500a91f4b57549f74d21ac335fdc9c7309b

diff --git a/SimpleServer.xs b/SimpleServer.xs
index b233e69..230cd26 100644
--- a/SimpleServer.xs
+++ b/SimpleServer.xs
@@ -25,7 +25,19 @@
  */
 
 /*$Log: SimpleServer.xs,v $
-/*Revision 1.15  2002-09-16 13:55:53  sondberg
+/*Revision 1.20  2003-09-09 20:12:38  mike
+/*Return diagnostics on Init failure
+/*
+/*Revision 1.19  2003/09/09 11:40:10  mike
+/*(Finally!) support implementation-ID
+/*
+/*Revision 1.18  2003/01/03 09:05:41  sondberg
+/*Applied Dave's GRS-1 patch - actually this was already done in revision 1.17.
+/*
+/*Revision 1.16  2002/11/26 17:09:18  mike
+/*basic support for idPass authentication
+/*
+/*Revision 1.15  2002/09/16 13:55:53  sondberg
 /*Added support for authentication into SimpleServer.
 /*
 /*Revision 1.14  2002/03/05 00:34:13  mike
@@ -103,26 +115,37 @@ SV *delete_ref = NULL;
 SV *scan_ref = NULL;
 int MAX_OID = 15;
 
+#define GRS_BUF_SIZE 512
 
 Z_GenericRecord *read_grs1(char *str, ODR o)
 {
 	int type, ivalue;
-	char line[512], *buf, *ptr, *original;
-	char value[512];
+	char line[GRS_BUF_SIZE+1], *buf, *ptr, *original;
+	char value[GRS_BUF_SIZE+1];
  	Z_GenericRecord *r = 0;
 
 	original = str;
+	r = (Z_GenericRecord *)odr_malloc(o, sizeof(*r));
+	r->elements = (Z_TaggedElement **) odr_malloc(o, sizeof(Z_TaggedElement*) * GRS_MAX_FIELDS);
+	r->num_elements = 0;
+	
 	for (;;)
 	{
 		Z_TaggedElement *t;
 		Z_ElementData *c;
+		int len;
 	
 		ptr = strchr(str, '\n');
 		if (!ptr) {
 			return r;
 		}
-		strncpy(line, str, ptr - str);
-		line[ptr - str] = 0;
+		len = ptr - str;
+		if (len > GRS_BUF_SIZE) {
+		    yaz_log(LOG_WARN, "GRS string too long - truncating (%d > %d)", len, GRS_BUF_SIZE);
+		    len = GRS_BUF_SIZE;
+		}
+		strncpy(line, str, len);
+		line[len] = 0;
 		buf = line;
 		str = ptr + 1;
 		while (*buf && isspace(*buf))
@@ -134,25 +157,16 @@ Z_GenericRecord *read_grs1(char *str, ODR o)
 		if (sscanf(buf, "(%d,%[^)])", &type, value) != 2)
 		{
 			yaz_log(LOG_WARN, "Bad data in '%s'", buf);
-			return 0;
+			return r;
 		}
 		if (!type && *value == '0')
 			return r;
 		if (!(buf = strchr(buf, ')')))
-			return 0;
+			return r;
 		buf++;
 		while (*buf && isspace(*buf))
 			buf++;
-		if (!*buf)
-			return 0;
-		if (!r)
-		{
-			r = (Z_GenericRecord *)odr_malloc(o, sizeof(*r));
-			r->elements = (Z_TaggedElement **)
-			odr_malloc(o, sizeof(Z_TaggedElement*) * GRS_MAX_FIELDS);
-			r->num_elements = 0;
-		}
-		if (r->num_elements > GRS_MAX_FIELDS)
+		if (r->num_elements >= GRS_MAX_FIELDS)
 		{
 			yaz_log(LOG_WARN, "Max number of GRS-1 elements exceeded [GRS_MAX_FIELDS=%d]", GRS_MAX_FIELDS);
 			exit(0);
@@ -186,8 +200,6 @@ Z_GenericRecord *read_grs1(char *str, ODR o)
 		else
 		{
 			c->which = Z_ElementData_string;
-/*			buf[strlen(buf)-1] = '\0';*/
-			buf[strlen(buf)] = '\0';
 			c->u.string = odr_strdup(o, buf);
 		}
 		r->num_elements++;
@@ -1145,6 +1157,7 @@ bend_initresult *bend_init(bend_initrequest *q)
 	hv_store(href, "IMP_NAME", 8, newSVpv("", 0), 0);
 	hv_store(href, "IMP_VER", 7, newSVpv("", 0), 0);
 	hv_store(href, "ERR_CODE", 8, newSViv(0), 0);
+	hv_store(href, "ERR_STR", 7, newSViv(0), 0);
 	hv_store(href, "PEER_NAME", 9, newSVpv(q->peer_name, 0), 0);
 	hv_store(href, "HANDLE", 6, newSVsv(&sv_undef), 0);
 	hv_store(href, "PID", 3, newSViv(getpid()), 0);
@@ -1158,7 +1171,11 @@ bend_initresult *bend_init(bend_initrequest *q)
 		    passwd = nmem_strdup (odr_getmem (q->stream), cp + 1);
 		}
 		xfree(openpass);
+	    } else if (q->auth->which == Z_IdAuthentication_idPass) {
+		user = q->auth->u.idPass->userId;
+		passwd = q->auth->u.idPass->password;
 	    }
+	    /* ### some code paths have user/password unassigned here */
 	    hv_store(href, "USER", 4, newSVpv(user, 0), 0);
 	    hv_store(href, "PASS", 4, newSVpv(passwd, 0), 0);
 	}
@@ -1188,6 +1205,9 @@ bend_initresult *bend_init(bend_initrequest *q)
 	temp = hv_fetch(href, "ERR_CODE", 8, 1);
 	status = newSVsv(*temp);
 
+	temp = hv_fetch(href, "ERR_STR", 7, 1);
+	err_str = newSVsv(*temp);
+
 	temp = hv_fetch(href, "HANDLE", 6, 1);
 	handle= newSVsv(*temp);
 
@@ -1197,12 +1217,14 @@ bend_initresult *bend_init(bend_initrequest *q)
 	LEAVE;
 	zhandle->handle = handle;
 	r->errcode = SvIV(status);
+	ptr = SvPV(err_str, len);
+	r->errstring = (char *)odr_malloc(q->stream, len + 1);
+	strcpy(r->errstring, ptr);
+	sv_free(err_str);
 	r->handle = zhandle;
-#if 0 /* implementation_id support is not yet in mainstream Yaz */
 	ptr = SvPV(id, len);
 	q->implementation_id = (char *)xmalloc(len + 1);
 	strcpy(q->implementation_id, ptr);
-#endif
 	ptr = SvPV(name, len);
 	q->implementation_name = (char *)xmalloc(len + 1);
 	strcpy(q->implementation_name, ptr);