Index: /pjproject/trunk/build.symbian/pjlib.mmp
===================================================================
--- /pjproject/trunk/build.symbian/pjlib.mmp	(revision 1602)
+++ /pjproject/trunk/build.symbian/pjlib.mmp	(revision 1603)
@@ -62,5 +62,5 @@
 SOURCE		guid_simple.c
 SOURCE		ioqueue_symbian.cpp
-SOURCE		ip_helper_generic.c
+SOURCE		ip_helper_symbian.cpp
 SOURCE		log_writer_symbian_console.cpp
 SOURCE		os_core_symbian.cpp
Index: /pjproject/trunk/build.symbian/pjlibU.def
===================================================================
--- /pjproject/trunk/build.symbian/pjlibU.def	(revision 1602)
+++ /pjproject/trunk/build.symbian/pjlibU.def	(revision 1603)
@@ -90,213 +90,226 @@
 	pj_get_timestamp_freq                    @ 89 NONAME
 	pj_get_version                           @ 90 NONAME
-	pj_gethostaddr                           @ 91 NONAME
-	pj_gethostbyname                         @ 92 NONAME
-	pj_gethostip                             @ 93 NONAME
-	pj_gethostname                           @ 94 NONAME
-	pj_getpid                                @ 95 NONAME
-	pj_gettimeofday                          @ 96 NONAME
-	pj_hash_calc                             @ 97 NONAME
-	pj_hash_calc_tolower                     @ 98 NONAME
-	pj_hash_count                            @ 99 NONAME
-	pj_hash_create                           @ 100 NONAME
-	pj_hash_first                            @ 101 NONAME
-	pj_hash_get                              @ 102 NONAME
-	pj_hash_next                             @ 103 NONAME
-	pj_hash_set                              @ 104 NONAME
-	pj_hash_set_np                           @ 105 NONAME
-	pj_hash_this                             @ 106 NONAME
-	pj_htonl                                 @ 107 NONAME
-	pj_htons                                 @ 108 NONAME
-	pj_inet_addr                             @ 109 NONAME
-	pj_inet_addr2                            @ 110 NONAME
-	pj_inet_aton                             @ 111 NONAME
-	pj_inet_ntoa                             @ 112 NONAME
-	pj_inet_ntop                             @ 113 NONAME
-	pj_inet_pton                             @ 114 NONAME
-	pj_init                                  @ 115 NONAME
-	pj_ioqueue_accept                        @ 116 NONAME
-	pj_ioqueue_connect                       @ 117 NONAME
-	pj_ioqueue_create                        @ 118 NONAME
-	pj_ioqueue_destroy                       @ 119 NONAME
-	pj_ioqueue_get_user_data                 @ 120 NONAME
-	pj_ioqueue_is_pending                    @ 121 NONAME
-	pj_ioqueue_name                          @ 122 NONAME
-	pj_ioqueue_op_key_init                   @ 123 NONAME
-	pj_ioqueue_poll                          @ 124 NONAME
-	pj_ioqueue_post_completion               @ 125 NONAME
-	pj_ioqueue_recv                          @ 126 NONAME
-	pj_ioqueue_recvfrom                      @ 127 NONAME
-	pj_ioqueue_register_sock                 @ 128 NONAME
-	pj_ioqueue_send                          @ 129 NONAME
-	pj_ioqueue_sendto                        @ 130 NONAME
-	pj_ioqueue_set_lock                      @ 131 NONAME
-	pj_ioqueue_set_user_data                 @ 132 NONAME
-	pj_ioqueue_unregister                    @ 133 NONAME
-	pj_leave_critical_section                @ 134 NONAME
-	pj_list_erase                            @ 135 NONAME
-	pj_list_find_node                        @ 136 NONAME
-	pj_list_insert_after                     @ 137 NONAME
-	pj_list_insert_before                    @ 138 NONAME
-	pj_list_insert_nodes_after               @ 139 NONAME
-	pj_list_insert_nodes_before              @ 140 NONAME
-	pj_list_merge_first                      @ 141 NONAME
-	pj_list_merge_last                       @ 142 NONAME
-	pj_list_search                           @ 143 NONAME
-	pj_list_size                             @ 144 NONAME
-	pj_lock_acquire                          @ 145 NONAME
-	pj_lock_create_null_mutex                @ 146 NONAME
-	pj_lock_create_recursive_mutex           @ 147 NONAME
-	pj_lock_create_semaphore                 @ 148 NONAME
-	pj_lock_create_simple_mutex              @ 149 NONAME
-	pj_lock_destroy                          @ 150 NONAME
-	pj_lock_release                          @ 151 NONAME
-	pj_lock_tryacquire                       @ 152 NONAME
-	pj_log                                   @ 153 NONAME
-	pj_log_1                                 @ 154 NONAME
-	pj_log_2                                 @ 155 NONAME
-	pj_log_3                                 @ 156 NONAME
-	pj_log_4                                 @ 157 NONAME
-	pj_log_5                                 @ 158 NONAME
-	pj_log_get_decor                         @ 159 NONAME
-	pj_log_get_level                         @ 160 NONAME
-	pj_log_get_log_func                      @ 161 NONAME
-	pj_log_set_decor                         @ 162 NONAME
-	pj_log_set_level                         @ 163 NONAME
-	pj_log_set_log_func                      @ 164 NONAME
-	pj_log_write                             @ 165 NONAME
-	pj_mutex_create                          @ 166 NONAME
-	pj_mutex_create_recursive                @ 167 NONAME
-	pj_mutex_create_simple                   @ 168 NONAME
-	pj_mutex_destroy                         @ 169 NONAME
-	pj_mutex_lock                            @ 170 NONAME
-	pj_mutex_trylock                         @ 171 NONAME
-	pj_mutex_unlock                          @ 172 NONAME
-	pj_ntohl                                 @ 173 NONAME
-	pj_ntohs                                 @ 174 NONAME
-	pj_pool_alloc                            @ 175 NONAME
-	pj_pool_alloc_from_block                 @ 176 NONAME
-	pj_pool_allocate_find                    @ 177 NONAME
-	pj_pool_calloc                           @ 178 NONAME
-	pj_pool_create                           @ 179 NONAME
-	pj_pool_create_int                       @ 180 NONAME
-	pj_pool_create_on_buf                    @ 181 NONAME
-	pj_pool_destroy_int                      @ 182 NONAME
-	pj_pool_factory_default_policy           @ 183 NONAME
-	pj_pool_factory_get_default_policy       @ 184 NONAME
-	pj_pool_get_capacity                     @ 185 NONAME
-	pj_pool_get_used_size                    @ 186 NONAME
-	pj_pool_getobjname                       @ 187 NONAME
-	pj_pool_init_int                         @ 188 NONAME
-	pj_pool_release                          @ 189 NONAME
-	pj_pool_reset                            @ 190 NONAME
-	pj_rand                                  @ 191 NONAME
-	pj_rbtree_erase                          @ 192 NONAME
-	pj_rbtree_find                           @ 193 NONAME
-	pj_rbtree_first                          @ 194 NONAME
-	pj_rbtree_init                           @ 195 NONAME
-	pj_rbtree_insert                         @ 196 NONAME
-	pj_rbtree_last                           @ 197 NONAME
-	pj_rbtree_max_height                     @ 198 NONAME
-	pj_rbtree_min_height                     @ 199 NONAME
-	pj_rbtree_next                           @ 200 NONAME
-	pj_rbtree_prev                           @ 201 NONAME
-	pj_register_strerror                     @ 202 NONAME
-	pj_rwmutex_create                        @ 203 NONAME
-	pj_rwmutex_destroy                       @ 204 NONAME
-	pj_rwmutex_lock_read                     @ 205 NONAME
-	pj_rwmutex_lock_write                    @ 206 NONAME
-	pj_rwmutex_unlock_read                   @ 207 NONAME
-	pj_rwmutex_unlock_write                  @ 208 NONAME
-	pj_sem_create                            @ 209 NONAME
-	pj_sem_destroy                           @ 210 NONAME
-	pj_sem_post                              @ 211 NONAME
-	pj_sem_trywait                           @ 212 NONAME
-	pj_sem_wait                              @ 213 NONAME
-	pj_set_netos_error                       @ 214 NONAME
-	pj_set_os_error                          @ 215 NONAME
-	pj_shutdown                              @ 216 NONAME
-	pj_sock_accept                           @ 217 NONAME
-	pj_sock_bind                             @ 218 NONAME
-	pj_sock_bind_in                          @ 219 NONAME
-	pj_sock_close                            @ 220 NONAME
-	pj_sock_connect                          @ 221 NONAME
-	pj_sock_getpeername                      @ 222 NONAME
-	pj_sock_getsockname                      @ 223 NONAME
-	pj_sock_getsockopt                       @ 224 NONAME
-	pj_sock_listen                           @ 225 NONAME
-	pj_sock_recv                             @ 226 NONAME
-	pj_sock_recvfrom                         @ 227 NONAME
-	pj_sock_select                           @ 228 NONAME
-	pj_sock_send                             @ 229 NONAME
-	pj_sock_sendto                           @ 230 NONAME
-	pj_sock_setsockopt                       @ 231 NONAME
-	pj_sock_shutdown                         @ 232 NONAME
-	pj_sock_socket                           @ 233 NONAME
-	pj_sockaddr_in_init                      @ 234 NONAME
-	pj_sockaddr_in_set_str_addr              @ 235 NONAME
-	pj_srand                                 @ 236 NONAME
-	pj_str                                   @ 237 NONAME
-	pj_strassign                             @ 238 NONAME
-	pj_strcat                                @ 239 NONAME
-	pj_strcat2                               @ 240 NONAME
-	pj_strcmp                                @ 241 NONAME
-	pj_strcmp2                               @ 242 NONAME
-	pj_strcpy                                @ 243 NONAME
-	pj_strcpy2                               @ 244 NONAME
-	pj_strdup                                @ 245 NONAME
-	pj_strdup2                               @ 246 NONAME
-	pj_strdup2_with_null                     @ 247 NONAME
-	pj_strdup3                               @ 248 NONAME
-	pj_strdup_with_null                      @ 249 NONAME
-	pj_strerror                              @ 250 NONAME
-	pj_stricmp                               @ 251 NONAME
-	pj_stricmp2                              @ 252 NONAME
-	pj_strltrim                              @ 253 NONAME
-	pj_strncmp                               @ 254 NONAME
-	pj_strncmp2                              @ 255 NONAME
-	pj_strncpy                               @ 256 NONAME
-	pj_strncpy_with_null                     @ 257 NONAME
-	pj_strnicmp                              @ 258 NONAME
-	pj_strnicmp2                             @ 259 NONAME
-	pj_strrtrim                              @ 260 NONAME
-	pj_strtoul                               @ 261 NONAME
-	pj_strtoul2                              @ 262 NONAME
-	pj_strtrim                               @ 263 NONAME
-	pj_symbianos_poll                        @ 264 NONAME
-	pj_symbianos_set_params                  @ 265 NONAME
-	pj_thread_create                         @ 266 NONAME
-	pj_thread_destroy                        @ 267 NONAME
-	pj_thread_get_name                       @ 268 NONAME
-	pj_thread_get_os_handle                  @ 269 NONAME
-	pj_thread_is_registered                  @ 270 NONAME
-	pj_thread_join                           @ 271 NONAME
-	pj_thread_local_alloc                    @ 272 NONAME
-	pj_thread_local_free                     @ 273 NONAME
-	pj_thread_local_get                      @ 274 NONAME
-	pj_thread_local_set                      @ 275 NONAME
-	pj_thread_register                       @ 276 NONAME
-	pj_thread_resume                         @ 277 NONAME
-	pj_thread_sleep                          @ 278 NONAME
-	pj_thread_this                           @ 279 NONAME
-	pj_time_decode                           @ 280 NONAME
-	pj_time_encode                           @ 281 NONAME
-	pj_time_gmt_to_local                     @ 282 NONAME
-	pj_time_local_to_gmt                     @ 283 NONAME
-	pj_time_val_normalize                    @ 284 NONAME
-	pj_timer_entry_init                      @ 285 NONAME
-	pj_timer_heap_cancel                     @ 286 NONAME
-	pj_timer_heap_count                      @ 287 NONAME
-	pj_timer_heap_create                     @ 288 NONAME
-	pj_timer_heap_destroy                    @ 289 NONAME
-	pj_timer_heap_earliest_time              @ 290 NONAME
-	pj_timer_heap_mem_size                   @ 291 NONAME
-	pj_timer_heap_poll                       @ 292 NONAME
-	pj_timer_heap_schedule                   @ 293 NONAME
-	pj_timer_heap_set_lock                   @ 294 NONAME
-	pj_timer_heap_set_max_timed_out_per_poll @ 295 NONAME
-	pj_unicode_to_ansi                       @ 296 NONAME
-	pj_utoa                                  @ 297 NONAME
-	pj_utoa_pad                              @ 298 NONAME
-	platform_strerror                        @ 299 NONAME
-	snprintf                                 @ 300 NONAME
-	vsnprintf                                @ 301 NONAME
+	pj_getaddrinfo                           @ 91 NONAME
+	pj_getdefaultipinterface                 @ 92 NONAME
+	pj_gethostaddr                           @ 93 NONAME
+	pj_gethostbyname                         @ 94 NONAME
+	pj_gethostip                             @ 95 NONAME
+	pj_gethostname                           @ 96 NONAME
+	pj_getpid                                @ 97 NONAME
+	pj_gettimeofday                          @ 98 NONAME
+	pj_hash_calc                             @ 99 NONAME
+	pj_hash_calc_tolower                     @ 100 NONAME
+	pj_hash_count                            @ 101 NONAME
+	pj_hash_create                           @ 102 NONAME
+	pj_hash_first                            @ 103 NONAME
+	pj_hash_get                              @ 104 NONAME
+	pj_hash_next                             @ 105 NONAME
+	pj_hash_set                              @ 106 NONAME
+	pj_hash_set_np                           @ 107 NONAME
+	pj_hash_this                             @ 108 NONAME
+	pj_htonl                                 @ 109 NONAME
+	pj_htons                                 @ 110 NONAME
+	pj_inet_addr                             @ 111 NONAME
+	pj_inet_addr2                            @ 112 NONAME
+	pj_inet_aton                             @ 113 NONAME
+	pj_inet_ntoa                             @ 114 NONAME
+	pj_inet_ntop                             @ 115 NONAME
+	pj_inet_pton                             @ 116 NONAME
+	pj_init                                  @ 117 NONAME
+	pj_ioqueue_accept                        @ 118 NONAME
+	pj_ioqueue_connect                       @ 119 NONAME
+	pj_ioqueue_create                        @ 120 NONAME
+	pj_ioqueue_destroy                       @ 121 NONAME
+	pj_ioqueue_get_user_data                 @ 122 NONAME
+	pj_ioqueue_is_pending                    @ 123 NONAME
+	pj_ioqueue_name                          @ 124 NONAME
+	pj_ioqueue_op_key_init                   @ 125 NONAME
+	pj_ioqueue_poll                          @ 126 NONAME
+	pj_ioqueue_post_completion               @ 127 NONAME
+	pj_ioqueue_recv                          @ 128 NONAME
+	pj_ioqueue_recvfrom                      @ 129 NONAME
+	pj_ioqueue_register_sock                 @ 130 NONAME
+	pj_ioqueue_send                          @ 131 NONAME
+	pj_ioqueue_sendto                        @ 132 NONAME
+	pj_ioqueue_set_lock                      @ 133 NONAME
+	pj_ioqueue_set_user_data                 @ 134 NONAME
+	pj_ioqueue_unregister                    @ 135 NONAME
+	pj_leave_critical_section                @ 136 NONAME
+	pj_list_erase                            @ 137 NONAME
+	pj_list_find_node                        @ 138 NONAME
+	pj_list_insert_after                     @ 139 NONAME
+	pj_list_insert_before                    @ 140 NONAME
+	pj_list_insert_nodes_after               @ 141 NONAME
+	pj_list_insert_nodes_before              @ 142 NONAME
+	pj_list_merge_first                      @ 143 NONAME
+	pj_list_merge_last                       @ 144 NONAME
+	pj_list_search                           @ 145 NONAME
+	pj_list_size                             @ 146 NONAME
+	pj_lock_acquire                          @ 147 NONAME
+	pj_lock_create_null_mutex                @ 148 NONAME
+	pj_lock_create_recursive_mutex           @ 149 NONAME
+	pj_lock_create_semaphore                 @ 150 NONAME
+	pj_lock_create_simple_mutex              @ 151 NONAME
+	pj_lock_destroy                          @ 152 NONAME
+	pj_lock_release                          @ 153 NONAME
+	pj_lock_tryacquire                       @ 154 NONAME
+	pj_log                                   @ 155 NONAME
+	pj_log_1                                 @ 156 NONAME
+	pj_log_2                                 @ 157 NONAME
+	pj_log_3                                 @ 158 NONAME
+	pj_log_4                                 @ 159 NONAME
+	pj_log_5                                 @ 160 NONAME
+	pj_log_get_decor                         @ 161 NONAME
+	pj_log_get_level                         @ 162 NONAME
+	pj_log_get_log_func                      @ 163 NONAME
+	pj_log_set_decor                         @ 164 NONAME
+	pj_log_set_level                         @ 165 NONAME
+	pj_log_set_log_func                      @ 166 NONAME
+	pj_log_write                             @ 167 NONAME
+	pj_mutex_create                          @ 168 NONAME
+	pj_mutex_create_recursive                @ 169 NONAME
+	pj_mutex_create_simple                   @ 170 NONAME
+	pj_mutex_destroy                         @ 171 NONAME
+	pj_mutex_lock                            @ 172 NONAME
+	pj_mutex_trylock                         @ 173 NONAME
+	pj_mutex_unlock                          @ 174 NONAME
+	pj_ntohl                                 @ 175 NONAME
+	pj_ntohs                                 @ 176 NONAME
+	pj_pool_alloc                            @ 177 NONAME
+	pj_pool_alloc_from_block                 @ 178 NONAME
+	pj_pool_allocate_find                    @ 179 NONAME
+	pj_pool_calloc                           @ 180 NONAME
+	pj_pool_create                           @ 181 NONAME
+	pj_pool_create_int                       @ 182 NONAME
+	pj_pool_create_on_buf                    @ 183 NONAME
+	pj_pool_destroy_int                      @ 184 NONAME
+	pj_pool_factory_default_policy           @ 185 NONAME
+	pj_pool_factory_get_default_policy       @ 186 NONAME
+	pj_pool_get_capacity                     @ 187 NONAME
+	pj_pool_get_used_size                    @ 188 NONAME
+	pj_pool_getobjname                       @ 189 NONAME
+	pj_pool_init_int                         @ 190 NONAME
+	pj_pool_release                          @ 191 NONAME
+	pj_pool_reset                            @ 192 NONAME
+	pj_rand                                  @ 193 NONAME
+	pj_rbtree_erase                          @ 194 NONAME
+	pj_rbtree_find                           @ 195 NONAME
+	pj_rbtree_first                          @ 196 NONAME
+	pj_rbtree_init                           @ 197 NONAME
+	pj_rbtree_insert                         @ 198 NONAME
+	pj_rbtree_last                           @ 199 NONAME
+	pj_rbtree_max_height                     @ 200 NONAME
+	pj_rbtree_min_height                     @ 201 NONAME
+	pj_rbtree_next                           @ 202 NONAME
+	pj_rbtree_prev                           @ 203 NONAME
+	pj_register_strerror                     @ 204 NONAME
+	pj_rwmutex_create                        @ 205 NONAME
+	pj_rwmutex_destroy                       @ 206 NONAME
+	pj_rwmutex_lock_read                     @ 207 NONAME
+	pj_rwmutex_lock_write                    @ 208 NONAME
+	pj_rwmutex_unlock_read                   @ 209 NONAME
+	pj_rwmutex_unlock_write                  @ 210 NONAME
+	pj_sem_create                            @ 211 NONAME
+	pj_sem_destroy                           @ 212 NONAME
+	pj_sem_post                              @ 213 NONAME
+	pj_sem_trywait                           @ 214 NONAME
+	pj_sem_wait                              @ 215 NONAME
+	pj_set_netos_error                       @ 216 NONAME
+	pj_set_os_error                          @ 217 NONAME
+	pj_shutdown                              @ 218 NONAME
+	pj_sock_accept                           @ 219 NONAME
+	pj_sock_bind                             @ 220 NONAME
+	pj_sock_bind_in                          @ 221 NONAME
+	pj_sock_close                            @ 222 NONAME
+	pj_sock_connect                          @ 223 NONAME
+	pj_sock_getpeername                      @ 224 NONAME
+	pj_sock_getsockname                      @ 225 NONAME
+	pj_sock_getsockopt                       @ 226 NONAME
+	pj_sock_listen                           @ 227 NONAME
+	pj_sock_recv                             @ 228 NONAME
+	pj_sock_recvfrom                         @ 229 NONAME
+	pj_sock_select                           @ 230 NONAME
+	pj_sock_send                             @ 231 NONAME
+	pj_sock_sendto                           @ 232 NONAME
+	pj_sock_setsockopt                       @ 233 NONAME
+	pj_sock_shutdown                         @ 234 NONAME
+	pj_sock_socket                           @ 235 NONAME
+	pj_sockaddr_get_addr                     @ 236 NONAME
+	pj_sockaddr_get_addr_len                 @ 237 NONAME
+	pj_sockaddr_get_port                     @ 238 NONAME
+	pj_sockaddr_has_addr                     @ 239 NONAME
+	pj_sockaddr_in_get_addr                  @ 240 NONAME
+	pj_sockaddr_in_get_port                  @ 241 NONAME
+	pj_sockaddr_in_init                      @ 242 NONAME
+	pj_sockaddr_in_set_addr                  @ 243 NONAME
+	pj_sockaddr_in_set_port                  @ 244 NONAME
+	pj_sockaddr_in_set_str_addr              @ 245 NONAME
+	pj_sockaddr_init                         @ 246 NONAME
+	pj_sockaddr_set_port                     @ 247 NONAME
+	pj_sockaddr_set_str_addr                 @ 248 NONAME
+	pj_srand                                 @ 249 NONAME
+	pj_str                                   @ 250 NONAME
+	pj_strassign                             @ 251 NONAME
+	pj_strcat                                @ 252 NONAME
+	pj_strcat2                               @ 253 NONAME
+	pj_strcmp                                @ 254 NONAME
+	pj_strcmp2                               @ 255 NONAME
+	pj_strcpy                                @ 256 NONAME
+	pj_strcpy2                               @ 257 NONAME
+	pj_strdup                                @ 258 NONAME
+	pj_strdup2                               @ 259 NONAME
+	pj_strdup2_with_null                     @ 260 NONAME
+	pj_strdup3                               @ 261 NONAME
+	pj_strdup_with_null                      @ 262 NONAME
+	pj_strerror                              @ 263 NONAME
+	pj_stricmp                               @ 264 NONAME
+	pj_stricmp2                              @ 265 NONAME
+	pj_strltrim                              @ 266 NONAME
+	pj_strncmp                               @ 267 NONAME
+	pj_strncmp2                              @ 268 NONAME
+	pj_strncpy                               @ 269 NONAME
+	pj_strncpy_with_null                     @ 270 NONAME
+	pj_strnicmp                              @ 271 NONAME
+	pj_strnicmp2                             @ 272 NONAME
+	pj_strrtrim                              @ 273 NONAME
+	pj_strtoul                               @ 274 NONAME
+	pj_strtoul2                              @ 275 NONAME
+	pj_strtrim                               @ 276 NONAME
+	pj_symbianos_poll                        @ 277 NONAME
+	pj_symbianos_set_params                  @ 278 NONAME
+	pj_thread_create                         @ 279 NONAME
+	pj_thread_destroy                        @ 280 NONAME
+	pj_thread_get_name                       @ 281 NONAME
+	pj_thread_get_os_handle                  @ 282 NONAME
+	pj_thread_is_registered                  @ 283 NONAME
+	pj_thread_join                           @ 284 NONAME
+	pj_thread_local_alloc                    @ 285 NONAME
+	pj_thread_local_free                     @ 286 NONAME
+	pj_thread_local_get                      @ 287 NONAME
+	pj_thread_local_set                      @ 288 NONAME
+	pj_thread_register                       @ 289 NONAME
+	pj_thread_resume                         @ 290 NONAME
+	pj_thread_sleep                          @ 291 NONAME
+	pj_thread_this                           @ 292 NONAME
+	pj_time_decode                           @ 293 NONAME
+	pj_time_encode                           @ 294 NONAME
+	pj_time_gmt_to_local                     @ 295 NONAME
+	pj_time_local_to_gmt                     @ 296 NONAME
+	pj_time_val_normalize                    @ 297 NONAME
+	pj_timer_entry_init                      @ 298 NONAME
+	pj_timer_heap_cancel                     @ 299 NONAME
+	pj_timer_heap_count                      @ 300 NONAME
+	pj_timer_heap_create                     @ 301 NONAME
+	pj_timer_heap_destroy                    @ 302 NONAME
+	pj_timer_heap_earliest_time              @ 303 NONAME
+	pj_timer_heap_mem_size                   @ 304 NONAME
+	pj_timer_heap_poll                       @ 305 NONAME
+	pj_timer_heap_schedule                   @ 306 NONAME
+	pj_timer_heap_set_lock                   @ 307 NONAME
+	pj_timer_heap_set_max_timed_out_per_poll @ 308 NONAME
+	pj_unicode_to_ansi                       @ 309 NONAME
+	pj_utoa                                  @ 310 NONAME
+	pj_utoa_pad                              @ 311 NONAME
+	platform_strerror                        @ 312 NONAME
+	snprintf                                 @ 313 NONAME
+	vsnprintf                                @ 314 NONAME
Index: /pjproject/trunk/build.symbian/pjproject.cww
===================================================================
--- /pjproject/trunk/build.symbian/pjproject.cww	(revision 1602)
+++ /pjproject/trunk/build.symbian/pjproject.cww	(revision 1603)
@@ -315,6 +315,4 @@
         <SESSION>-2147483648</SESSION>
         <EDOCTYPE>20</EDOCTYPE>
