summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/aqpkg/datamgr.cpp51
-rw-r--r--noncore/settings/aqpkg/datamgr.h4
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
@@ -104,3 +104,2 @@ void DataManager :: loadServers()
-
// Looks a little wierd but read up to the r of src (throwing it away),
@@ -112,5 +111,5 @@ void DataManager :: loadServers()
if ( lineStr.startsWith( "src" ) )
- s.setActive( true );
+ s.setActive( true );
else
- s.setActive( false );
+ s.setActive( false );
@@ -135,2 +134,16 @@ void DataManager :: loadServers()
}
+ 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;
+ }
}
@@ -139,2 +152,7 @@ void DataManager :: loadServers()
+ cout << "httpProxy = " << httpProxy << endl;
+ cout << "ftpProxy = " << ftpProxy << endl;
+ cout << "proxyUsername = " << proxyUsername << endl;
+ cout << "proxyPassword = " << proxyPassword << endl;
+
reloadServerData( );
@@ -180,3 +198,3 @@ void DataManager :: writeOutIpkgConf()
out << "# that exists on the target system." << endl << endl;
-
+
// Write out servers
@@ -209,2 +227,27 @@ 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
@@ -63,2 +63,6 @@ private:
QString activeServer;
+ QString httpProxy;
+ QString ftpProxy;
+ QString proxyUsername;
+ QString proxyPassword;