summaryrefslogtreecommitdiff
path: root/pjsip/src/test
diff options
context:
space:
mode:
Diffstat (limited to 'pjsip/src/test')
-rw-r--r--pjsip/src/test/tsx_uac_test.c34
-rw-r--r--pjsip/src/test/tsx_uas_test.c76
-rw-r--r--pjsip/src/test/uri_test.c24
3 files changed, 78 insertions, 56 deletions
diff --git a/pjsip/src/test/tsx_uac_test.c b/pjsip/src/test/tsx_uac_test.c
index c8f3074..eec92fc 100644
--- a/pjsip/src/test/tsx_uac_test.c
+++ b/pjsip/src/test/tsx_uac_test.c
@@ -1,4 +1,4 @@
-/* $Id: tsx_uac_test.c 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id: tsx_uac_test.c 4208 2012-07-18 07:52:33Z ming $ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -159,7 +159,7 @@ static struct my_timer
*/
static void tsx_user_on_tsx_state(pjsip_transaction *tsx, pjsip_event *e)
{
- if (pj_strcmp2(&tsx->branch, TEST1_BRANCH_ID)==0) {
+ if (pj_stricmp2(&tsx->branch, TEST1_BRANCH_ID)==0) {
/*
* Transaction with TEST1_BRANCH_ID should terminate with transaction
* timeout status.
@@ -213,7 +213,7 @@ static void tsx_user_on_tsx_state(pjsip_transaction *tsx, pjsip_event *e)
}
}
- } else if (pj_strcmp2(&tsx->branch, TEST2_BRANCH_ID)==0) {
+ } else if (pj_stricmp2(&tsx->branch, TEST2_BRANCH_ID)==0) {
/*
* Transaction with TEST2_BRANCH_ID should terminate with transport error.
*/
@@ -231,7 +231,7 @@ static void tsx_user_on_tsx_state(pjsip_transaction *tsx, pjsip_event *e)
test_complete = 1;
}
- } else if (pj_strcmp2(&tsx->branch, TEST3_BRANCH_ID)==0) {
+ } else if (pj_stricmp2(&tsx->branch, TEST3_BRANCH_ID)==0) {
/*
* This test terminates the transaction while resolver is still
* running.
@@ -256,7 +256,7 @@ static void tsx_user_on_tsx_state(pjsip_transaction *tsx, pjsip_event *e)
}
- } else if (pj_strcmp2(&tsx->branch, TEST4_BRANCH_ID)==0) {
+ } else if (pj_stricmp2(&tsx->branch, TEST4_BRANCH_ID)==0) {
/*
* This test simulates transport failure after several
* retransmissions.
@@ -284,7 +284,7 @@ static void tsx_user_on_tsx_state(pjsip_transaction *tsx, pjsip_event *e)
}
- } else if (pj_strcmp2(&tsx->branch, TEST5_BRANCH_ID)==0) {
+ } else if (pj_stricmp2(&tsx->branch, TEST5_BRANCH_ID)==0) {
/*
* This test simulates transport failure after several
* retransmissions.
@@ -312,7 +312,7 @@ static void tsx_user_on_tsx_state(pjsip_transaction *tsx, pjsip_event *e)
}
- } else if (pj_strcmp2(&tsx->branch, TEST6_BRANCH_ID)==0) {
+ } else if (pj_stricmp2(&tsx->branch, TEST6_BRANCH_ID)==0) {
/*
* Successfull non-INVITE transaction.
*/
@@ -355,7 +355,7 @@ static void tsx_user_on_tsx_state(pjsip_transaction *tsx, pjsip_event *e)
}
- } else if (pj_strcmp2(&tsx->branch, TEST7_BRANCH_ID)==0) {
+ } else if (pj_stricmp2(&tsx->branch, TEST7_BRANCH_ID)==0) {
/*
* Successfull non-INVITE transaction.
*/
@@ -408,7 +408,7 @@ static void tsx_user_on_tsx_state(pjsip_transaction *tsx, pjsip_event *e)
}
- } else if (pj_strcmp2(&tsx->branch, TEST8_BRANCH_ID)==0) {
+ } else if (pj_stricmp2(&tsx->branch, TEST8_BRANCH_ID)==0) {
/*
* Failed INVITE transaction.
*/
@@ -468,7 +468,7 @@ static void tsx_user_on_tsx_state(pjsip_transaction *tsx, pjsip_event *e)
}
- } else if (pj_strcmp2(&tsx->branch, TEST9_BRANCH_ID)==0) {
+ } else if (pj_stricmp2(&tsx->branch, TEST9_BRANCH_ID)==0) {
/*
* Failed INVITE transaction with provisional response.
*/
@@ -583,7 +583,7 @@ static void terminate_tsx_callback( pj_timer_heap_t *timer_heap,
*/
static pj_bool_t msg_receiver_on_rx_request(pjsip_rx_data *rdata)
{
- if (pj_strcmp2(&rdata->msg_info.via->branch_param, TEST1_BRANCH_ID) == 0) {
+ if (pj_stricmp2(&rdata->msg_info.via->branch_param, TEST1_BRANCH_ID) == 0) {
/*
* The TEST1_BRANCH_ID test performs the verifications for transaction
* retransmission mechanism. It will not answer the incoming request
@@ -651,7 +651,7 @@ static pj_bool_t msg_receiver_on_rx_request(pjsip_rx_data *rdata)
return PJ_TRUE;
} else
- if (pj_strcmp2(&rdata->msg_info.via->branch_param, TEST4_BRANCH_ID) == 0) {
+ if (pj_stricmp2(&rdata->msg_info.via->branch_param, TEST4_BRANCH_ID) == 0) {
/*
* The TEST4_BRANCH_ID test simulates transport failure after several
* retransmissions.
@@ -672,7 +672,7 @@ static pj_bool_t msg_receiver_on_rx_request(pjsip_rx_data *rdata)
} else
- if (pj_strcmp2(&rdata->msg_info.via->branch_param, TEST5_BRANCH_ID) == 0) {
+ if (pj_stricmp2(&rdata->msg_info.via->branch_param, TEST5_BRANCH_ID) == 0) {
/*
* The TEST5_BRANCH_ID test simulates user terminating the transaction
* after several retransmissions.
@@ -703,7 +703,7 @@ static pj_bool_t msg_receiver_on_rx_request(pjsip_rx_data *rdata)
return PJ_TRUE;
} else
- if (pj_strcmp2(&rdata->msg_info.via->branch_param, TEST6_BRANCH_ID) == 0) {
+ if (pj_stricmp2(&rdata->msg_info.via->branch_param, TEST6_BRANCH_ID) == 0) {
/*
* The TEST6_BRANCH_ID test successfull non-INVITE transaction.
*/
@@ -728,7 +728,7 @@ static pj_bool_t msg_receiver_on_rx_request(pjsip_rx_data *rdata)
} else
- if (pj_strcmp2(&rdata->msg_info.via->branch_param, TEST7_BRANCH_ID) == 0) {
+ if (pj_stricmp2(&rdata->msg_info.via->branch_param, TEST7_BRANCH_ID) == 0) {
/*
* The TEST7_BRANCH_ID test successfull non-INVITE transaction
* with provisional response.
@@ -778,7 +778,7 @@ static pj_bool_t msg_receiver_on_rx_request(pjsip_rx_data *rdata)
} else
- if (pj_strcmp2(&rdata->msg_info.via->branch_param, TEST8_BRANCH_ID) == 0) {
+ if (pj_stricmp2(&rdata->msg_info.via->branch_param, TEST8_BRANCH_ID) == 0) {
/*
* The TEST8_BRANCH_ID test failed INVITE transaction.
*/
@@ -841,7 +841,7 @@ static pj_bool_t msg_receiver_on_rx_request(pjsip_rx_data *rdata)
} else
- if (pj_strcmp2(&rdata->msg_info.via->branch_param, TEST9_BRANCH_ID) == 0) {
+ if (pj_stricmp2(&rdata->msg_info.via->branch_param, TEST9_BRANCH_ID) == 0) {
/*
* The TEST9_BRANCH_ID test failed INVITE transaction with
* provisional response.
diff --git a/pjsip/src/test/tsx_uas_test.c b/pjsip/src/test/tsx_uas_test.c
index 045e958..6da1c4c 100644
--- a/pjsip/src/test/tsx_uas_test.c
+++ b/pjsip/src/test/tsx_uas_test.c
@@ -1,4 +1,4 @@
-/* $Id: tsx_uas_test.c 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id: tsx_uas_test.c 4208 2012-07-18 07:52:33Z ming $ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -352,8 +352,8 @@ static void schedule_terminate_tsx( pjsip_transaction *tsx,
*/
static void tsx_user_on_tsx_state(pjsip_transaction *tsx, pjsip_event *e)
{
- if (pj_strcmp2(&tsx->branch, TEST1_BRANCH_ID)==0 ||
- pj_strcmp2(&tsx->branch, TEST2_BRANCH_ID)==0)
+ if (pj_stricmp2(&tsx->branch, TEST1_BRANCH_ID)==0 ||
+ pj_stricmp2(&tsx->branch, TEST2_BRANCH_ID)==0)
{
/*
* TEST1_BRANCH_ID tests that non-INVITE transaction transmits final
@@ -362,7 +362,7 @@ static void tsx_user_on_tsx_state(pjsip_transaction *tsx, pjsip_event *e)
*
* TEST2_BRANCH_ID does similar test for non-2xx final response.
*/
- int status_code = (pj_strcmp2(&tsx->branch, TEST1_BRANCH_ID)==0) ?
+ int status_code = (pj_stricmp2(&tsx->branch, TEST1_BRANCH_ID)==0) ?
TEST1_STATUS_CODE : TEST2_STATUS_CODE;
if (tsx->state == PJSIP_TSX_STATE_TERMINATED) {
@@ -392,7 +392,7 @@ static void tsx_user_on_tsx_state(pjsip_transaction *tsx, pjsip_event *e)
}
else
- if (pj_strcmp2(&tsx->branch, TEST3_BRANCH_ID)==0) {
+ if (pj_stricmp2(&tsx->branch, TEST3_BRANCH_ID)==0) {
/*
* TEST3_BRANCH_ID tests sending provisional response.
*/
@@ -455,7 +455,7 @@ static void tsx_user_on_tsx_state(pjsip_transaction *tsx, pjsip_event *e)
}
} else
- if (pj_strcmp2(&tsx->branch, TEST4_BRANCH_ID)==0) {
+ if (pj_stricmp2(&tsx->branch, TEST4_BRANCH_ID)==0) {
/*
* TEST4_BRANCH_ID tests receiving retransmissions in TRYING state.
*/
@@ -488,7 +488,7 @@ static void tsx_user_on_tsx_state(pjsip_transaction *tsx, pjsip_event *e)
} else
- if (pj_strcmp2(&tsx->branch, TEST5_BRANCH_ID)==0) {
+ if (pj_stricmp2(&tsx->branch, TEST5_BRANCH_ID)==0) {
/*
* TEST5_BRANCH_ID tests receiving retransmissions in PROCEEDING state
*/
@@ -525,7 +525,7 @@ static void tsx_user_on_tsx_state(pjsip_transaction *tsx, pjsip_event *e)
}
} else
- if (pj_strcmp2(&tsx->branch, TEST6_BRANCH_ID)==0) {
+ if (pj_stricmp2(&tsx->branch, TEST6_BRANCH_ID)==0) {
/*
* TEST6_BRANCH_ID tests receiving retransmissions in COMPLETED state
*/
@@ -560,8 +560,8 @@ static void tsx_user_on_tsx_state(pjsip_transaction *tsx, pjsip_event *e)
} else
- if (pj_strcmp2(&tsx->branch, TEST7_BRANCH_ID)==0 ||
- pj_strcmp2(&tsx->branch, TEST8_BRANCH_ID)==0)
+ if (pj_stricmp2(&tsx->branch, TEST7_BRANCH_ID)==0 ||
+ pj_stricmp2(&tsx->branch, TEST8_BRANCH_ID)==0)
{
/*
* TEST7_BRANCH_ID and TEST8_BRANCH_ID test retransmission of
@@ -569,7 +569,7 @@ static void tsx_user_on_tsx_state(pjsip_transaction *tsx, pjsip_event *e)
*/
int code;
- if (pj_strcmp2(&tsx->branch, TEST7_BRANCH_ID) == 0)
+ if (pj_stricmp2(&tsx->branch, TEST7_BRANCH_ID) == 0)
code = TEST7_STATUS_CODE;
else
code = TEST8_STATUS_CODE;
@@ -637,7 +637,7 @@ static void tsx_user_on_tsx_state(pjsip_transaction *tsx, pjsip_event *e)
} else
- if (pj_strcmp2(&tsx->branch, TEST9_BRANCH_ID)==0) {
+ if (pj_stricmp2(&tsx->branch, TEST9_BRANCH_ID)==0) {
/*
* TEST9_BRANCH_ID tests that retransmission of INVITE final response
* must cease when ACK is received.
@@ -701,9 +701,9 @@ static void tsx_user_on_tsx_state(pjsip_transaction *tsx, pjsip_event *e)
} else
- if (pj_strcmp2(&tsx->branch, TEST10_BRANCH_ID)==0 ||
- pj_strcmp2(&tsx->branch, TEST11_BRANCH_ID)==0 ||
- pj_strcmp2(&tsx->branch, TEST12_BRANCH_ID)==0)
+ if (pj_stricmp2(&tsx->branch, TEST10_BRANCH_ID)==0 ||
+ pj_stricmp2(&tsx->branch, TEST11_BRANCH_ID)==0 ||
+ pj_stricmp2(&tsx->branch, TEST12_BRANCH_ID)==0)
{
if (tsx->state == PJSIP_TSX_STATE_TERMINATED) {
@@ -739,8 +739,8 @@ static pj_bool_t on_rx_message(pjsip_rx_data *rdata)
pj_str_t branch_param = rdata->msg_info.via->branch_param;
pj_status_t status;
- if (pj_strcmp2(&branch_param, TEST1_BRANCH_ID) == 0 ||
- pj_strcmp2(&branch_param, TEST2_BRANCH_ID) == 0)
+ if (pj_stricmp2(&branch_param, TEST1_BRANCH_ID) == 0 ||
+ pj_stricmp2(&branch_param, TEST2_BRANCH_ID) == 0)
{
/*
* TEST1_BRANCH_ID tests that non-INVITE transaction transmits 2xx
@@ -749,7 +749,7 @@ static pj_bool_t on_rx_message(pjsip_rx_data *rdata)
*
* TEST2_BRANCH_ID performs similar test for non-2xx final response.
*/
- int status_code = (pj_strcmp2(&branch_param, TEST1_BRANCH_ID) == 0) ?
+ int status_code = (pj_stricmp2(&branch_param, TEST1_BRANCH_ID) == 0) ?
TEST1_STATUS_CODE : TEST2_STATUS_CODE;
if (msg->type == PJSIP_REQUEST_MSG) {
@@ -789,7 +789,7 @@ static pj_bool_t on_rx_message(pjsip_rx_data *rdata)
}
return PJ_TRUE;
- } else if (pj_strcmp2(&branch_param, TEST3_BRANCH_ID) == 0) {
+ } else if (pj_stricmp2(&branch_param, TEST3_BRANCH_ID) == 0) {
/* TEST3_BRANCH_ID tests provisional response. */
@@ -838,9 +838,9 @@ static pj_bool_t on_rx_message(pjsip_rx_data *rdata)
}
return PJ_TRUE;
- } else if (pj_strcmp2(&branch_param, TEST4_BRANCH_ID) == 0 ||
- pj_strcmp2(&branch_param, TEST5_BRANCH_ID) == 0 ||
- pj_strcmp2(&branch_param, TEST6_BRANCH_ID) == 0)
+ } else if (pj_stricmp2(&branch_param, TEST4_BRANCH_ID) == 0 ||
+ pj_stricmp2(&branch_param, TEST5_BRANCH_ID) == 0 ||
+ pj_stricmp2(&branch_param, TEST6_BRANCH_ID) == 0)
{
/* TEST4_BRANCH_ID: absorbs retransmissions in TRYING state. */
@@ -863,12 +863,12 @@ static pj_bool_t on_rx_message(pjsip_rx_data *rdata)
pjsip_tsx_recv_msg(tsx, rdata);
save_key(tsx);
- if (pj_strcmp2(&branch_param, TEST4_BRANCH_ID) == 0) {
+ if (pj_stricmp2(&branch_param, TEST4_BRANCH_ID) == 0) {
- } else if (pj_strcmp2(&branch_param, TEST5_BRANCH_ID) == 0) {
+ } else if (pj_stricmp2(&branch_param, TEST5_BRANCH_ID) == 0) {
send_response(rdata, tsx, TEST5_PROVISIONAL_CODE);
- } else if (pj_strcmp2(&branch_param, TEST6_BRANCH_ID) == 0) {
+ } else if (pj_stricmp2(&branch_param, TEST6_BRANCH_ID) == 0) {
PJ_LOG(4,(THIS_FILE, " sending provisional response"));
send_response(rdata, tsx, TEST6_PROVISIONAL_CODE);
PJ_LOG(4,(THIS_FILE, " sending final response"));
@@ -882,11 +882,11 @@ static pj_bool_t on_rx_message(pjsip_rx_data *rdata)
++recv_count;
- if (pj_strcmp2(&branch_param, TEST4_BRANCH_ID) == 0) {
+ if (pj_stricmp2(&branch_param, TEST4_BRANCH_ID) == 0) {
PJ_LOG(3,(THIS_FILE, " error: not expecting response!"));
test_complete = -132;
- } else if (pj_strcmp2(&branch_param, TEST5_BRANCH_ID) == 0) {
+ } else if (pj_stricmp2(&branch_param, TEST5_BRANCH_ID) == 0) {
if (rdata->msg_info.msg->line.status.code!=TEST5_PROVISIONAL_CODE) {
PJ_LOG(3,(THIS_FILE, " error: incorrect status code!"));
@@ -898,7 +898,7 @@ static pj_bool_t on_rx_message(pjsip_rx_data *rdata)
test_complete = -134;
}
- } else if (pj_strcmp2(&branch_param, TEST6_BRANCH_ID) == 0) {
+ } else if (pj_stricmp2(&branch_param, TEST6_BRANCH_ID) == 0) {
int code = rdata->msg_info.msg->line.status.code;
@@ -927,8 +927,8 @@ static pj_bool_t on_rx_message(pjsip_rx_data *rdata)
return PJ_TRUE;
- } else if (pj_strcmp2(&branch_param, TEST7_BRANCH_ID) == 0 ||
- pj_strcmp2(&branch_param, TEST8_BRANCH_ID) == 0)
+ } else if (pj_stricmp2(&branch_param, TEST7_BRANCH_ID) == 0 ||
+ pj_stricmp2(&branch_param, TEST8_BRANCH_ID) == 0)
{
/*
@@ -950,7 +950,7 @@ static pj_bool_t on_rx_message(pjsip_rx_data *rdata)
pjsip_tsx_recv_msg(tsx, rdata);
save_key(tsx);
- if (pj_strcmp2(&branch_param, TEST7_BRANCH_ID) == 0) {
+ if (pj_stricmp2(&branch_param, TEST7_BRANCH_ID) == 0) {
send_response(rdata, tsx, TEST7_STATUS_CODE);
@@ -965,7 +965,7 @@ static pj_bool_t on_rx_message(pjsip_rx_data *rdata)
++recv_count;
- if (pj_strcmp2(&branch_param, TEST7_BRANCH_ID) == 0)
+ if (pj_stricmp2(&branch_param, TEST7_BRANCH_ID) == 0)
code = TEST7_STATUS_CODE;
else
code = TEST8_STATUS_CODE;
@@ -1013,7 +1013,7 @@ static pj_bool_t on_rx_message(pjsip_rx_data *rdata)
}
return PJ_TRUE;
- } else if (pj_strcmp2(&branch_param, TEST9_BRANCH_ID) == 0) {
+ } else if (pj_stricmp2(&branch_param, TEST9_BRANCH_ID) == 0) {
/*
* TEST9_BRANCH_ID tests that the retransmission of INVITE final
@@ -1118,15 +1118,15 @@ static pj_bool_t on_rx_message(pjsip_rx_data *rdata)
}
return PJ_TRUE;
- } else if (pj_strcmp2(&branch_param, TEST10_BRANCH_ID) == 0 ||
- pj_strcmp2(&branch_param, TEST11_BRANCH_ID) == 0 ||
- pj_strcmp2(&branch_param, TEST12_BRANCH_ID) == 0)
+ } else if (pj_stricmp2(&branch_param, TEST10_BRANCH_ID) == 0 ||
+ pj_stricmp2(&branch_param, TEST11_BRANCH_ID) == 0 ||
+ pj_stricmp2(&branch_param, TEST12_BRANCH_ID) == 0)
{
int test_num, code1, code2;
- if (pj_strcmp2(&branch_param, TEST10_BRANCH_ID) == 0)
+ if (pj_stricmp2(&branch_param, TEST10_BRANCH_ID) == 0)
test_num=10, code1 = 100, code2 = 0;
- else if (pj_strcmp2(&branch_param, TEST11_BRANCH_ID) == 0)
+ else if (pj_stricmp2(&branch_param, TEST11_BRANCH_ID) == 0)
test_num=11, code1 = 100, code2 = 200;
else
test_num=12, code1 = 200, code2 = 0;
diff --git a/pjsip/src/test/uri_test.c b/pjsip/src/test/uri_test.c
index 8527faa..c8b0b3e 100644
--- a/pjsip/src/test/uri_test.c
+++ b/pjsip/src/test/uri_test.c
@@ -1,4 +1,4 @@
-/* $Id: uri_test.c 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id: uri_test.c 4210 2012-07-19 01:00:07Z ming $ */
/*
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
* Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org>
@@ -67,6 +67,7 @@ static pjsip_uri *create_uri14( pj_pool_t *pool );
static pjsip_uri *create_uri15( pj_pool_t *pool );
static pjsip_uri *create_uri16( pj_pool_t *pool );
static pjsip_uri *create_uri17( pj_pool_t *pool );
+static pjsip_uri *create_uri18( pj_pool_t *pool );
static pjsip_uri *create_uri25( pj_pool_t *pool );
static pjsip_uri *create_uri26( pj_pool_t *pool );
static pjsip_uri *create_uri27( pj_pool_t *pool );
@@ -81,6 +82,7 @@ static pjsip_uri *create_uri35( pj_pool_t *pool );
static pjsip_uri *create_uri36( pj_pool_t *pool );
static pjsip_uri *create_uri37( pj_pool_t *pool );
static pjsip_uri *create_uri38( pj_pool_t *pool );
+static pjsip_uri *create_uri39( pj_pool_t *pool );
static pjsip_uri *create_dummy( pj_pool_t *pool );
#define ERR_NOT_EQUAL -1001
@@ -349,6 +351,12 @@ struct uri_test
"\xC0\x81 <sip:localhost>",
&create_uri38,
"\"\xC0\x81\" <sip:localhost>"
+ },
+ {
+ /* Even number of backslash before end quote in display name. */
+ PJ_SUCCESS,
+ "\"User\\\\\" <sip:localhost>",
+ &create_uri39,
}
};
@@ -759,6 +767,20 @@ static pjsip_uri *create_uri38( pj_pool_t *pool )
}
+/* "\"User\\\\\" <sip:localhost>" */
+static pjsip_uri *create_uri39(pj_pool_t *pool)
+{
+ pjsip_name_addr *name_addr = pjsip_name_addr_create(pool);
+ pjsip_sip_uri *url;
+
+ url = pjsip_sip_uri_create(pool, 0);
+ name_addr->uri = (pjsip_uri*) url;
+
+ pj_strdup2(pool, &name_addr->display, "User\\\\");
+ pj_strdup2(pool, &url->host, "localhost");
+ return (pjsip_uri*)name_addr;
+}
+
static pjsip_uri *create_dummy(pj_pool_t *pool)
{
PJ_UNUSED_ARG(pool);