summaryrefslogtreecommitdiff
path: root/pjsip/src
diff options
context:
space:
mode:
Diffstat (limited to 'pjsip/src')
-rw-r--r--pjsip/src/pjsip-ua/sip_inv.c2
-rw-r--r--pjsip/src/pjsip/sip_endpoint.c4
-rw-r--r--pjsip/src/pjsip/sip_msg.c4
-rw-r--r--pjsip/src/pjsip/sip_parser.c12
-rw-r--r--pjsip/src/pjsip/sip_tel_uri.c10
-rw-r--r--pjsip/src/pjsip/sip_transaction.c6
-rw-r--r--pjsip/src/pjsip/sip_transport.c8
-rw-r--r--pjsip/src/pjsip/sip_ua_layer.c2
-rw-r--r--pjsip/src/pjsua/pjsua.c2
-rw-r--r--pjsip/src/pjsua/pjsua.h2
10 files changed, 28 insertions, 24 deletions
diff --git a/pjsip/src/pjsip-ua/sip_inv.c b/pjsip/src/pjsip-ua/sip_inv.c
index 9f63845a..56d0f144 100644
--- a/pjsip/src/pjsip-ua/sip_inv.c
+++ b/pjsip/src/pjsip-ua/sip_inv.c
@@ -846,7 +846,7 @@ PJ_DEF(pj_status_t) pjsip_inv_answer( pjsip_inv_session *inv,
/* Include SDP for 18x and 2xx response. */
if (st_code/10 == 18 || st_code/10 == 20) {
- pjmedia_sdp_session *local;
+ const pjmedia_sdp_session *local;
status = pjmedia_sdp_neg_get_neg_local(inv->neg, &local);
if (status == PJ_SUCCESS)
diff --git a/pjsip/src/pjsip/sip_endpoint.c b/pjsip/src/pjsip/sip_endpoint.c
index b95e4024..0cc8b270 100644
--- a/pjsip/src/pjsip/sip_endpoint.c
+++ b/pjsip/src/pjsip/sip_endpoint.c
@@ -122,9 +122,9 @@ static void pool_callback( pj_pool_t *pool, pj_size_t size )
/* Compare module name, used for searching module based on name. */
-static int cmp_mod_name(void *name, const pjsip_module *mod)
+static int cmp_mod_name(void *name, const void *mod)
{
- return pj_stricmp(name, &mod->name);
+ return pj_stricmp(name, &((pjsip_module*)mod)->name);
}
/*
diff --git a/pjsip/src/pjsip/sip_msg.c b/pjsip/src/pjsip/sip_msg.c
index bee67215..585c6b42 100644
--- a/pjsip/src/pjsip/sip_msg.c
+++ b/pjsip/src/pjsip/sip_msg.c
@@ -1716,8 +1716,8 @@ PJ_DEF(pjsip_warning_hdr*) pjsip_warning_hdr_create( pj_pool_t *pool,
host->slen + 2 + /* host */
text->slen + 2); /* text */
hvalue.slen = pj_sprintf(hvalue.ptr, "%u %.*s \"%.*s\"",
- code, host->slen, host->ptr,
- text->slen, text->ptr);
+ code, (int)host->slen, host->ptr,
+ (int)text->slen, text->ptr);
return pjsip_generic_string_hdr_create(pool, &str_warning, &hvalue);
}
diff --git a/pjsip/src/pjsip/sip_parser.c b/pjsip/src/pjsip/sip_parser.c
index 352ea2ed..3f2fe6a1 100644
--- a/pjsip/src/pjsip/sip_parser.c
+++ b/pjsip/src/pjsip/sip_parser.c
@@ -154,7 +154,7 @@ static void int_parse_uri_host_port( pj_scanner *scanner,
static pjsip_uri * int_parse_uri_or_name_addr( pj_scanner *scanner,
pj_pool_t *pool,
unsigned option);
-static pjsip_sip_uri* int_parse_sip_url( pj_scanner *scanner,
+static void* int_parse_sip_url( pj_scanner *scanner,
pj_pool_t *pool,
pj_bool_t parse_params);
static pjsip_name_addr *
@@ -1149,10 +1149,12 @@ static pjsip_uri *int_parse_uri(pj_scanner *scanner, pj_pool_t *pool,
}
}
-/* Parse "sip:" and "sips:" URI. */
-static pjsip_sip_uri *int_parse_sip_url( pj_scanner *scanner,
- pj_pool_t *pool,
- pj_bool_t parse_params)
+/* Parse "sip:" and "sips:" URI.
+ * This actually returns (pjsip_sip_uri*) type,
+ */
+static void* int_parse_sip_url( pj_scanner *scanner,
+ pj_pool_t *pool,
+ pj_bool_t parse_params)
{
pj_str_t scheme;
pjsip_sip_uri *url = NULL;
diff --git a/pjsip/src/pjsip/sip_tel_uri.c b/pjsip/src/pjsip/sip_tel_uri.c
index 73e50dfa..fd43bc52 100644
--- a/pjsip/src/pjsip/sip_tel_uri.c
+++ b/pjsip/src/pjsip/sip_tel_uri.c
@@ -70,7 +70,7 @@ static pj_ssize_t tel_uri_print( pjsip_uri_context_e context,
static int tel_uri_cmp( pjsip_uri_context_e context,
const pjsip_tel_uri *url1, const pjsip_tel_uri *url2);
static pjsip_tel_uri* tel_uri_clone(pj_pool_t *pool, const pjsip_tel_uri *rhs);
-static pjsip_tel_uri *tel_uri_parse( pj_scanner *scanner, pj_pool_t *pool,
+static void* tel_uri_parse( pj_scanner *scanner, pj_pool_t *pool,
pj_bool_t parse_params);
#ifdef __GNUC__
@@ -350,9 +350,11 @@ static pjsip_tel_uri* tel_uri_clone(pj_pool_t *pool, const pjsip_tel_uri *rhs)
return uri;
}
-/* Parse tel: URI */
-static pjsip_tel_uri *tel_uri_parse( pj_scanner *scanner, pj_pool_t *pool,
- pj_bool_t parse_params)
+/* Parse tel: URI
+ * THis actually returns (pjsip_tel_uri *) type.
+ */
+static void* tel_uri_parse( pj_scanner *scanner, pj_pool_t *pool,
+ pj_bool_t parse_params)
{
pjsip_tel_uri *uri;
pj_str_t token;
diff --git a/pjsip/src/pjsip/sip_transaction.c b/pjsip/src/pjsip/sip_transaction.c
index fa025993..a219f5d7 100644
--- a/pjsip/src/pjsip/sip_transaction.c
+++ b/pjsip/src/pjsip/sip_transaction.c
@@ -44,7 +44,7 @@
** Declarations and static variable definitions section.
**
*****************************************************************************
-
+ **/
/* Prototypes. */
static pj_status_t mod_tsx_layer_load(pjsip_endpoint *endpt);
static pj_status_t mod_tsx_layer_start(void);
@@ -408,7 +408,7 @@ PJ_DEF(pj_status_t) pjsip_tsx_create_key( pj_pool_t *pool, pj_str_t *key,
** Transaction layer module
**
*****************************************************************************
-
+ **/
/*
* Create transaction layer module and registers it to the endpoint.
*/
@@ -770,7 +770,7 @@ PJ_DEF(pjsip_transaction*) pjsip_rdata_get_tsx( pjsip_rx_data *rdata )
** Transaction
**
*****************************************************************************
-
+ **/
/*
* Lock transaction and set the value of Thread Local Storage.
*/
diff --git a/pjsip/src/pjsip/sip_transport.c b/pjsip/src/pjsip/sip_transport.c
index 88531876..d2971ad5 100644
--- a/pjsip/src/pjsip/sip_transport.c
+++ b/pjsip/src/pjsip/sip_transport.c
@@ -320,14 +320,14 @@ static char *get_msg_info(pj_pool_t *pool, const char *obj_name,
if (msg->type == PJSIP_REQUEST_MSG) {
len = pj_snprintf(info_buf, sizeof(info_buf),
"Request msg %.*s/cseq=%d (%s)",
- msg->line.req.method.name.slen,
+ (int)msg->line.req.method.name.slen,
msg->line.req.method.name.ptr,
cseq->cseq, obj_name);
} else {
len = pj_snprintf(info_buf, sizeof(info_buf),
"Response msg %d/%.*s/cseq=%d (%s)",
msg->line.status.code,
- cseq->method.name.slen,
+ (int)cseq->method.name.slen,
cseq->method.name.ptr,
cseq->cseq, obj_name);
}
@@ -444,7 +444,7 @@ static pj_status_t mod_on_tx_msg(pjsip_tx_data *tdata)
*/
PJ_DEF(pj_status_t) pjsip_transport_send( pjsip_transport *tr,
pjsip_tx_data *tdata,
- const pj_sockaddr *addr,
+ const pj_sockaddr_t *addr,
int addr_len,
void *token,
void (*cb)(void *token,
@@ -465,7 +465,7 @@ PJ_DEF(pj_status_t) pjsip_transport_send( pjsip_transport *tr,
tdata->tp_info.transport = tr;
pj_memcpy(&tdata->tp_info.dst_addr, addr, addr_len);
tdata->tp_info.dst_addr_len = addr_len;
- if (addr->sa_family == PJ_AF_INET) {
+ if (((pj_sockaddr*)addr)->sa_family == PJ_AF_INET) {
const char *str_addr;
str_addr = pj_inet_ntoa(((pj_sockaddr_in*)addr)->sin_addr);
pj_native_strcpy(tdata->tp_info.dst_name, str_addr);
diff --git a/pjsip/src/pjsip/sip_ua_layer.c b/pjsip/src/pjsip/sip_ua_layer.c
index 2d78a3ea..c9bcf958 100644
--- a/pjsip/src/pjsip/sip_ua_layer.c
+++ b/pjsip/src/pjsip/sip_ua_layer.c
@@ -624,7 +624,7 @@ static pj_bool_t mod_ua_on_rx_response(pjsip_rx_data *rdata)
// rdata->msg_info.cseq->cseq == dlg_set->dlg_list.next->local.first_cseq)
if (rdata->msg_info.cseq->method.id == PJSIP_INVITE_METHOD) {
- pj_str_t *to_tag = &rdata->msg_info.to->tag;
+ //pj_str_t *to_tag = &rdata->msg_info.to->tag;
/* Must hold UA mutex before accessing dialog set. */
pj_mutex_lock(mod_ua.mutex);
diff --git a/pjsip/src/pjsua/pjsua.c b/pjsip/src/pjsua/pjsua.c
index a5fafe66..dd4c0c57 100644
--- a/pjsip/src/pjsua/pjsua.c
+++ b/pjsip/src/pjsua/pjsua.c
@@ -18,10 +18,10 @@
*/
#include "pjsua.h"
-struct pjsua pjsua;
#define THIS_FILE "pjsua.c"
+struct pjsua_t pjsua;
#define PJSUA_LOCAL_URI "<sip:user@127.0.0.1>"
diff --git a/pjsip/src/pjsua/pjsua.h b/pjsip/src/pjsua/pjsua.h
index 9fb6a6b4..30f61f61 100644
--- a/pjsip/src/pjsua/pjsua.h
+++ b/pjsip/src/pjsua/pjsua.h
@@ -36,7 +36,7 @@
/* PJSUA application variables. */
-extern struct pjsua
+extern struct pjsua_t
{
/* Control: */
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-10 03:03:38 +0000