diff options
author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2011-03-09 20:39:56 +0100 |
---|---|---|
committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2011-03-09 20:40:18 +0100 |
commit | eeee6cc6480dc40befca72c4411cecece8f1997e (patch) | |
tree | 9794a02799112624a5d97fbcee7d55a8a1462067 | |
parent | 22bb20bf08b96602e3bff8928bfee7ec0dbe772e (diff) | |
download | gnutls-eeee6cc6480dc40befca72c4411cecece8f1997e.tar.gz |
gnutlsxx.cpp for some reason cannot use deprecated functions. Added
_gnutls_transport_set_lowat() as an internal symbol to be used.
-rw-r--r-- | lib/gnutls_record.c | 14 | ||||
-rw-r--r-- | lib/gnutlsxx.cpp | 7 | ||||
-rw-r--r-- | lib/libgnutls.map | 1 |
3 files changed, 20 insertions, 2 deletions
diff --git a/lib/gnutls_record.c b/lib/gnutls_record.c index 1c287d0fb2..a671785c65 100644 --- a/lib/gnutls_record.c +++ b/lib/gnutls_record.c @@ -47,6 +47,9 @@ #include <gnutls_state.h> #include <gnutls_dh.h> +void +_gnutls_transport_set_lowat (gnutls_session_t session, int num); + /** * gnutls_protocol_get_version: * @session: is a #gnutls_session_t structure. @@ -68,6 +71,15 @@ _gnutls_set_current_version (gnutls_session_t session, session->security_parameters.version = version; } +/* Added to avoid issue in C++ interface not being able to + * call deprecated functions. + */ +void +_gnutls_transport_set_lowat (gnutls_session_t session, int num) +{ + session->internals.lowat = num; +} + /** * gnutls_transport_set_lowat: * @session: is a #gnutls_session_t structure. @@ -83,7 +95,7 @@ _gnutls_set_current_version (gnutls_session_t session, void gnutls_transport_set_lowat (gnutls_session_t session, int num) { - session->internals.lowat = num; + _gnutls_transport_set_lowat(session, num); } /** diff --git a/lib/gnutlsxx.cpp b/lib/gnutlsxx.cpp index 1243c40b9d..3958165c1a 100644 --- a/lib/gnutlsxx.cpp +++ b/lib/gnutlsxx.cpp @@ -4,6 +4,11 @@ #include <gnutls/gnutlsxx.h> +extern "C" { +void +_gnutls_transport_set_lowat (gnutls_session_t session, int num); +} + namespace gnutls { @@ -457,7 +462,7 @@ namespace gnutls void session::set_transport_lowat (size_t num) { - gnutls_transport_set_lowat (s, num); + _gnutls_transport_set_lowat(s, num); } void session::set_transport_push_function (gnutls_push_func push_func) diff --git a/lib/libgnutls.map b/lib/libgnutls.map index dff2fa9923..68ba398f01 100644 --- a/lib/libgnutls.map +++ b/lib/libgnutls.map @@ -740,4 +740,5 @@ GNUTLS_PRIVATE { # Internal symbols needed by tests/pkcs12_s2k: _gnutls_pkcs12_string_to_key; _gnutls_bin2hex; + _gnutls_transport_set_lowat; }; |