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
Update header. Copyright + yazproxy name
[yazproxy-moved-to-github.git]
/
src
/
proxyp.h
diff --git
a/src/proxyp.h
b/src/proxyp.h
index
7ab1ea0
..
b161fdf
100644
(file)
--- a/
src/proxyp.h
+++ b/
src/proxyp.h
@@
-1,4
+1,4
@@
-/* $Id: proxyp.h,v 1.10 2005-09-26 09:25:05 adam Exp $
+/* $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.
Copyright (c) 1998-2005, Index Data.
This file is part of the yaz-proxy.
@@
-31,7
+31,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include <objectlist.h>
#endif
#include <objectlist.h>
#endif
-#include <yaz++/record-cache.h>
+#include <yazpp/record-cache.h>
#include <yazproxy/proxy.h>
#include <yazproxy/module.h>
#include <yazproxy/proxy.h>
#include <yazproxy/module.h>
@@
-102,8
+102,9
@@
public:
const char **authentication,
const char **negotiation_charset,
const char **negotiation_lang,
const char **authentication,
const char **negotiation_charset,
const char **negotiation_lang,
- const char **query_charset);
-
+ const char **query_charset,
+ const char **default_client_query_charset);
+
void get_generic_info(int *log_mask, int *max_clients);
void get_target_info(const char *name, const char **url,
void get_generic_info(int *log_mask, int *max_clients);
void get_target_info(const char *name, const char **url,
@@
-116,7
+117,8
@@
public:
const char **cql2rpn,
const char **negotiation_charset,
const char **negotiation_lang,
const char **cql2rpn,
const char **negotiation_charset,
const char **negotiation_lang,
- const char **query_charset);
+ const char **query_charset,
+ const char **default_client_query_charset);
const char *check_mime_type(const char *path);
int check_query(ODR odr, const char *name, Z_Query *query, char **addinfo);
const char *check_mime_type(const char *path);
int check_query(ODR odr, const char *name, Z_Query *query, char **addinfo);
@@
-185,6
+187,12
@@
class Yaz_ProxyClient : public yazpp_1::Z_Assoc {
void pre_init_client();
int m_target_idletime;
Yaz_Proxy *m_root;
void pre_init_client();
int m_target_idletime;
Yaz_Proxy *m_root;
+ char *m_idAuthentication_ber_buf;
+ int m_idAuthentication_ber_size;
+ ODR m_idAuthentication_odr;
+ void set_idAuthentication(Z_APDU *apdu);
+ bool compare_idAuthentication(Z_APDU *apdu);
+ bool compare_charset(Z_APDU *apdu);
};
/*
};
/*