|
Line
Link Here
|
| 0 |
-- simgear-2016.2.1.orig/simgear/scene/tsync/terrasync.cxx |
0 |
++ simgear-2016.2.1/simgear/scene/tsync/terrasync.cxx |
|
Lines 61-67
Link Here
|
| 61 |
#include <simgear/io/HTTPClient.hxx> |
61 |
#include <simgear/io/HTTPClient.hxx> |
| 62 |
#include <simgear/io/SVNRepository.hxx> |
62 |
#include <simgear/io/SVNRepository.hxx> |
| 63 |
#include <simgear/io/HTTPRepository.hxx> |
63 |
#include <simgear/io/HTTPRepository.hxx> |
| 64 |
#include <simgear/io/DNSClient.hxx> |
64 |
#ifdef ENABLE_DNS |
|
|
65 |
# include <simgear/io/DNSClient.hxx> |
| 66 |
#endif |
| 65 |
#include <simgear/structure/exception.hxx> |
67 |
#include <simgear/structure/exception.hxx> |
| 66 |
#include <simgear/math/sg_random.h> |
68 |
#include <simgear/math/sg_random.h> |
| 67 |
|
69 |
|
|
Lines 509-515
Link Here
|
| 509 |
initCompletedTilesPersistentCache(); |
511 |
initCompletedTilesPersistentCache(); |
| 510 |
|
512 |
|
| 511 |
if (_httpServer == "automatic" ) { |
513 |
if (_httpServer == "automatic" ) { |
| 512 |
|
514 |
#ifndef ENABLE_DNS |
|
|
515 |
SG_LOG(SG_TERRASYNC, SG_ALERT, "ERROR: automatic terrasync http-server requested, but no DNS resolver."); |
| 516 |
_httpServer = ""; |
| 517 |
#else |
| 513 |
//TODO: make DN and service settable from properties |
518 |
//TODO: make DN and service settable from properties |
| 514 |
DNS::NAPTRRequest * naptrRequest = new DNS::NAPTRRequest("terrasync.flightgear.org"); |
519 |
DNS::NAPTRRequest * naptrRequest = new DNS::NAPTRRequest("terrasync.flightgear.org"); |
| 515 |
naptrRequest->qservice = "ws20"; |
520 |
naptrRequest->qservice = "ws20"; |
|
Lines 565-570
Link Here
|
| 565 |
|
570 |
|
| 566 |
SG_LOG(SG_TERRASYNC,SG_INFO, "picking entry # " << idx << ", server is " << _httpServer ); |
571 |
SG_LOG(SG_TERRASYNC,SG_INFO, "picking entry # " << idx << ", server is " << _httpServer ); |
| 567 |
} |
572 |
} |
|
|
573 |
#endif |
| 568 |
} |
574 |
} |
| 569 |
if( _httpServer.empty() ) { // don't resolve SVN server is HTTP server is set |
575 |
if( _httpServer.empty() ) { // don't resolve SVN server is HTTP server is set |
| 570 |
if ( _svn_server.empty()) { |
576 |
if ( _svn_server.empty()) { |
