Changeset 300 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_settings.c
- Timestamp:
- Mar 6, 2006 3:14:59 PM (18 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/trunk/pjsip/src/pjsua-lib/pjsua_settings.c
r293 r300 228 228 OPT_NEXT_ACCOUNT, OPT_NEXT_CRED, OPT_MAX_CALLS, 229 229 }; 230 struct option long_options[] = {230 struct pj_getopt_option long_options[] = { 231 231 { "config-file",1, 0, OPT_CONFIG_FILE}, 232 232 { "log-file", 1, 0, OPT_LOG_FILE}, … … 273 273 char *config_file = NULL; 274 274 275 /* Run getopt once to see if user specifies config file to read. */276 while ((c= getopt_long(argc, argv, "", long_options, &option_index)) != -1) {275 /* Run pj_getopt once to see if user specifies config file to read. */ 276 while ((c=pj_getopt_long(argc, argv, "", long_options, &option_index)) != -1) { 277 277 switch (c) { 278 278 case OPT_CONFIG_FILE: 279 config_file = optarg;279 config_file = pj_optarg; 280 280 break; 281 281 } … … 295 295 296 296 297 /* Reinitialize and re-run getopt again, possibly with new arguments297 /* Reinitialize and re-run pj_getopt again, possibly with new arguments 298 298 * read from config file. 299 299 */ 300 optind = 0;301 while ((c=getopt_long(argc, argv, "", long_options, &option_index)) !=-1) {300 pj_optind = 0; 301 while((c=pj_getopt_long(argc, argv, "", long_options, &option_index))!=-1) { 302 302 char *p; 303 303 pj_str_t tmp; … … 307 307 308 308 case OPT_LOG_FILE: 309 pjsua.log_filename = optarg;309 pjsua.log_filename = pj_optarg; 310 310 break; 311 311 312 312 case OPT_LOG_LEVEL: 313 c = pj_strtoul(pj_cstr(&tmp, optarg));313 c = pj_strtoul(pj_cstr(&tmp, pj_optarg)); 314 314 if (c < 0 || c > 6) { 315 315 printf("Error: expecting integer value 0-6 for --log-level\n"); … … 320 320 321 321 case OPT_APP_LOG_LEVEL: 322 pjsua.app_log_level = pj_strtoul(pj_cstr(&tmp, optarg));322 pjsua.app_log_level = pj_strtoul(pj_cstr(&tmp, pj_optarg)); 323 323 if (pjsua.app_log_level < 0 || pjsua.app_log_level > 6) { 324 324 printf("Error: expecting integer value 0-6 for --app-log-level\n"); … … 348 348 349 349 case OPT_LOCAL_PORT: /* local-port */ 350 lval = pj_strtoul(pj_cstr(&tmp, optarg));350 lval = pj_strtoul(pj_cstr(&tmp, pj_optarg)); 351 351 if (lval < 1 || lval > 65535) { 352 352 printf("Error: expecting integer value for --local-port\n"); … … 357 357 358 358 case OPT_PROXY: /* proxy */ 359 if (pjsua_verify_sip_url( optarg) != 0) {360 printf("Error: invalid SIP URL '%s' in proxy argument\n", optarg);359 if (pjsua_verify_sip_url(pj_optarg) != 0) { 360 printf("Error: invalid SIP URL '%s' in proxy argument\n", pj_optarg); 361 361 return PJ_EINVAL; 362 362 } 363 cur_acc->proxy = pj_str( optarg);363 cur_acc->proxy = pj_str(pj_optarg); 364 364 break; 365 365 366 366 case OPT_OUTBOUND_PROXY: /* outbound proxy */ 367 if (pjsua_verify_sip_url( optarg) != 0) {368 printf("Error: invalid SIP URL '%s' in outbound proxy argument\n", optarg);367 if (pjsua_verify_sip_url(pj_optarg) != 0) { 368 printf("Error: invalid SIP URL '%s' in outbound proxy argument\n", pj_optarg); 369 369 return PJ_EINVAL; 370 370 } 371 pjsua.outbound_proxy = pj_str( optarg);371 pjsua.outbound_proxy = pj_str(pj_optarg); 372 372 break; 373 373 374 374 case OPT_REGISTRAR: /* registrar */ 375 if (pjsua_verify_sip_url( optarg) != 0) {376 printf("Error: invalid SIP URL '%s' in registrar argument\n", optarg);375 if (pjsua_verify_sip_url(pj_optarg) != 0) { 376 printf("Error: invalid SIP URL '%s' in registrar argument\n", pj_optarg); 377 377 return PJ_EINVAL; 378 378 } 379 cur_acc->reg_uri = pj_str( optarg);379 cur_acc->reg_uri = pj_str(pj_optarg); 380 380 break; 381 381 382 382 case OPT_REG_TIMEOUT: /* reg-timeout */ 383 cur_acc->reg_timeout = pj_strtoul(pj_cstr(&tmp, optarg));383 cur_acc->reg_timeout = pj_strtoul(pj_cstr(&tmp,pj_optarg)); 384 384 if (cur_acc->reg_timeout < 1 || cur_acc->reg_timeout > 3600) { 385 385 printf("Error: invalid value for --reg-timeout (expecting 1-3600)\n"); … … 389 389 390 390 case OPT_ID: /* id */ 391 if (pjsua_verify_sip_url( optarg) != 0) {392 printf("Error: invalid SIP URL '%s' in local id argument\n", optarg);391 if (pjsua_verify_sip_url(pj_optarg) != 0) { 392 printf("Error: invalid SIP URL '%s' in local id argument\n", pj_optarg); 393 393 return PJ_EINVAL; 394 394 } 395 cur_acc->local_uri = pj_str( optarg);395 cur_acc->local_uri = pj_str(pj_optarg); 396 396 pjsua.has_acc = 1; 397 397 break; 398 398 399 399 case OPT_CONTACT: /* contact */ 400 if (pjsua_verify_sip_url( optarg) != 0) {401 printf("Error: invalid SIP URL '%s' in contact argument\n", optarg);400 if (pjsua_verify_sip_url(pj_optarg) != 0) { 401 printf("Error: invalid SIP URL '%s' in contact argument\n", pj_optarg); 402 402 return PJ_EINVAL; 403 403 } 404 cur_acc->contact_uri = pj_str( optarg);404 cur_acc->contact_uri = pj_str(pj_optarg); 405 405 break; 406 406 … … 412 412 case OPT_USERNAME: /* Default authentication user */ 413 413 if (pjsua.cred_count==0) pjsua.cred_count=1; 414 cur_cred->username = pj_str( optarg);414 cur_cred->username = pj_str(pj_optarg); 415 415 break; 416 416 417 417 case OPT_REALM: /* Default authentication realm. */ 418 418 if (pjsua.cred_count==0) pjsua.cred_count=1; 419 cur_cred->realm = pj_str( optarg);419 cur_cred->realm = pj_str(pj_optarg); 420 420 break; 421 421 … … 423 423 if (pjsua.cred_count==0) pjsua.cred_count=1; 424 424 cur_cred->data_type = 0; 425 cur_cred->data = pj_str( optarg);425 cur_cred->data = pj_str(pj_optarg); 426 426 break; 427 427 … … 432 432 433 433 case OPT_USE_STUN1: /* STUN server 1 */ 434 p = pj_ansi_strchr( optarg, ':');434 p = pj_ansi_strchr(pj_optarg, ':'); 435 435 if (p) { 436 436 *p = '\0'; 437 pjsua.stun_srv1 = pj_str( optarg);437 pjsua.stun_srv1 = pj_str(pj_optarg); 438 438 pjsua.stun_port1 = pj_strtoul(pj_cstr(&tmp, p+1)); 439 439 if (pjsua.stun_port1 < 1 || pjsua.stun_port1 > 65535) { … … 443 443 } else { 444 444 pjsua.stun_port1 = 3478; 445 pjsua.stun_srv1 = pj_str( optarg);445 pjsua.stun_srv1 = pj_str(pj_optarg); 446 446 } 447 447 break; 448 448 449 449 case OPT_USE_STUN2: /* STUN server 2 */ 450 p = pj_ansi_strchr( optarg, ':');450 p = pj_ansi_strchr(pj_optarg, ':'); 451 451 if (p) { 452 452 *p = '\0'; 453 pjsua.stun_srv2 = pj_str( optarg);453 pjsua.stun_srv2 = pj_str(pj_optarg); 454 454 pjsua.stun_port2 = pj_strtoul(pj_cstr(&tmp,p+1)); 455 455 if (pjsua.stun_port2 < 1 || pjsua.stun_port2 > 65535) { … … 459 459 } else { 460 460 pjsua.stun_port2 = 3478; 461 pjsua.stun_srv2 = pj_str( optarg);461 pjsua.stun_srv2 = pj_str(pj_optarg); 462 462 } 463 463 break; 464 464 465 465 case OPT_ADD_BUDDY: /* Add to buddy list. */ 466 if (pjsua_verify_sip_url( optarg) != 0) {467 printf("Error: invalid URL '%s' in --add-buddy option\n", optarg);466 if (pjsua_verify_sip_url(pj_optarg) != 0) { 467 printf("Error: invalid URL '%s' in --add-buddy option\n", pj_optarg); 468 468 return -1; 469 469 } … … 472 472 return -1; 473 473 } 474 pjsua.buddies[pjsua.buddy_cnt++].uri = pj_str( optarg);474 pjsua.buddies[pjsua.buddy_cnt++].uri = pj_str(pj_optarg); 475 475 break; 476 476 … … 488 488 489 489 case OPT_PLAY_FILE: 490 pjsua.wav_file = optarg;490 pjsua.wav_file = pj_optarg; 491 491 break; 492 492 493 493 case OPT_RTP_PORT: 494 pjsua.start_rtp_port = my_atoi( optarg);494 pjsua.start_rtp_port = my_atoi(pj_optarg); 495 495 if (pjsua.start_rtp_port < 1 || pjsua.start_rtp_port > 65535) { 496 496 PJ_LOG(1,(THIS_FILE, … … 500 500 501 501 case OPT_ADD_CODEC: 502 pjsua.codec_arg[pjsua.codec_cnt++] = pj_str( optarg);502 pjsua.codec_arg[pjsua.codec_cnt++] = pj_str(pj_optarg); 503 503 break; 504 504 505 505 case OPT_COMPLEXITY: 506 pjsua.complexity = my_atoi( optarg);506 pjsua.complexity = my_atoi(pj_optarg); 507 507 if (pjsua.complexity < 0 || pjsua.complexity > 10) { 508 508 PJ_LOG(1,(THIS_FILE, … … 513 513 514 514 case OPT_QUALITY: 515 pjsua.quality = my_atoi( optarg);515 pjsua.quality = my_atoi(pj_optarg); 516 516 if (pjsua.quality < 0 || pjsua.quality > 10) { 517 517 PJ_LOG(1,(THIS_FILE, … … 522 522 523 523 case OPT_AUTO_ANSWER: 524 pjsua.auto_answer = my_atoi( optarg);524 pjsua.auto_answer = my_atoi(pj_optarg); 525 525 if (pjsua.auto_answer < 100 || pjsua.auto_answer > 699) { 526 526 PJ_LOG(1,(THIS_FILE, … … 531 531 532 532 case OPT_MAX_CALLS: 533 pjsua.max_calls = my_atoi( optarg);533 pjsua.max_calls = my_atoi(pj_optarg); 534 534 if (pjsua.max_calls < 1 || pjsua.max_calls > 255) { 535 535 PJ_LOG(1,(THIS_FILE,"Too many calls for max-calls (1-255)")); … … 540 540 } 541 541 542 if ( optind != argc) {543 printf("Error: unknown options %s\n", argv[ optind]);542 if (pj_optind != argc) { 543 printf("Error: unknown options %s\n", argv[pj_optind]); 544 544 return PJ_EINVAL; 545 545 }
Note: See TracChangeset
for help on using the changeset viewer.