projects
/
yazpp-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yazpp
[yazpp-moved-to-github.git]
/
src
/
yaz-pdu-assoc.cpp
diff --git
a/src/yaz-pdu-assoc.cpp
b/src/yaz-pdu-assoc.cpp
index
ba962dc
..
76ac5a2
100644
(file)
--- a/
src/yaz-pdu-assoc.cpp
+++ b/
src/yaz-pdu-assoc.cpp
@@
-1,5
+1,5
@@
/* This file is part of the yazpp toolkit.
/* This file is part of the yazpp toolkit.
- * Copyright (C) 1998-2012 Index Data and Mike Taylor
+ * Copyright (C) Index Data
* See the file LICENSE for details.
*/
* See the file LICENSE for details.
*/
@@
-54,6
+54,7
@@
namespace yazpp_1 {
void init(yazpp_1::ISocketObservable *socketObservable);
COMSTACK comstack(const char *type_and_host, void **vp);
bool m_session_is_dead;
void init(yazpp_1::ISocketObservable *socketObservable);
COMSTACK comstack(const char *type_and_host, void **vp);
bool m_session_is_dead;
+ char *cert_fname;
};
}
};
}
@@
-73,10
+74,12
@@
void PDU_Assoc_priv::init(ISocketObservable *socketObservable)
idleTime = 0;
log = YLOG_DEBUG;
m_session_is_dead = false;
idleTime = 0;
log = YLOG_DEBUG;
m_session_is_dead = false;
+ cert_fname = 0;
}
PDU_Assoc::~PDU_Assoc()
{
}
PDU_Assoc::~PDU_Assoc()
{
+ xfree(m_p->cert_fname);
delete m_p;
}
delete m_p;
}
@@
-502,6
+505,10
@@
int PDU_Assoc::listen(IPDU_Observer *observer, const char *addr)
if (!m_p->cs)
return -1;
if (!m_p->cs)
return -1;
+
+ if (m_p->cert_fname)
+ cs_set_ssl_certificate_file(m_p->cs, m_p->cert_fname);
+
if (cs_bind(m_p->cs, ap, CS_SERVER) < 0)
return -2;
if (cs_bind(m_p->cs, ap, CS_SERVER) < 0)
return -2;
@@
-523,6
+530,11
@@
int PDU_Assoc::listen(IPDU_Observer *observer, const char *addr)
return 0;
}
return 0;
}
+COMSTACK PDU_Assoc::get_comstack()
+{
+ return m_p->cs;
+}
+
void PDU_Assoc::idleTime(int idleTime)
{
m_p->idleTime = idleTime;
void PDU_Assoc::idleTime(int idleTime)
{
m_p->idleTime = idleTime;
@@
-602,6
+614,15
@@
const char*PDU_Assoc::getpeername()
return 0;
return cs_addrstr(m_p->cs);
}
return 0;
return cs_addrstr(m_p->cs);
}
+
+void PDU_Assoc::set_cert_fname(const char *fname)
+{
+ xfree(m_p->cert_fname);
+ m_p->cert_fname = 0;
+ if (fname)
+ m_p->cert_fname = xstrdup(fname);
+}
+
/*
* Local variables:
* c-basic-offset: 4
/*
* Local variables:
* c-basic-offset: 4