Fixed SRTP profile configuration in cli.c and serv.c.

I have tested the fix in 3.3.10. This commit is UNTESTED as i am unable
to compile gnutls (./configure complains about gl_INIT and ggl_INIT).

Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>

diff --git a/src/cli.c b/src/cli.c
index dc6d99542af87a100d0f27fbade8d2d43df2e754..8fec68b78cd1f55cb8e4a1e10a5bafc6c76ff0e1 100644 (file)
--- a/src/cli.c
+++ b/src/cli.c
@@ -687,20 +687,24 @@ static gnutls_session_t init_tls_session(const char *host)
                                        GNUTLS_HB_PEER_ALLOWED_TO_SEND);
 
 #ifdef ENABLE_DTLS_SRTP
-       if (HAVE_OPT(SRTP_PROFILES)) {
-               ret =
-                   gnutls_srtp_set_profile_direct(session,
-                                                  OPT_ARG(SRTP_PROFILES),
-                                                  &err);
-               if (ret == GNUTLS_E_INVALID_REQUEST)
-                       fprintf(stderr, "Syntax error at: %s\n", err);
-               else
-                       fprintf(stderr, "Error in profiles: %s\n",
-                               gnutls_strerror(ret));
-               exit(1);
-       }
+        if (HAVE_OPT(SRTP_PROFILES)) {
+                ret =
+                    gnutls_srtp_set_profile_direct(session,
+                                                   OPT_ARG(SRTP_PROFILES),
+                                                   &err);
+                if (ret == GNUTLS_E_INVALID_REQUEST)
+                        fprintf(stderr, "Syntax error at: %s\n", err);
+                else if (ret != 0)
+                        fprintf(stderr, "Error in profiles: %s\n",
+                                gnutls_strerror(ret));
+                else fprintf(stderr,"DTLS profile set to %s\n",
+                             OPT_ARG(SRTP_PROFILES));
+
+                if (ret != 0) exit(1);
+        }
 #endif
 
+
        return session;
 }
 

diff --git a/src/serv.c b/src/serv.c
index 74dd1af2a9294cf9861cceb51fe7c4e5a17e1027..a1f9adfa8e7a1924ee3aa01948c57e0e3c1309c5 100644 (file)
--- a/src/serv.c
+++ b/src/serv.c
@@ -381,20 +381,24 @@ gnutls_session_t initialize_session(int dtls)
                                        GNUTLS_HB_PEER_ALLOWED_TO_SEND);
 
 #ifdef ENABLE_DTLS_SRTP
-       if (HAVE_OPT(SRTP_PROFILES)) {
-               ret =
-                   gnutls_srtp_set_profile_direct(session,
-                                                  OPT_ARG(SRTP_PROFILES),
-                                                  &err);
-               if (ret == GNUTLS_E_INVALID_REQUEST)
-                       fprintf(stderr, "Syntax error at: %s\n", err);
-               else
-                       fprintf(stderr, "Error in profiles: %s\n",
-                               gnutls_strerror(ret));
-               exit(1);
-       }
+        if (HAVE_OPT(SRTP_PROFILES)) {
+                ret =
+                    gnutls_srtp_set_profile_direct(session,
+                                                   OPT_ARG(SRTP_PROFILES),
+                                                   &err);
+                if (ret == GNUTLS_E_INVALID_REQUEST)
+                        fprintf(stderr, "Syntax error at: %s\n", err);
+                else if (ret != 0)
+                        fprintf(stderr, "Error in profiles: %s\n",
+                                gnutls_strerror(ret));
+                else fprintf(stderr,"DTLS profile set to %s\n",
+                             OPT_ARG(SRTP_PROFILES));
+
+                if (ret != 0) exit(1);
+        }
 #endif
 
+
        return session;
 }