diff options
author | Nanang Izzuddin <nanang@teluu.com> | 2010-02-25 11:58:19 +0000 |
---|---|---|
committer | Nanang Izzuddin <nanang@teluu.com> | 2010-02-25 11:58:19 +0000 |
commit | cd0277b8c369c89206409d767d47600d3ed38786 (patch) | |
tree | 4ea90a5de7fb5a5842fff3685ac600c93246050b /pjsip-apps/src/symbian_ua | |
parent | c80dd76f236e41c653a6e6e95c9fa44c586c6a34 (diff) |
More ticket #1032:
- Updated transport state notification callback to return void.
- Updated transport state enum to only contain connected and disconnected, no more bitmask value.
- Added direction field to SIP transport.
- Removed remote hostname hash from transport key.
- Updated cert info dump to return -1 when buffer is insufficient.
- Added new error code PJSIP_TLS_ECERTVERIF.
- Updated get_cert_name() in ssl_sock_symbian.c to use heap buffer instead of stack.
- Minors, e.g: added prefix PJ in cipher types, docs.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3110 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjsip-apps/src/symbian_ua')
-rw-r--r-- | pjsip-apps/src/symbian_ua/ua.cpp | 48 |
1 files changed, 23 insertions, 25 deletions
diff --git a/pjsip-apps/src/symbian_ua/ua.cpp b/pjsip-apps/src/symbian_ua/ua.cpp index 620e75a7..fb4b3c92 100644 --- a/pjsip-apps/src/symbian_ua/ua.cpp +++ b/pjsip-apps/src/symbian_ua/ua.cpp @@ -273,8 +273,9 @@ static void on_call_replaced(pjsua_call_id old_call_id, /* * Transport status notification */ -static pj_bool_t on_transport_state(pjsip_transport *tp, pj_uint32_t state, - const pjsip_transport_state_info *info) +static void on_transport_state(pjsip_transport *tp, + pjsip_transport_state state, + const pjsip_transport_state_info *info) { char host_port[128]; @@ -283,34 +284,32 @@ static pj_bool_t on_transport_state(pjsip_transport *tp, pj_uint32_t state, tp->remote_name.host.ptr, tp->remote_name.port); - if (state & PJSIP_TP_STATE_CONNECTED) { - PJ_LOG(3,(THIS_FILE, "SIP transport %s is connected to %s", - tp->type_name, host_port)); - } - else if (state & PJSIP_TP_STATE_ACCEPTED) { - PJ_LOG(3,(THIS_FILE, "SIP transport %s accepted %s", - tp->type_name, host_port)); - } - else if (state & PJSIP_TP_STATE_DISCONNECTED) { - char buf[100]; - - snprintf(buf, sizeof(buf), "SIP transport %s is disconnected from %s", - tp->type_name, host_port); - pjsua_perror(THIS_FILE, buf, info->status); - } - else if (state & PJSIP_TP_STATE_REJECTED) { - char buf[100]; + switch (state) { + case PJSIP_TP_STATE_CONNECTED: + { + PJ_LOG(3,(THIS_FILE, "SIP transport %s is connected to %s", + tp->type_name, host_port)); + } + break; + + case PJSIP_TP_STATE_DISCONNECTED: + { + char buf[100]; - snprintf(buf, sizeof(buf), "SIP transport %s rejected %s", - tp->type_name, host_port); - pjsua_perror(THIS_FILE, buf, info->status); + snprintf(buf, sizeof(buf), "SIP transport %s is disconnected from %s", + tp->type_name, host_port); + pjsua_perror(THIS_FILE, buf, info->status); + } + break; + + default: + break; } #if defined(PJSIP_HAS_TLS_TRANSPORT) && PJSIP_HAS_TLS_TRANSPORT!=0 if (!pj_ansi_stricmp(tp->type_name, "tls") && info->ext_info && - (state == PJSIP_TP_STATE_CONNECTED || - (state & PJSIP_TP_STATE_TLS_VERIF_ERROR))) + state == PJSIP_TP_STATE_CONNECTED) { pjsip_tls_state_info *tls_info = (pjsip_tls_state_info*)info->ext_info; pj_ssl_sock_info *ssl_sock_info = (pj_ssl_sock_info*) @@ -324,7 +323,6 @@ static pj_bool_t on_transport_state(pjsip_transport *tp, pj_uint32_t state, } #endif - return PJ_TRUE; } |