-        <DEFAULT>true</DEFAULT>
-        <MAXIMIZED>true</MAXIMIZED>
         <FRAMELOC>
             <X>4</X>
@@ -341,5 +339,4 @@
         <SESSION>-2147483648</SESSION>
         <EDOCTYPE>36</EDOCTYPE>
-        <DEFAULT>true</DEFAULT>
         <FRAMELOC>
             <X>4</X>
@@ -366,6 +363,4 @@
         <SESSION>-2147483648</SESSION>
         <EDOCTYPE>23</EDOCTYPE>
-        <DEFAULT>true</DEFAULT>
-        <MAXIMIZED>true</MAXIMIZED>
         <FRAMELOC>
             <X>6</X>
Index: /pjproject/trunk/build.symbian/pjsipU.def
===================================================================
--- /pjproject/trunk/build.symbian/pjsipU.def	(revision 1602)
+++ /pjproject/trunk/build.symbian/pjsipU.def	(revision 1603)
@@ -223,52 +223,58 @@
 	pjsip_transport_get_default_port_for_type @ 222 NONAME
 	pjsip_transport_get_flag_from_type       @ 223 NONAME
-	pjsip_transport_get_type_from_flag       @ 224 NONAME
-	pjsip_transport_get_type_from_name       @ 225 NONAME
-	pjsip_transport_get_type_name            @ 226 NONAME
-	pjsip_transport_register                 @ 227 NONAME
-	pjsip_transport_register_type            @ 228 NONAME
-	pjsip_transport_send                     @ 229 NONAME
-	pjsip_transport_shutdown                 @ 230 NONAME
-	pjsip_tsx_create_key                     @ 231 NONAME
-	pjsip_tsx_create_uac                     @ 232 NONAME
-	pjsip_tsx_create_uas                     @ 233 NONAME
-	pjsip_tsx_get_dlg                        @ 234 NONAME
-	pjsip_tsx_layer_destroy                  @ 235 NONAME
-	pjsip_tsx_layer_dump                     @ 236 NONAME
-	pjsip_tsx_layer_find_tsx                 @ 237 NONAME
-	pjsip_tsx_layer_init_module              @ 238 NONAME
-	pjsip_tsx_layer_instance                 @ 239 NONAME
-	pjsip_tsx_recv_msg                       @ 240 NONAME
-	pjsip_tsx_retransmit_no_state            @ 241 NONAME
-	pjsip_tsx_send_msg                       @ 242 NONAME
-	pjsip_tsx_set_transport                  @ 243 NONAME
-	pjsip_tsx_state_str                      @ 244 NONAME
-	pjsip_tsx_stop_retransmit                @ 245 NONAME
-	pjsip_tsx_terminate                      @ 246 NONAME
-	pjsip_tx_data_add_ref                    @ 247 NONAME
-	pjsip_tx_data_create                     @ 248 NONAME
-	pjsip_tx_data_dec_ref                    @ 249 NONAME
-	pjsip_tx_data_get_info                   @ 250 NONAME
-	pjsip_tx_data_invalidate_msg             @ 251 NONAME
-	pjsip_tx_data_is_valid                   @ 252 NONAME
-	pjsip_tx_data_set_transport              @ 253 NONAME
-	pjsip_ua_destroy                         @ 254 NONAME
-	pjsip_ua_dump                            @ 255 NONAME
-	pjsip_ua_find_dialog                     @ 256 NONAME
-	pjsip_ua_get_endpt                       @ 257 NONAME
-	pjsip_ua_init_module                     @ 258 NONAME
-	pjsip_ua_instance                        @ 259 NONAME
-	pjsip_ua_register_dlg                    @ 260 NONAME
-	pjsip_ua_unregister_dlg                  @ 261 NONAME
-	pjsip_udp_transport_attach               @ 262 NONAME
-	pjsip_udp_transport_get_socket           @ 263 NONAME
-	pjsip_udp_transport_pause                @ 264 NONAME
-	pjsip_udp_transport_restart              @ 265 NONAME
-	pjsip_udp_transport_start                @ 266 NONAME
-	pjsip_unsupported_hdr_create             @ 267 NONAME
-	pjsip_unsupported_hdr_init               @ 268 NONAME
-	pjsip_via_hdr_create                     @ 269 NONAME
-	pjsip_via_hdr_init                       @ 270 NONAME
-	pjsip_warning_hdr_create                 @ 271 NONAME
-	pjsip_warning_hdr_create_from_status     @ 272 NONAME
-	pjsip_www_authenticate_hdr_create        @ 273 NONAME
+	pjsip_transport_get_type_desc            @ 224 NONAME
+	pjsip_transport_get_type_from_flag       @ 225 NONAME
+	pjsip_transport_get_type_from_name       @ 226 NONAME
+	pjsip_transport_get_type_name            @ 227 NONAME
+	pjsip_transport_register                 @ 228 NONAME
+	pjsip_transport_register_type            @ 229 NONAME
+	pjsip_transport_send                     @ 230 NONAME
+	pjsip_transport_shutdown                 @ 231 NONAME
+	pjsip_transport_type_get_af              @ 232 NONAME
+	pjsip_tsx_create_key                     @ 233 NONAME
+	pjsip_tsx_create_uac                     @ 234 NONAME
+	pjsip_tsx_create_uas                     @ 235 NONAME
+	pjsip_tsx_get_dlg                        @ 236 NONAME
+	pjsip_tsx_layer_destroy                  @ 237 NONAME
+	pjsip_tsx_layer_dump                     @ 238 NONAME
+	pjsip_tsx_layer_find_tsx                 @ 239 NONAME
+	pjsip_tsx_layer_get_tsx_count            @ 240 NONAME
+	pjsip_tsx_layer_init_module              @ 241 NONAME
+	pjsip_tsx_layer_instance                 @ 242 NONAME
+	pjsip_tsx_recv_msg                       @ 243 NONAME
+	pjsip_tsx_retransmit_no_state            @ 244 NONAME
+	pjsip_tsx_send_msg                       @ 245 NONAME
+	pjsip_tsx_set_transport                  @ 246 NONAME
+	pjsip_tsx_state_str                      @ 247 NONAME
+	pjsip_tsx_stop_retransmit                @ 248 NONAME
+	pjsip_tsx_terminate                      @ 249 NONAME
+	pjsip_tx_data_add_ref                    @ 250 NONAME
+	pjsip_tx_data_create                     @ 251 NONAME
+	pjsip_tx_data_dec_ref                    @ 252 NONAME
+	pjsip_tx_data_get_info                   @ 253 NONAME
+	pjsip_tx_data_invalidate_msg             @ 254 NONAME
+	pjsip_tx_data_is_valid                   @ 255 NONAME
+	pjsip_tx_data_set_transport              @ 256 NONAME
+	pjsip_ua_destroy                         @ 257 NONAME
+	pjsip_ua_dump                            @ 258 NONAME
+	pjsip_ua_find_dialog                     @ 259 NONAME
+	pjsip_ua_get_dlg_set_count               @ 260 NONAME
+	pjsip_ua_get_endpt                       @ 261 NONAME
+	pjsip_ua_init_module                     @ 262 NONAME
+	pjsip_ua_instance                        @ 263 NONAME
+	pjsip_ua_register_dlg                    @ 264 NONAME
+	pjsip_ua_unregister_dlg                  @ 265 NONAME
+	pjsip_udp_transport_attach               @ 266 NONAME
+	pjsip_udp_transport_attach2              @ 267 NONAME
+	pjsip_udp_transport_get_socket           @ 268 NONAME
+	pjsip_udp_transport_pause                @ 269 NONAME
+	pjsip_udp_transport_restart              @ 270 NONAME
+	pjsip_udp_transport_start                @ 271 NONAME
+	pjsip_udp_transport_start6               @ 272 NONAME
+	pjsip_unsupported_hdr_create             @ 273 NONAME
+	pjsip_unsupported_hdr_init               @ 274 NONAME
+	pjsip_via_hdr_create                     @ 275 NONAME
+	pjsip_via_hdr_init                       @ 276 NONAME
+	pjsip_warning_hdr_create                 @ 277 NONAME
+	pjsip_warning_hdr_create_from_status     @ 278 NONAME
+	pjsip_www_authenticate_hdr_create        @ 279 NONAME
Index: /pjproject/trunk/build.symbian/pjsip_uaU.def
===================================================================
--- /pjproject/trunk/build.symbian/pjsip_uaU.def	(revision 1602)
+++ /pjproject/trunk/build.symbian/pjsip_uaU.def	(revision 1603)
@@ -13,45 +13,46 @@
 	pjsip_get_refer_method                   @ 12 NONAME
 	pjsip_inv_answer                         @ 13 NONAME
