projects
/
yazproxy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix init of max_sockets
[yazproxy-moved-to-github.git]
/
src
/
proxyp.h
diff --git
a/src/proxyp.h
b/src/proxyp.h
index
b161fdf
..
c4569c3
100644
(file)
--- a/
src/proxyp.h
+++ b/
src/proxyp.h
@@
-1,7
+1,5
@@
-/* $Id: proxyp.h,v 1.13 2006-03-29 13:33:47 adam Exp $
- Copyright (c) 1998-2005, Index Data.
-
-This file is part of the yaz-proxy.
+/* This file is part of YAZ proxy
+ Copyright (C) 1998-2011 Index Data
YAZ proxy is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
YAZ proxy is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
@@
-14,12
+12,11
@@
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
for more details.
You should have received a copy of the GNU General Public License
-along with YAZ proxy; see the file LICENSE. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+*/
-#if HAVE_XSLT
+#if YAZ_HAVE_XSLT
#include <libxml/parser.h>
#include <libxml/tree.h>
#include <libxml/xinclude.h>
#include <libxml/parser.h>
#include <libxml/tree.h>
#include <libxml/xinclude.h>
@@
-28,7
+25,8
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#endif
#if HAVE_USEMARCON
#endif
#if HAVE_USEMARCON
-#include <objectlist.h>
+#include <usemarconlib.h>
+#include <defines.h>
#endif
#include <yazpp/record-cache.h>
#endif
#include <yazpp/record-cache.h>
@@
-46,8
+44,8
@@
class Yaz_usemarcon {
const char *input, int input_len,
char **output, int *output_len);
#if HAVE_USEMARCON
const char *input, int input_len,
char **output, int *output_len);
#if HAVE_USEMARCON
- CDetails *m_stage1;
- CDetails *m_stage2;
+ Usemarcon *m_stage1;
+ Usemarcon *m_stage2;
#else
int dummy;
#endif
#else
int dummy;
#endif
@@
-91,9
+89,9
@@
public:
int *limit_pdu,
int *limit_req,
int *limit_search,
int *limit_pdu,
int *limit_req,
int *limit_search,
- int *limit_connect,
int *target_idletime,
int *client_idletime,
int *target_idletime,
int *client_idletime,
+ int *max_sockets,
int *max_clients,
int *keepalive_limit_bw,
int *keepalive_limit_pdu,
int *max_clients,
int *keepalive_limit_bw,
int *keepalive_limit_pdu,
@@
-105,12
+103,18
@@
public:
const char **query_charset,
const char **default_client_query_charset);
const char **query_charset,
const char **default_client_query_charset);
- void get_generic_info(int *log_mask, int *max_clients);
+ void get_generic_info(int *log_mask, int *max_clients,
+ int *max_connect, int *limit_connect,
+ int *period_connect,
+ int *msg_threads);
+
+ int get_file_access_info(const char *path);
void get_target_info(const char *name, const char **url,
int *limit_bw, int *limit_pdu, int *limit_req,
void get_target_info(const char *name, const char **url,
int *limit_bw, int *limit_pdu, int *limit_req,
- int *limit_search, int *limit_connect,
+ int *limit_search,
int *target_idletime, int *client_idletime,
int *target_idletime, int *client_idletime,
+ int *max_sockets,
int *max_clients,
int *keepalive_limit_bw, int *keepalive_limit_pdu,
int *pre_init,
int *max_clients,
int *keepalive_limit_bw, int *keepalive_limit_pdu,
int *pre_init,
@@
-136,8
+140,11
@@
public:
const char *user, const char *group,
const char *password,
const char *peer_IP);
const char *user, const char *group,
const char *password,
const char *peer_IP);
+ int global_client_authentication(const char *user, const char *group,
+ const char *password,
+ const char *peer_IP);
char *get_explain_doc(ODR odr, const char *name, const char *db,
char *get_explain_doc(ODR odr, const char *name, const char *db,
- int *len);
+ int *len, int *http_status);
const char *get_explain_name(const char *db, const char **backend_db);
private:
void operator=(const Yaz_ProxyConfig &conf);
const char *get_explain_name(const char *db, const char **backend_db);
private:
void operator=(const Yaz_ProxyConfig &conf);
@@
-169,7
+176,7
@@
class Yaz_ProxyClient : public yazpp_1::Z_Assoc {
yazpp_1::Yaz_Z_Databases m_last_databases;
char *m_last_resultSetId;
int m_last_ok;
yazpp_1::Yaz_Z_Databases m_last_databases;
char *m_last_resultSetId;
int m_last_ok;
- int m_last_resultCount;
+ Odr_int m_last_resultCount;
int m_sr_transform;
int m_seqno;
int m_waiting;
int m_sr_transform;
int m_seqno;
int m_waiting;
@@
-198,6
+205,7
@@
class Yaz_ProxyClient : public yazpp_1::Z_Assoc {
/*
* Local variables:
* c-basic-offset: 4
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab