GitList

Browse code

Fixed some compile issues with show_library_versions()

* Refactored show_library_versions to work around the fact
that some compilers (such as MSVC 2008) can't handle #ifdefs
inside of macro references.

* Declare show_library_versions() in options.h because it's
referenced by other files such as openvpn.c.

* Declare get_ssl_library_version() as returning const char *,
to avoid loss of const qualifier in ssl_openssl.c.

Signed-off-by: James Yonan <james@openvpn.net>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <1399589436-8730-7-git-send-email-james@openvpn.net>
URL: http://article.gmane.org/gmane.network.openvpn.devel/8711
Signed-off-by: Gert Doering <gert@greenie.muc.de>
(cherry picked from commit a91a2d6ad7b139ec78d61c8616b8447847e9ecc6)

James Yonan authored on 2014/05/09 07:50:36
Showing 5 changed files

src/openvpn/options.c index fe9b99d..57f8949 100644
src/openvpn/options.h index 092eac4..a3b76d3 100644
src/openvpn/ssl_backend.h index 37a458c..bfd1549 100644
src/openvpn/ssl_openssl.c index 1481850..3a222d8 100644
src/openvpn/ssl_polarssl.c index 5bd6d7d..ddccf1d 100644

src/openvpn/options.c

History View file @ 5b17803

@@ -3439,18 +3439,21 @@ usage_small (void)
                      void
                      show_library_versions(const unsigned int flags)
+                     {
                     -  msg (flags, "library versions: %s%s%s",
                      #ifdef ENABLE_SSL
                     -			get_ssl_library_version(),
                     +#define SSL_LIB_VER_STR get_ssl_library_version()
                      #else
                     -			"",
                     +#define SSL_LIB_VER_STR ""
                      #endif
                      #ifdef ENABLE_LZO
                     -			", LZO ", lzo_version_string()
                     +#define LZO_LIB_VER_STR ", LZO ", lzo_version_string()
                      #else
                     -			"", ""
                     +#define LZO_LIB_VER_STR "", ""
                      #endif
                     -	);
+                    +
                     +  msg (flags, "library versions: %s%s%s", SSL_LIB_VER_STR, LZO_LIB_VER_STR);
+                    +
                     +#undef SSL_LIB_VER_STR
                     +#undef LZO_LIB_VER_STR
+                     }
                      static void

src/openvpn/options.h

History View file @ 5b17803

@@ -691,6 +691,8 @@ void notnull (const char *arg, const char *description);
                      void usage_small (void);
                     +void show_library_versions(const unsigned int flags);
+                    +
                      void init_options (struct options *o, const bool init_gc);
                      void uninit_options (struct options *o);

src/openvpn/ssl_backend.h

History View file @ 5b17803

@@ -485,6 +485,6 @@ void get_highest_preference_tls_cipher (char *buf, int size);
                       * return a pointer to a static memory area containing the
                       * name and version number of the SSL library in use
                       */
                     -char * get_ssl_library_version(void);
                     +const char * get_ssl_library_version(void);
                      #endif /* SSL_BACKEND_H_ */

src/openvpn/ssl_openssl.c

History View file @ 5b17803

@@ -1439,7 +1439,7 @@ get_highest_preference_tls_cipher (char *buf, int size)
   SSL_CTX_free (ctx);
 }
 
-char *
+const char *
 get_ssl_library_version(void)
 {
     return SSLeay_version(SSLEAY_VERSION);

src/openvpn/ssl_polarssl.c

History View file @ 5b17803

@@ -1121,7 +1121,7 @@ get_highest_preference_tls_cipher (char *buf, int size)
   strncpynt (buf, cipher_name, size);
 }
 
-char *
+const char *
 get_ssl_library_version(void)
 {
     static char polar_version[30];

...	...	@@ -1439,7 +1439,7 @@ get_highest_preference_tls_cipher (char *buf, int size)
1439	1439	SSL_CTX_free (ctx);
1440	1440	}
1441	1441
1442		-char *
	1442	+const char *
1443	1443	get_ssl_library_version(void)
1444	1444	{
1445	1445	return SSLeay_version(SSLEAY_VERSION);

...	...	@@ -1121,7 +1121,7 @@ get_highest_preference_tls_cipher (char *buf, int size)
1121	1121	strncpynt (buf, cipher_name, size);
1122	1122	}
1123	1123
1124		-char *
	1124	+const char *
1125	1125	get_ssl_library_version(void)
1126	1126	{
1127	1127	static char polar_version[30];