-	pjsip_inv_create_uac                     @ 14 NONAME
-	pjsip_inv_create_uas                     @ 15 NONAME
-	pjsip_inv_end_session                    @ 16 NONAME
-	pjsip_inv_initial_answer                 @ 17 NONAME
-	pjsip_inv_invite                         @ 18 NONAME
-	pjsip_inv_reinvite                       @ 19 NONAME
-	pjsip_inv_send_msg                       @ 20 NONAME
-	pjsip_inv_set_sdp_answer                 @ 21 NONAME
-	pjsip_inv_state_name                     @ 22 NONAME
-	pjsip_inv_terminate                      @ 23 NONAME
-	pjsip_inv_update                         @ 24 NONAME
-	pjsip_inv_usage_init                     @ 25 NONAME
-	pjsip_inv_usage_instance                 @ 26 NONAME
-	pjsip_inv_verify_request                 @ 27 NONAME
-	pjsip_prack_method                       @ 28 NONAME
-	pjsip_refer_method                       @ 29 NONAME
-	pjsip_regc_add_headers                   @ 30 NONAME
-	pjsip_regc_create                        @ 31 NONAME
-	pjsip_regc_destroy                       @ 32 NONAME
-	pjsip_regc_get_info                      @ 33 NONAME
-	pjsip_regc_get_pool                      @ 34 NONAME
-	pjsip_regc_init                          @ 35 NONAME
-	pjsip_regc_register                      @ 36 NONAME
-	pjsip_regc_send                          @ 37 NONAME
-	pjsip_regc_set_credentials               @ 38 NONAME
-	pjsip_regc_set_prefs                     @ 39 NONAME
-	pjsip_regc_set_route_set                 @ 40 NONAME
-	pjsip_regc_set_transport                 @ 41 NONAME
-	pjsip_regc_unregister                    @ 42 NONAME
-	pjsip_regc_unregister_all                @ 43 NONAME
-	pjsip_regc_update_contact                @ 44 NONAME
-	pjsip_regc_update_expires                @ 45 NONAME
-	pjsip_replaces_hdr_create                @ 46 NONAME
-	pjsip_replaces_init_module               @ 47 NONAME
-	pjsip_replaces_verify_request            @ 48 NONAME
-	pjsip_xfer_accept                        @ 49 NONAME
-	pjsip_xfer_create_uac                    @ 50 NONAME
-	pjsip_xfer_create_uas                    @ 51 NONAME
-	pjsip_xfer_current_notify                @ 52 NONAME
-	pjsip_xfer_init_module                   @ 53 NONAME
-	pjsip_xfer_initiate                      @ 54 NONAME
-	pjsip_xfer_notify                        @ 55 NONAME
-	pjsip_xfer_send_request                  @ 56 NONAME
+	pjsip_inv_create_ack                     @ 14 NONAME
+	pjsip_inv_create_uac                     @ 15 NONAME
+	pjsip_inv_create_uas                     @ 16 NONAME
+	pjsip_inv_end_session                    @ 17 NONAME
+	pjsip_inv_initial_answer                 @ 18 NONAME
+	pjsip_inv_invite                         @ 19 NONAME
+	pjsip_inv_reinvite                       @ 20 NONAME
+	pjsip_inv_send_msg                       @ 21 NONAME
+	pjsip_inv_set_sdp_answer                 @ 22 NONAME
+	pjsip_inv_state_name                     @ 23 NONAME
+	pjsip_inv_terminate                      @ 24 NONAME
+	pjsip_inv_update                         @ 25 NONAME
+	pjsip_inv_usage_init                     @ 26 NONAME
+	pjsip_inv_usage_instance                 @ 27 NONAME
+	pjsip_inv_verify_request                 @ 28 NONAME
+	pjsip_prack_method                       @ 29 NONAME
+	pjsip_refer_method                       @ 30 NONAME
+	pjsip_regc_add_headers                   @ 31 NONAME
+	pjsip_regc_create                        @ 32 NONAME
+	pjsip_regc_destroy                       @ 33 NONAME
+	pjsip_regc_get_info                      @ 34 NONAME
+	pjsip_regc_get_pool                      @ 35 NONAME
+	pjsip_regc_init                          @ 36 NONAME
+	pjsip_regc_register                      @ 37 NONAME
+	pjsip_regc_send                          @ 38 NONAME
+	pjsip_regc_set_credentials               @ 39 NONAME
+	pjsip_regc_set_prefs                     @ 40 NONAME
+	pjsip_regc_set_route_set                 @ 41 NONAME
+	pjsip_regc_set_transport                 @ 42 NONAME
+	pjsip_regc_unregister                    @ 43 NONAME
+	pjsip_regc_unregister_all                @ 44 NONAME
+	pjsip_regc_update_contact                @ 45 NONAME
+	pjsip_regc_update_expires                @ 46 NONAME
+	pjsip_replaces_hdr_create                @ 47 NONAME
+	pjsip_replaces_init_module               @ 48 NONAME
+	pjsip_replaces_verify_request            @ 49 NONAME
+	pjsip_xfer_accept                        @ 50 NONAME
+	pjsip_xfer_create_uac                    @ 51 NONAME
+	pjsip_xfer_create_uas                    @ 52 NONAME
+	pjsip_xfer_current_notify                @ 53 NONAME
+	pjsip_xfer_init_module                   @ 54 NONAME
+	pjsip_xfer_initiate                      @ 55 NONAME
+	pjsip_xfer_notify                        @ 56 NONAME
+	pjsip_xfer_send_request                  @ 57 NONAME
