projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SRU GET/Solr base URLs may hold additional ?args YAZ-729
[yaz-moved-to-github.git]
/
include
/
yaz
/
comstack.h
diff --git
a/include/yaz/comstack.h
b/include/yaz/comstack.h
index
cea7db4
..
b516c96
100644
(file)
--- a/
include/yaz/comstack.h
+++ b/
include/yaz/comstack.h
@@
-1,5
+1,5
@@
/* This file is part of the YAZ toolkit.
/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2013 Index Data.
+ * Copyright (C) Index Data.
* All rights reserved.
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* All rights reserved.
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
@@
-39,8
+39,6
@@
YAZ_BEGIN_CDECL
YAZ_BEGIN_CDECL
-#define COMSTACK_DEFAULT_TIMEOUT -1 /* not used yet */
-
struct comstack;
typedef struct comstack *COMSTACK;
typedef COMSTACK (*CS_TYPE)(int s, int flags, int protocol, void *vp);
struct comstack;
typedef struct comstack *COMSTACK;
typedef COMSTACK (*CS_TYPE)(int s, int flags, int protocol, void *vp);
@@
-50,7
+48,6
@@
struct comstack
CS_TYPE type;
int cerrno; /* current error code of this stack */
int iofile; /* UNIX file descriptor for iochannel */
CS_TYPE type;
int cerrno; /* current error code of this stack */
int iofile; /* UNIX file descriptor for iochannel */
- int timeout; /* how long to wait for trailing blocks (ignored for now) */
void *cprivate;/* state info for lower stack */
int max_recv_bytes; /* max size of incoming package */
int state; /* current state */
void *cprivate;/* state info for lower stack */
int max_recv_bytes; /* max size of incoming package */
int state; /* current state */
@@
-136,6
+133,10
@@
YAZ_EXPORT int cs_get_peer_certificate_x509(COMSTACK cs, char **buf, int *len);
YAZ_EXPORT void cs_set_max_recv_bytes(COMSTACK cs, int max_recv_bytes);
YAZ_EXPORT void cs_print_session_info(COMSTACK cs);
YAZ_EXPORT void cs_set_max_recv_bytes(COMSTACK cs, int max_recv_bytes);
YAZ_EXPORT void cs_print_session_info(COMSTACK cs);
+YAZ_EXPORT int cs_parse_host(const char *uri, const char **host,
+ CS_TYPE *t, enum oid_proto *proto,
+ char **connect_host);
+
/*
* error management.
*/
/*
* error management.
*/