SIMPLE test with FWD, and added more info in UI
git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@201 74dad513-b988-da41-8d7b-12977e46ad98
diff --git a/pjsip/src/pjsip-simple/evsub.c b/pjsip/src/pjsip-simple/evsub.c
index c1b8db8..be27db3 100644
--- a/pjsip/src/pjsip-simple/evsub.c
+++ b/pjsip/src/pjsip-simple/evsub.c
@@ -127,6 +127,8 @@
*/
TIMER_TYPE_UAC_WAIT_NOTIFY,
+ /* Max nb of timer types. */
+ TIMER_TYPE_MAX
};
static const char *timer_names[] =
@@ -136,6 +138,7 @@
"UAS_TIMEOUT"
"UAC_TERMINATE",
"UAC_WAIT_NOTIFY",
+ "INVALID_TIMER"
};
/*
@@ -249,6 +252,10 @@
PJ_DEF(pj_status_t) pjsip_evsub_init_module(pjsip_endpoint *endpt)
{
pj_status_t status;
+ pj_str_t method_tags[] = {
+ { "SUBSCRIBE", 9},
+ { "NOTIFY", 6}
+ };
PJ_ASSERT_RETURN(endpt != NULL, PJ_EINVAL);
PJ_ASSERT_RETURN(mod_evsub.mod.id == -1, PJ_EINVALIDOP);
@@ -275,6 +282,11 @@
/* Register SIP-event specific headers parser: */
pjsip_evsub_init_parser();
+ /* Register new methods SUBSCRIBE and NOTIFY in Allow-ed header */
+ pjsip_endpt_add_capability(endpt, &mod_evsub.mod, PJSIP_H_ALLOW, NULL,
+ 2, method_tags);
+
+ /* Done. */
return PJ_SUCCESS;
on_error:
@@ -436,6 +448,8 @@
pj_time_val timeout;
PJ_ASSERT_ON_FAIL(seconds > 0, return);
+ PJ_ASSERT_ON_FAIL(timer_id>TIMER_TYPE_NONE && timer_id<TIMER_TYPE_MAX,
+ return);
timeout.sec = seconds;
timeout.msec = 0;