| -rw-r--r-- | noncore/settings/aqpkg/datamgr.cpp | 51 | ||||
| -rw-r--r-- | noncore/settings/aqpkg/datamgr.h | 4 |
2 files changed, 51 insertions, 4 deletions
diff --git a/noncore/settings/aqpkg/datamgr.cpp b/noncore/settings/aqpkg/datamgr.cpp index 1420242..e7fb75a 100644 --- a/noncore/settings/aqpkg/datamgr.cpp +++ b/noncore/settings/aqpkg/datamgr.cpp @@ -103,5 +103,4 @@ void DataManager :: loadServers() char url[100]; - // Looks a little wierd but read up to the r of src (throwing it away), // then read up to the next space and throw that away, the alias @@ -111,7 +110,7 @@ void DataManager :: loadServers() Server s( alias, url ); if ( lineStr.startsWith( "src" ) ) - s.setActive( true ); + s.setActive( true ); else - s.setActive( false ); + s.setActive( false ); serverList.push_back( s ); @@ -134,8 +133,27 @@ void DataManager :: loadServers() destList.push_back( d ); } + else if ( lineStr.startsWith( "option" ) ) + { + char type[20]; + char val[100]; + sscanf( lineStr, "%*[^ ] %s %s", type, val ); + if ( stricmp( type, "http_proxy" ) == 0 ) + httpProxy = val; + if ( stricmp( type, "ftp_proxy" ) == 0 ) + ftpProxy = val; + if ( stricmp( type, "proxy_username" ) == 0 ) + proxyUsername = val; + if ( stricmp( type, "proxy_password" ) == 0 ) + proxyPassword = val; + } } } fclose( fp ); + cout << "httpProxy = " << httpProxy << endl; + cout << "ftpProxy = " << ftpProxy << endl; + cout << "proxyUsername = " << proxyUsername << endl; + cout << "proxyPassword = " << proxyPassword << endl; + reloadServerData( ); } @@ -179,5 +197,5 @@ void DataManager :: writeOutIpkgConf() out << "# Packages file, and <target-path> should be a directory" << endl; out << "# that exists on the target system." << endl << endl; - + // Write out servers vector<Server>::iterator it = serverList.begin(); @@ -208,4 +226,29 @@ void DataManager :: writeOutIpkgConf() } + out << "# Proxy Support" << endl; + out << "#" << endl; + + if ( httpProxy == "" ) + out << "#option http_proxy http://proxy.tld:3128" << endl; + else + out << "option http_proxy " << httpProxy << endl; + + if ( ftpProxy == "" ) + out << "#option ftp_proxy http://proxy.tld:3128" << endl; + else + out << "option ftp_proxy " << ftpProxy << endl; + if ( proxyUsername == "" ) + out << "#option proxy_username <username>" << endl; + else + out << "option proxy_username " << proxyUsername << endl; + if ( proxyPassword == "" ) + out << "#option proxy_password <password>" << endl << endl; + else + out << "option proxy_password " << proxyPassword << endl<< endl; + + out << "# Offline mode (for use in constructing flash images offline)" << endl; + out << "#option offline_root target" << endl; + + out.close(); } diff --git a/noncore/settings/aqpkg/datamgr.h b/noncore/settings/aqpkg/datamgr.h index 3a64d92..14b0b2f 100644 --- a/noncore/settings/aqpkg/datamgr.h +++ b/noncore/settings/aqpkg/datamgr.h @@ -62,4 +62,8 @@ private: static QString availableCategories; QString activeServer; + QString httpProxy; + QString ftpProxy; + QString proxyUsername; + QString proxyPassword; vector<Server> serverList; |