Changeset 64 for pjproject/trunk/pjsip/src/pjsip/sip_endpoint.c

Timestamp:

Nov 20, 2005 7:58:10 PM (18 years ago)

Author:

bennylp

Message:

More compliant URI parser, comparison, etc.

File:

• pjproject/trunk/pjsip/src/pjsip/sip_endpoint.c (modified) (6 diffs)

pjproject/trunk/pjsip/src/pjsip/sip_endpoint.c

@@ -23 +23 @@
 #include <pjsip/sip_resolve.h>
 #include <pjsip/sip_module.h>
-#include <pjsip/sip_misc.h>
+#include <pjsip/sip_util.h>
 #include <pjsip/sip_errno.h>
 #include <pj/except.h>
@@ -107 +107 @@
 
 /*
- * Create transaction.
- * Defined in sip_transaction.c
- */
-pj_status_t pjsip_tsx_create( pj_pool_t *pool, pjsip_endpoint *endpt,
-                              pjsip_transaction **tsx );
-
-/*
  * This is the global handler for memory allocation failure, for pools that
  * are created by the endpoint (by default, all pools ARE allocated by 
@@ -295 +288 @@
  * Get "Allow" header.
  */
-PJ_DECL(const pjsip_allow_hdr*) pjsip_endpt_get_allow_hdr( pjsip_endpoint *endpt )
+PJ_DEF(const pjsip_allow_hdr*) pjsip_endpt_get_allow_hdr( pjsip_endpoint *endpt )
 {
     return endpt->allow_hdr;
@@ -672 +665 @@
  * Find transaction by the key.
  */
-PJ_DECL(pjsip_transaction*) pjsip_endpt_find_tsx( pjsip_endpoint *endpt,
+PJ_DEF(pjsip_transaction*) pjsip_endpt_find_tsx( pjsip_endpoint *endpt,
                                                   const pj_str_t *key )
 {
@@ -981 +974 @@
  * Find/create transport.
  */
-PJ_DECL(pj_status_t) pjsip_endpt_alloc_transport( pjsip_endpoint *endpt,
+PJ_DEF(pj_status_t) pjsip_endpt_alloc_transport( pjsip_endpoint *endpt,
                                                   pjsip_transport_type_e type,
                                                   const pj_sockaddr_in *remote,
@@ -992 +985 @@
 
 
+/*
+ * Report error.
+ */
+PJ_DEF(void) pjsip_endpt_log_error(  pjsip_endpoint *endpt,
+                                     const char *sender,
+                                     pj_status_t error_code,
+                                     const char *format,
+                                     ... )
+{
+    char newformat[256];
+    int len;
+    va_list marker;
+
+    va_start(marker, format);
+
+    PJ_UNUSED_ARG(endpt);
+
+    len = pj_native_strlen(format);
+    if (len < sizeof(newformat)-30) {
+        pj_str_t errstr;
+
+        pj_native_strcpy(newformat, format);
+        pj_snprintf(newformat+len, sizeof(newformat)-len-1,
+                    ": [err %d] ", error_code);
+        len += pj_native_strlen(newformat+len);
+
+        errstr = pjsip_strerror(error_code, newformat+len, 
+                                sizeof(newformat)-len-1);
+
+        len += errstr.slen;
+        newformat[len] = '\0';
+
+        pj_log(sender, 1, newformat, marker);
+    } else {
+        pj_log(sender, 1, format, marker);
+    }
+
+    va_end(marker);
+}
+
+
+/*
+ * Dump endpoint.
+ */
 PJ_DEF(void) pjsip_endpt_dump( pjsip_endpoint *endpt, pj_bool_t detail )
 {