diff options
-rw-r--r-- | build.symbian/pjnathU.def | 81 | ||||
-rw-r--r-- | build.symbian/pjsua_libU.def | 81 | ||||
-rw-r--r-- | pjlib/include/pj/config_site_sample.h | 2 | ||||
-rw-r--r-- | pjnath/src/pjnath/nat_detect.c | 10 | ||||
-rw-r--r-- | pjsip-apps/src/symbian_ua/main_symbian.cpp | 2 |
5 files changed, 89 insertions, 87 deletions
diff --git a/build.symbian/pjnathU.def b/build.symbian/pjnathU.def index 1749f15d..db4c2823 100644 --- a/build.symbian/pjnathU.def +++ b/build.symbian/pjnathU.def @@ -45,43 +45,44 @@ EXPORTS pj_stun_get_class_name @ 44 NONAME pj_stun_get_err_reason @ 45 NONAME pj_stun_get_method_name @ 46 NONAME - pj_stun_msg_add_attr @ 47 NONAME - pj_stun_msg_add_binary_attr @ 48 NONAME - pj_stun_msg_add_empty_attr @ 49 NONAME - pj_stun_msg_add_errcode_attr @ 50 NONAME - pj_stun_msg_add_msgint_attr @ 51 NONAME - pj_stun_msg_add_sockaddr_attr @ 52 NONAME - pj_stun_msg_add_string_attr @ 53 NONAME - pj_stun_msg_add_uint64_attr @ 54 NONAME - pj_stun_msg_add_uint_attr @ 55 NONAME - pj_stun_msg_add_unknown_attr @ 56 NONAME - pj_stun_msg_check @ 57 NONAME - pj_stun_msg_create @ 58 NONAME - pj_stun_msg_create_response @ 59 NONAME - pj_stun_msg_decode @ 60 NONAME - pj_stun_msg_destroy_tdata @ 61 NONAME - pj_stun_msg_dump @ 62 NONAME - pj_stun_msg_encode @ 63 NONAME - pj_stun_msg_find_attr @ 64 NONAME - pj_stun_msgint_attr_create @ 65 NONAME - pj_stun_session_cancel_req @ 66 NONAME - pj_stun_session_create @ 67 NONAME - pj_stun_session_create_ind @ 68 NONAME - pj_stun_session_create_req @ 69 NONAME - pj_stun_session_create_res @ 70 NONAME - pj_stun_session_destroy @ 71 NONAME - pj_stun_session_get_user_data @ 72 NONAME - pj_stun_session_on_rx_pkt @ 73 NONAME - pj_stun_session_retransmit_req @ 74 NONAME - pj_stun_session_send_msg @ 75 NONAME - pj_stun_session_set_credential @ 76 NONAME - pj_stun_session_set_server_name @ 77 NONAME - pj_stun_session_set_user_data @ 78 NONAME - pj_stun_set_padding_char @ 79 NONAME - pj_stun_sockaddr_attr_create @ 80 NONAME - pj_stun_string_attr_create @ 81 NONAME - pj_stun_uint64_attr_create @ 82 NONAME - pj_stun_uint_attr_create @ 83 NONAME - pj_stun_unknown_attr_create @ 84 NONAME - pjnath_init @ 85 NONAME - pjnath_perror @ 86 NONAME + pj_stun_get_nat_name @ 47 NONAME + pj_stun_msg_add_attr @ 48 NONAME + pj_stun_msg_add_binary_attr @ 49 NONAME + pj_stun_msg_add_empty_attr @ 50 NONAME + pj_stun_msg_add_errcode_attr @ 51 NONAME + pj_stun_msg_add_msgint_attr @ 52 NONAME + pj_stun_msg_add_sockaddr_attr @ 53 NONAME + pj_stun_msg_add_string_attr @ 54 NONAME + pj_stun_msg_add_uint64_attr @ 55 NONAME + pj_stun_msg_add_uint_attr @ 56 NONAME + pj_stun_msg_add_unknown_attr @ 57 NONAME + pj_stun_msg_check @ 58 NONAME + pj_stun_msg_create @ 59 NONAME + pj_stun_msg_create_response @ 60 NONAME + pj_stun_msg_decode @ 61 NONAME + pj_stun_msg_destroy_tdata @ 62 NONAME + pj_stun_msg_dump @ 63 NONAME + pj_stun_msg_encode @ 64 NONAME + pj_stun_msg_find_attr @ 65 NONAME + pj_stun_msgint_attr_create @ 66 NONAME + pj_stun_session_cancel_req @ 67 NONAME + pj_stun_session_create @ 68 NONAME + pj_stun_session_create_ind @ 69 NONAME + pj_stun_session_create_req @ 70 NONAME + pj_stun_session_create_res @ 71 NONAME + pj_stun_session_destroy @ 72 NONAME + pj_stun_session_get_user_data @ 73 NONAME + pj_stun_session_on_rx_pkt @ 74 NONAME + pj_stun_session_retransmit_req @ 75 NONAME + pj_stun_session_send_msg @ 76 NONAME + pj_stun_session_set_credential @ 77 NONAME + pj_stun_session_set_server_name @ 78 NONAME + pj_stun_session_set_user_data @ 79 NONAME + pj_stun_set_padding_char @ 80 NONAME + pj_stun_sockaddr_attr_create @ 81 NONAME + pj_stun_string_attr_create @ 82 NONAME + pj_stun_uint64_attr_create @ 83 NONAME + pj_stun_uint_attr_create @ 84 NONAME + pj_stun_unknown_attr_create @ 85 NONAME + pjnath_init @ 86 NONAME + pjnath_perror @ 87 NONAME diff --git a/build.symbian/pjsua_libU.def b/build.symbian/pjsua_libU.def index 39465fd9..932587e5 100644 --- a/build.symbian/pjsua_libU.def +++ b/build.symbian/pjsua_libU.def @@ -75,43 +75,44 @@ EXPORTS pjsua_enum_transports @ 74 NONAME pjsua_get_buddy_count @ 75 NONAME pjsua_get_ec_tail @ 76 NONAME - pjsua_get_pjmedia_endpt @ 77 NONAME - pjsua_get_pjsip_endpt @ 78 NONAME - pjsua_get_pool_factory @ 79 NONAME - pjsua_get_snd_dev @ 80 NONAME - pjsua_handle_events @ 81 NONAME - pjsua_im_send @ 82 NONAME - pjsua_im_typing @ 83 NONAME - pjsua_init @ 84 NONAME - pjsua_logging_config_default @ 85 NONAME - pjsua_logging_config_dup @ 86 NONAME - pjsua_media_config_default @ 87 NONAME - pjsua_media_transports_create @ 88 NONAME - pjsua_msg_data_init @ 89 NONAME - pjsua_perror @ 90 NONAME - pjsua_player_create @ 91 NONAME - pjsua_player_destroy @ 92 NONAME - pjsua_player_get_conf_port @ 93 NONAME - pjsua_player_get_port @ 94 NONAME - pjsua_player_set_pos @ 95 NONAME - pjsua_playlist_create @ 96 NONAME - pjsua_pool_create @ 97 NONAME - pjsua_pres_dump @ 98 NONAME - pjsua_reconfigure_logging @ 99 NONAME - pjsua_recorder_create @ 100 NONAME - pjsua_recorder_destroy @ 101 NONAME - pjsua_recorder_get_conf_port @ 102 NONAME - pjsua_recorder_get_port @ 103 NONAME - pjsua_set_ec @ 104 NONAME - pjsua_set_no_snd_dev @ 105 NONAME - pjsua_set_null_snd_dev @ 106 NONAME - pjsua_set_snd_dev @ 107 NONAME - pjsua_start @ 108 NONAME - pjsua_transport_close @ 109 NONAME - pjsua_transport_config_default @ 110 NONAME - pjsua_transport_config_dup @ 111 NONAME - pjsua_transport_create @ 112 NONAME - pjsua_transport_get_info @ 113 NONAME - pjsua_transport_register @ 114 NONAME - pjsua_transport_set_enable @ 115 NONAME - pjsua_verify_sip_url @ 116 NONAME + pjsua_get_nat_type @ 77 NONAME + pjsua_get_pjmedia_endpt @ 78 NONAME + pjsua_get_pjsip_endpt @ 79 NONAME + pjsua_get_pool_factory @ 80 NONAME + pjsua_get_snd_dev @ 81 NONAME + pjsua_handle_events @ 82 NONAME + pjsua_im_send @ 83 NONAME + pjsua_im_typing @ 84 NONAME + pjsua_init @ 85 NONAME + pjsua_logging_config_default @ 86 NONAME + pjsua_logging_config_dup @ 87 NONAME + pjsua_media_config_default @ 88 NONAME + pjsua_media_transports_create @ 89 NONAME + pjsua_msg_data_init @ 90 NONAME + pjsua_perror @ 91 NONAME + pjsua_player_create @ 92 NONAME + pjsua_player_destroy @ 93 NONAME + pjsua_player_get_conf_port @ 94 NONAME + pjsua_player_get_port @ 95 NONAME + pjsua_player_set_pos @ 96 NONAME + pjsua_playlist_create @ 97 NONAME + pjsua_pool_create @ 98 NONAME + pjsua_pres_dump @ 99 NONAME + pjsua_reconfigure_logging @ 100 NONAME + pjsua_recorder_create @ 101 NONAME + pjsua_recorder_destroy @ 102 NONAME + pjsua_recorder_get_conf_port @ 103 NONAME + pjsua_recorder_get_port @ 104 NONAME + pjsua_set_ec @ 105 NONAME + pjsua_set_no_snd_dev @ 106 NONAME + pjsua_set_null_snd_dev @ 107 NONAME + pjsua_set_snd_dev @ 108 NONAME + pjsua_start @ 109 NONAME + pjsua_transport_close @ 110 NONAME + pjsua_transport_config_default @ 111 NONAME + pjsua_transport_config_dup @ 112 NONAME + pjsua_transport_create @ 113 NONAME + pjsua_transport_get_info @ 114 NONAME + pjsua_transport_register @ 115 NONAME + pjsua_transport_set_enable @ 116 NONAME + pjsua_verify_sip_url @ 117 NONAME diff --git a/pjlib/include/pj/config_site_sample.h b/pjlib/include/pj/config_site_sample.h index 3aa0fac6..85766517 100644 --- a/pjlib/include/pj/config_site_sample.h +++ b/pjlib/include/pj/config_site_sample.h @@ -41,7 +41,7 @@ # define PJMEDIA_SOUND_IMPLEMENTATION PJMEDIA_SOUND_NULL_SOUND /* Disable these */ -# define PJMEDIA_HAS_LIBRESAMPLE 0 +# define PJMEDIA_RESAMPLE_IMP PJMEDIA_RESAMPLE_NONE # define PJMEDIA_HAS_SPEEX_AEC 0 /* Disable all codecs but G.711, for now */ diff --git a/pjnath/src/pjnath/nat_detect.c b/pjnath/src/pjnath/nat_detect.c index 368c86fb..aa0615b9 100644 --- a/pjnath/src/pjnath/nat_detect.c +++ b/pjnath/src/pjnath/nat_detect.c @@ -169,7 +169,7 @@ static pj_status_t get_local_interface(const pj_sockaddr_in *server, int addr_len; pj_status_t status; - status = pj_sock_socket(PJ_AF_INET, PJ_SOCK_DGRAM, 0, &sock); + status = pj_sock_socket(pj_AF_INET(), pj_SOCK_DGRAM(), 0, &sock); if (status != PJ_SUCCESS) return status; @@ -244,7 +244,7 @@ PJ_DEF(pj_status_t) pj_stun_detect_nat_type(const pj_sockaddr_in *server, /* * Initialize socket. */ - status = pj_sock_socket(PJ_AF_INET, PJ_SOCK_DGRAM, 0, &sess->sock); + status = pj_sock_socket(pj_AF_INET(), pj_SOCK_DGRAM(), 0, &sess->sock); if (status != PJ_SUCCESS) goto on_error; @@ -252,7 +252,7 @@ PJ_DEF(pj_status_t) pj_stun_detect_nat_type(const pj_sockaddr_in *server, * Bind to any. */ pj_bzero(&sess->local_addr, sizeof(pj_sockaddr_in)); - sess->local_addr.sin_family = PJ_AF_INET; + sess->local_addr.sin_family = pj_AF_INET(); status = pj_sock_bind(sess->sock, &sess->local_addr, sizeof(pj_sockaddr_in)); if (status != PJ_SUCCESS) @@ -525,8 +525,8 @@ static void on_request_complete(pj_stun_session *stun_sess, if (test_id >= ST_MAX) { PJ_LOG(4,(sess->pool->obj_name, "Invalid transaction ID %u in response", test_id)); - end_session(sess, status, - PJ_STATUS_FROM_STUN_CODE(PJ_STUN_SC_SERVER_ERROR)); + end_session(sess, PJ_STATUS_FROM_STUN_CODE(PJ_STUN_SC_SERVER_ERROR), + PJ_STUN_NAT_TYPE_ERR_UNKNOWN); return; } diff --git a/pjsip-apps/src/symbian_ua/main_symbian.cpp b/pjsip-apps/src/symbian_ua/main_symbian.cpp index f2c74bb3..62de1581 100644 --- a/pjsip-apps/src/symbian_ua/main_symbian.cpp +++ b/pjsip-apps/src/symbian_ua/main_symbian.cpp @@ -82,7 +82,7 @@ void MyTask::Start() void MyTask::RunL() { - int rc = ua_main(); + ua_main(); asw_->AsyncStop(); } |