/*
+
+ * $Id: SimpleServer.xs,v 1.22 2004-05-11 12:56:37 adam Exp $
+ * ----------------------------------------------------------------------
+ *
* Copyright (c) 2000, Index Data.
*
* Permission to use, copy, modify, distribute, and sell this software and
* OF THIS SOFTWARE.
*/
-/*$Log: SimpleServer.xs,v $
-/*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
-/*Support for implementation_id (commented out until it's
-/*in mainstream Yaz)
-/*
-/*Revision 1.13 2002/02/28 11:21:57 mike
-/*Add RPN structure to search-handler argument hash.
-/*
-/*Revision 1.12 2001/08/30 14:02:10 sondberg
-/*Small changes.
-/*
-/*Revision 1.11 2001/08/30 13:15:11 sondberg
-/*Corrected a memory leak, one more to go.
-/*
-/*Revision 1.10 2001/08/29 11:48:36 sondberg
-/*Added routines
-/*
-/* Net::Z3950::SimpleServer::ScanSuccess
-/* Net::Z3950::SimpleServer::ScanPartial
-/*
-/*and a bit of documentation.
-/*
-/*Revision 1.9 2001/08/24 14:00:20 sondberg
-/*Added support for scan.
-/*
-/*Revision 1.8 2001/05/21 11:07:02 sondberg
-/*Extended maximum numbers of GRS-1 elements. Should be done dynamically.
-/*
-/*Revision 1.7 2001/03/13 14:17:15 sondberg
-/*Added support for GRS-1.
-/**/
#include "EXTERN.h"
#include "perl.h"
+#include "embed.h"
#include "XSUB.h"
#include <yaz/backend.h>
#include <yaz/log.h>
#include <yaz/wrbuf.h>
#include <stdio.h>
+#ifdef WIN32
+#else
#include <unistd.h>
+#endif
#include <stdlib.h>
#include <ctype.h>
#define GRS_MAX_FIELDS 500
SV *esrequest_ref = NULL;
SV *delete_ref = NULL;
SV *scan_ref = NULL;
+PerlInterpreter *root_perl_context;
int MAX_OID = 15;
+#define GRS_BUF_SIZE 512
+
+CV * simpleserver_sv2cv(SV *handler) {
+ STRLEN len;
+ char *buf;
+
+ if (SvPOK(handler)) {
+ CV *ret;
+ buf = SvPV( handler, len);
+ if ( !( ret = perl_get_cv(buf, FALSE ) ) ) {
+ fprintf( stderr, "simpleserver_sv2cv: No such handler '%s'\n\n", buf );
+ exit(1);
+ }
+
+ return ret;
+ } else {
+ return (CV *) handler;
+ }
+}
+
+
+int simpleserver_clone(void) {
+ PerlInterpreter *current = PERL_GET_CONTEXT;
+
+ if (!current) {
+ PerlInterpreter *perl_interp = perl_clone(root_perl_context, CLONEf_COPY_STACKS);
+ PERL_SET_CONTEXT( perl_interp );
+ }
+ return 0;
+}
+
+
+void simpleserver_free(void) {
+ PerlInterpreter *current_interp = PERL_GET_CONTEXT;
+
+ perl_destruct(current_interp);
+ perl_free(current_interp);
+ PERL_SYS_TERM();
+}
+
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))
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);
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++;
SV *point;
SV *ODR_point;
Zfront_handle *zhandle = (Zfront_handle *)handle;
+ CV* handler_cv = 0;
dSP;
ENTER;
PUTBACK;
- n = perl_call_sv(search_ref, G_SCALAR | G_DISCARD);
+ handler_cv = simpleserver_sv2cv( search_ref );
+ perl_call_sv( (SV *) handler_cv, G_SCALAR | G_DISCARD);
SPAGAIN;
oident *oid;
WRBUF oid_dotted;
Zfront_handle *zhandle = (Zfront_handle *)handle;
+ CV* handler_cv = 0;
Z_RecordComposition *composition;
Z_ElementSetNames *simple;
PUTBACK;
- perl_call_sv(fetch_ref, G_SCALAR | G_DISCARD);
+ handler_cv = simpleserver_sv2cv( fetch_ref );
+ perl_call_sv( (SV *) handler_cv, G_SCALAR | G_DISCARD);
SPAGAIN;
char *ODR_errstr;
char *ptr;
Zfront_handle *zhandle = (Zfront_handle *)handle;
+ CV* handler_cv = 0;
/* WRBUF oid_dotted; */
PUTBACK;
- perl_call_sv(present_ref, G_SCALAR | G_DISCARD);
+ handler_cv = simpleserver_sv2cv( present_ref );
+ perl_call_sv( (SV *) handler_cv, G_SCALAR | G_DISCARD);
SPAGAIN;
int term_len;
SV *term_tmp;
SV *entries_ref;
-
Zfront_handle *zhandle = (Zfront_handle *)handle;
+ CV* handler_cv = 0;
dSP;
ENTER;
PUTBACK;
- perl_call_sv(scan_ref, G_SCALAR | G_DISCARD);
+ handler_cv = simpleserver_sv2cv( scan_ref );
+ perl_call_sv( (SV *) handler_cv, G_SCALAR | G_DISCARD);
SPAGAIN;
bend_initresult *bend_init(bend_initrequest *q)
{
+ int dummy = simpleserver_clone();
bend_initresult *r = (bend_initresult *) odr_malloc (q->stream, sizeof(*r));
HV *href;
SV **temp;
char *ptr;
char *user = NULL;
char *passwd = NULL;
+ CV* handler_cv = 0;
dSP;
ENTER;
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);
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);
}
if (init_ref != NULL)
{
- perl_call_sv(init_ref, G_SCALAR | G_DISCARD);
+ handler_cv = simpleserver_sv2cv( init_ref );
+ perl_call_sv( (SV *) handler_cv, G_SCALAR | G_DISCARD);
}
SPAGAIN;
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);
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);
HV *href;
Zfront_handle *zhandle = (Zfront_handle *)handle;
SV **temp;
+ CV* handler_cv = 0;
dSP;
ENTER;
PUTBACK;
- perl_call_sv(close_ref, G_SCALAR | G_DISCARD);
+ handler_cv = simpleserver_sv2cv( close_ref );
+ perl_call_sv( (SV *) handler_cv, G_SCALAR | G_DISCARD);
SPAGAIN;
LEAVE;
xfree(handle);
+ simpleserver_free();
return;
}
strcpy(*argv_buf++, ptr);
}
*argv_buf = NULL;
+ root_perl_context = PERL_GET_CONTEXT;
RETVAL = statserv_main(items, argv, bend_init, bend_close);
OUTPUT: