Changeset 1735 for pjproject/trunk/pjmedia/src/pjmedia/errno.c

Timestamp:

Jan 23, 2008 8:39:07 PM (16 years ago)

Author:

bennylp

Message:

Ticket #61: Implement SRTP support in PJMEDIA and PJSUA-LIB, and updated applications because of the changes. This is a major modification back ported from SRTP branch. See ticket #61 for changelog detail of this commit

File:

• pjproject/trunk/pjmedia/src/pjmedia/errno.c (modified) (5 diffs)

pjproject/trunk/pjmedia/src/pjmedia/errno.c

@@ -24 +24 @@
 #endif
 
+#if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0)
+    const char* get_libsrtp_errstr(int err);
+#endif
 
 
@@ -142 +145 @@
     PJ_BUILD_ERR( PJMEDIA_ESNDINDEVID,      "Invalid sound device ID" ),
     PJ_BUILD_ERR( PJMEDIA_ESNDINSAMPLEFMT,  "Invalid sample format for sound device" ),
+
+#if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0)
+    /* SRTP transport errors: */
+    PJ_BUILD_ERR( PJMEDIA_SRTP_ECRYPTONOTMATCH, "SRTP crypto-suite name not match the offerer tag" ),
+    PJ_BUILD_ERR( PJMEDIA_SRTP_EINKEYLEN,       "Invalid SRTP key length for specific crypto" ),
+    PJ_BUILD_ERR( PJMEDIA_SRTP_ENOTSUPCRYPTO,   "Unsupported SRTP crypto-suite" ),
+    PJ_BUILD_ERR( PJMEDIA_SRTP_ESDPAMBIGUEANS,  "SRTP SDP contains ambigue answer" ),
+    PJ_BUILD_ERR( PJMEDIA_SRTP_ESDPDUPCRYPTOTAG,"Duplicated SRTP crypto tag" ),
+    PJ_BUILD_ERR( PJMEDIA_SRTP_ESDPINCRYPTO,    "Invalid SRTP crypto attribute" ),
+    PJ_BUILD_ERR( PJMEDIA_SRTP_ESDPINCRYPTOTAG, "Invalid SRTP crypto tag" ),
+    PJ_BUILD_ERR( PJMEDIA_SRTP_ESDPINTRANSPORT, "Invalid SDP media transport for SRTP" ),
+    PJ_BUILD_ERR( PJMEDIA_SRTP_ESDPREQCRYPTO,   "SRTP crypto attribute required" ),
+    PJ_BUILD_ERR( PJMEDIA_SRTP_ESDPREQSECTP,    "Secure transport required in SDP media descriptor" )
+#endif
+
 };
 
@@ -160 +178 @@
     /* See if the error comes from PortAudio. */
 #if PJMEDIA_SOUND_IMPLEMENTATION==PJMEDIA_SOUND_PORTAUDIO_SOUND
-    if (statcode >= PJMEDIA_ERRNO_FROM_PORTAUDIO(paNotInitialized) &&
-        statcode <  PJMEDIA_ERRNO_FROM_PORTAUDIO(paNotInitialized + 10000))
+    if (statcode >= PJMEDIA_PORTAUDIO_ERRNO_START &&
+        statcode <= PJMEDIA_PORTAUDIO_ERRNO_END)
     {
 
-        int pa_err = statcode - PJMEDIA_ERRNO_FROM_PORTAUDIO(0);
+        //int pa_err = statcode - PJMEDIA_ERRNO_FROM_PORTAUDIO(0);
+        int pa_err = PJMEDIA_PORTAUDIO_ERRNO_START - statcode;
         pj_str_t msg;
         
@@ -176 +195 @@
     } else 
 #endif  /* PJMEDIA_SOUND_IMPLEMENTATION */
+
+#if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0)
+    /* LIBSRTP error */
+    if (statcode >= PJMEDIA_LIBSRTP_ERRNO_START &&
+        statcode <  PJMEDIA_LIBSRTP_ERRNO_END)
+    {
+        int err = statcode - PJMEDIA_PORTAUDIO_ERRNO_START;
+        pj_str_t msg;
+        
+        msg = pj_str((char*)get_libsrtp_errstr(err));
+
+        pj_strncpy_with_null(&errstr, &msg, bufsize);
+        return errstr;
+    
+    } else
+#endif
+    
+    /* PJMEDIA error */
     if (statcode >= PJMEDIA_ERRNO_START && 
-               statcode < PJMEDIA_ERRNO_START + PJ_ERRNO_SPACE_SIZE)
+               statcode < PJMEDIA_ERRNO_END)
     {
         /* Find the error in the table.
@@ -212 +249 @@
 
         } 
-    }
-
+    } 
 #endif  /* PJ_HAS_ERROR_STRING */