Changeset 3520
- Timestamp:
- Apr 11, 2011 5:27:14 PM (13 years ago)
- Location:
- pjproject/branches/projects/2.0-dev
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/branches/projects/2.0-dev/pjmedia/include/pjmedia/transport_ice.h
r3327 r3520 182 182 pjmedia_transport **p_tp); 183 183 184 /** 185 * The same as #pjmedia_ice_create2() with additional \a user_data param. 186 * 187 * @param endpt The media endpoint. 188 * @param name Optional name to identify this ICE media transport 189 * for logging purposes. 190 * @param comp_cnt Number of components to be created. 191 * @param cfg Pointer to configuration settings. 192 * @param cb Optional structure containing ICE specific callbacks. 193 * @param options Options, see #pjmedia_transport_ice_options. 194 * @param user_data User data to be attached to the transport. 195 * @param p_tp Pointer to receive the media transport instance. 196 * 197 * @return PJ_SUCCESS on success, or the appropriate error code. 198 */ 199 PJ_DECL(pj_status_t) pjmedia_ice_create3(pjmedia_endpt *endpt, 200 const char *name, 201 unsigned comp_cnt, 202 const pj_ice_strans_cfg *cfg, 203 const pjmedia_ice_cb *cb, 204 unsigned options, 205 void *user_data, 206 pjmedia_transport **p_tp); 207 184 208 PJ_END_DECL 185 209 -
pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia/transport_ice.c
r2957 r3520 205 205 pjmedia_transport **p_tp) 206 206 { 207 return pjmedia_ice_create3(endpt, name, comp_cnt, cfg, cb, 208 options, NULL, p_tp); 209 } 210 211 /* 212 * Create ICE media transport. 213 */ 214 PJ_DEF(pj_status_t) pjmedia_ice_create3(pjmedia_endpt *endpt, 215 const char *name, 216 unsigned comp_cnt, 217 const pj_ice_strans_cfg *cfg, 218 const pjmedia_ice_cb *cb, 219 unsigned options, 220 void *user_data, 221 pjmedia_transport **p_tp) 222 { 207 223 pj_pool_t *pool; 208 224 pj_ice_strans_cb ice_st_cb; … … 222 238 tp_ice->base.op = &transport_ice_op; 223 239 tp_ice->base.type = PJMEDIA_TRANSPORT_TYPE_ICE; 240 tp_ice->base.user_data = user_data; 224 241 tp_ice->initial_sdp = PJ_TRUE; 225 242 tp_ice->oa_role = ROLE_NONE; -
pjproject/branches/projects/2.0-dev/pjsip/src/pjsua-lib/pjsua_media.c
r3518 r3520 1068 1068 ++comp_cnt; 1069 1069 1070 status = pjmedia_ice_create(pjsua_var.med_endpt, name, comp_cnt, 1071 &ice_cfg, &ice_cb, &call_med->tp); 1070 status = pjmedia_ice_create3(pjsua_var.med_endpt, name, comp_cnt, 1071 &ice_cfg, &ice_cb, 0, call_med, 1072 &call_med->tp); 1072 1073 if (status != PJ_SUCCESS) { 1073 1074 pjsua_perror(THIS_FILE, "Unable to create ICE media transport",
Note: See TracChangeset
for help on using the changeset viewer.