Changeset 7836
- Timestamp:
- Feb 6, 2009, 11:35:47 PM (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/libtransmission/session.c
r7826 r7836 431 431 #endif 432 432 433 found = tr_bencDictFindInt( &settings, TR_PREFS_KEY_PEER_LIMIT_TORRENT, &i ); 434 assert( found ); 435 session->peerLimitPerTorrent = i; 436 437 found = tr_bencDictFindInt( &settings, TR_PREFS_KEY_MSGLEVEL, &i ); 438 assert( found ); 439 tr_setMessageLevel( i ); 440 tr_setMessageQueuing( data->messageQueuingEnabled ); 441 442 443 found = tr_bencDictFindInt( &settings, TR_PREFS_KEY_PEX_ENABLED, &i ); 444 assert( found ); 445 session->isPexEnabled = i != 0; 446 447 found = tr_bencDictFindInt( &settings, TR_PREFS_KEY_ENCRYPTION, &i ); 448 assert( found ); 433 found = tr_bencDictFindInt( &settings, TR_PREFS_KEY_PEER_LIMIT_TORRENT, &i ); 434 assert( found ); 435 session->peerLimitPerTorrent = i; 436 437 found = tr_bencDictFindInt( &settings, TR_PREFS_KEY_MSGLEVEL, &i ); 438 assert( found ); 439 tr_setMessageLevel( i ); 440 tr_setMessageQueuing( data->messageQueuingEnabled ); 441 442 443 found = tr_bencDictFindInt( &settings, TR_PREFS_KEY_PEX_ENABLED, &i ); 444 assert( found ); 445 session->isPexEnabled = i != 0; 446 447 found = tr_bencDictFindInt( &settings, TR_PREFS_KEY_ENCRYPTION, &i ); 448 assert( found ); 449 449 assert( tr_isEncryptionMode( i ) ); 450 session->encryptionMode = i; 450 session->encryptionMode = i; 451 451 452 452 found = tr_bencDictFindInt( &settings, TR_PREFS_KEY_PREALLOCATION, &i ); … … 454 454 assert( tr_isPreallocationMode( i ) ); 455 455 session->preallocationMode = i; 456 457 found = tr_bencDictFindInt( &settings, TR_PREFS_KEY_PEER_SOCKET_TOS, &i ); 458 assert( found ); 459 session->peerSocketTOS = i; 460 461 found = tr_bencDictFindStr( &settings, TR_PREFS_KEY_DOWNLOAD_DIR, &str ); 462 assert( found ); 463 session->downloadDir = tr_strdup( str ); 464 465 found = tr_bencDictFindInt( &settings, TR_PREFS_KEY_PROXY_ENABLED, &i ); 466 assert( found ); 467 session->isProxyEnabled = i != 0; 468 469 found = tr_bencDictFindStr( &settings, TR_PREFS_KEY_PROXY, &str ); 470 assert( found ); 471 session->proxy = tr_strdup( str ); 472 473 found = tr_bencDictFindInt( &settings, TR_PREFS_KEY_PROXY_PORT, &i ); 474 assert( found ); 475 session->proxyPort = i; 476 477 found = tr_bencDictFindInt( &settings, TR_PREFS_KEY_PROXY_TYPE, &i ); 478 assert( found ); 479 session->proxyType = i; 480 481 found = tr_bencDictFindInt( &settings, TR_PREFS_KEY_PROXY_AUTH_ENABLED, &i ); 482 assert( found ); 483 session->isProxyAuthEnabled = i != 0; 484 485 found = tr_bencDictFindStr( &settings, TR_PREFS_KEY_PROXY_USERNAME, &str ); 486 assert( found ); 487 session->proxyUsername = tr_strdup( str ); 488 489 found = tr_bencDictFindStr( &settings, TR_PREFS_KEY_PROXY_PASSWORD, &str ); 490 assert( found ); 491 session->proxyPassword = tr_strdup( str ); 492 493 session->so_sndbuf = 1500 * 3; /* 3x MTU for most ethernet/wireless */ 494 session->so_rcvbuf = 8192; 495 496 tr_setConfigDir( session, data->configDir ); 456 457 found = tr_bencDictFindInt( &settings, TR_PREFS_KEY_PEER_SOCKET_TOS, &i ); 458 assert( found ); 459 session->peerSocketTOS = i; 460 461 found = tr_bencDictFindStr( &settings, TR_PREFS_KEY_DOWNLOAD_DIR, &str ); 462 assert( found ); 463 session->downloadDir = tr_strdup( str ); 464 465 found = tr_bencDictFindInt( &settings, TR_PREFS_KEY_PROXY_ENABLED, &i ); 466 assert( found ); 467 session->isProxyEnabled = i != 0; 468 469 found = tr_bencDictFindStr( &settings, TR_PREFS_KEY_PROXY, &str ); 470 assert( found ); 471 session->proxy = tr_strdup( str ); 472 473 found = tr_bencDictFindInt( &settings, TR_PREFS_KEY_PROXY_PORT, &i ); 474 assert( found ); 475 session->proxyPort = i; 476 477 found = tr_bencDictFindInt( &settings, TR_PREFS_KEY_PROXY_TYPE, &i ); 478 assert( found ); 479 session->proxyType = i; 480 481 found = tr_bencDictFindInt( &settings, TR_PREFS_KEY_PROXY_AUTH_ENABLED, &i ); 482 assert( found ); 483 session->isProxyAuthEnabled = i != 0; 484 485 found = tr_bencDictFindStr( &settings, TR_PREFS_KEY_PROXY_USERNAME, &str ); 486 assert( found ); 487 session->proxyUsername = tr_strdup( str ); 488 489 found = tr_bencDictFindStr( &settings, TR_PREFS_KEY_PROXY_PASSWORD, &str ); 490 assert( found ); 491 session->proxyPassword = tr_strdup( str ); 492 493 session->so_sndbuf = 1500 * 3; /* 3x MTU for most ethernet/wireless */ 494 session->so_rcvbuf = 8192; 495 496 tr_setConfigDir( session, data->configDir ); 497 497 498 498 tr_trackerSessionInit( session ); … … 501 501 session->peerMgr = tr_peerMgrNew( session ); 502 502 503 found = tr_bencDictFindInt( &settings, TR_PREFS_KEY_LAZY_BITFIELD, &i ); 504 assert( found ); 505 session->useLazyBitfield = i != 0; 503 found = tr_bencDictFindInt( &settings, TR_PREFS_KEY_LAZY_BITFIELD, &i ); 504 assert( found ); 505 session->useLazyBitfield = i != 0; 506 506 507 507 /* Initialize rate and file descripts controls */ 508 508 509 found = tr_bencDictFindInt( &settings, TR_PREFS_KEY_OPEN_FILE_LIMIT, &i ); 510 assert( found ); 509 found = tr_bencDictFindInt( &settings, TR_PREFS_KEY_OPEN_FILE_LIMIT, &i ); 510 assert( found ); 511 511 session->openFileLimit = i; 512 found = tr_bencDictFindInt( &settings, TR_PREFS_KEY_PEER_LIMIT_GLOBAL, &j ); 513 assert( found ); 512 found = tr_bencDictFindInt( &settings, TR_PREFS_KEY_PEER_LIMIT_GLOBAL, &j ); 513 assert( found ); 514 514 tr_fdInit( session->openFileLimit, j ); 515 515 516 /** 517 *** random port 518 **/ 519 520 found = tr_bencDictFindInt( &settings, TR_PREFS_KEY_PEER_PORT_RANDOM_ENABLED, &i ); 521 assert( found ); 522 session->isPortRandom = i != 0; 523 524 found = tr_bencDictFindInt( &settings, TR_PREFS_KEY_PEER_PORT_RANDOM_LOW, &i ); 525 assert( found ); 526 session->randomPortLow = i; 527 528 found = tr_bencDictFindInt( &settings, TR_PREFS_KEY_PEER_PORT_RANDOM_HIGH, &i ); 529 assert( found ); 530 session->randomPortHigh = i; 531 532 found = tr_bencDictFindInt( &settings, TR_PREFS_KEY_PORT_FORWARDING, &i ) 533 && tr_bencDictFindInt( &settings, TR_PREFS_KEY_PEER_PORT, &j ); 534 assert( found ); 535 session->peerPort = session->isPortRandom ? getRandomPort( session ) : j; 536 session->shared = tr_sharedInit( session, i, session->peerPort ); 537 session->isPortSet = session->isPortRandom || j>0; 538 539 /** 540 **/ 516 /** 517 *** random port 518 **/ 519 520 found = tr_bencDictFindInt( &settings, TR_PREFS_KEY_PEER_PORT_RANDOM_ENABLED, &i ); 521 assert( found ); 522 session->isPortRandom = i != 0; 523 524 found = tr_bencDictFindInt( &settings, TR_PREFS_KEY_PEER_PORT_RANDOM_LOW, &i ); 525 assert( found ); 526 session->randomPortLow = i; 527 528 found = tr_bencDictFindInt( &settings, TR_PREFS_KEY_PEER_PORT_RANDOM_HIGH, &i ); 529 assert( found ); 530 session->randomPortHigh = i; 531 532 found = tr_bencDictFindInt( &settings, TR_PREFS_KEY_PORT_FORWARDING, &i ) 533 && tr_bencDictFindInt( &settings, TR_PREFS_KEY_PEER_PORT, &j ); 534 assert( found ); 535 session->peerPort = session->isPortRandom ? getRandomPort( session ) : j; 536 session->shared = tr_sharedInit( session, i, session->peerPort ); 537 session->isPortSet = session->isPortRandom || j>0; 538 539 /** 540 **/ 541 541 542 542 found = tr_bencDictFindInt( &settings, TR_PREFS_KEY_UPLOAD_SLOTS_PER_TORRENT, &i ); 543 543 assert( found ); 544 544 session->uploadSlotsPerTorrent = i; 545 545 546 546 found = tr_bencDictFindInt( &settings, TR_PREFS_KEY_USPEED, &i ) 547 547 && tr_bencDictFindInt( &settings, TR_PREFS_KEY_USPEED_ENABLED, &j ); 548 assert( found ); 548 assert( found ); 549 549 tr_sessionSetSpeedLimit( session, TR_UP, i ); 550 550 tr_sessionSetSpeedLimitEnabled( session, TR_UP, j ); 551 551 552 552 found = tr_bencDictFindInt( &settings, TR_PREFS_KEY_DSPEED, &i ) 553 553 && tr_bencDictFindInt( &settings, TR_PREFS_KEY_DSPEED_ENABLED, &j ); 554 assert( found ); 554 assert( found ); 555 555 tr_sessionSetSpeedLimit( session, TR_DOWN, i ); 556 556 tr_sessionSetSpeedLimitEnabled( session, TR_DOWN, j ); … … 560 560 tr_mkdirp( filename, 0777 ); 561 561 tr_free( filename ); 562 found = tr_bencDictFindInt( &settings, TR_PREFS_KEY_BLOCKLIST_ENABLED, &i ); 563 assert( found ); 564 session->isBlocklistEnabled = i; 565 loadBlocklists( session ); 566 567 session->rpcServer = tr_rpcInit( session, &settings ); 562 found = tr_bencDictFindInt( &settings, TR_PREFS_KEY_BLOCKLIST_ENABLED, &i ); 563 assert( found ); 564 session->isBlocklistEnabled = i; 565 loadBlocklists( session ); 566 567 session->rpcServer = tr_rpcInit( session, &settings ); 568 568 569 569 tr_bencFree( &settings ); 570 570 571 571 assert( tr_isSession( session ) ); 572 572 573 573 /* first %s is the application name 574 574 second %s is the version number */ … … 576 576 577 577 tr_statsInit( session ); 578 session->web = tr_webInit( session ); 578 session->web = tr_webInit( session ); 579 579 metainfoLookupRescan( session ); 580 580 session->isWaiting = FALSE; … … 1330 1330 } 1331 1331 1332 tr_port 1332 tr_port 1333 1333 tr_sessionGetRPCPort( const tr_session * session ) 1334 1334 { … … 1581 1581 if( tr_torrentGetActivity( tor ) != TR_STATUS_STOPPED ) 1582 1582 ++ret; 1583 1583 1584 1584 return ret; 1585 1585 }
Note: See TracChangeset
for help on using the changeset viewer.