2 files changed, 48 insertions, 1 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
@@ -81,83 +81,101 @@ void DataManager :: loadServers()
     cfg.setGroup( "destinations" );
 #endif
 
     // Read file from /etc/ipkg.conf
     QString ipkg_conf = IPKG_CONF;
     FILE *fp;
     fp = fopen( ipkg_conf, "r" );
     char line[130];
     QString lineStr;
     if ( fp == NULL )
     {
         cout << "Couldn't open " << ipkg_conf << "! err = " << fp << endl;
         return;
     }
     else
     {
         while ( fgets( line, sizeof line, fp) != NULL )
         {
             lineStr = line;
             if ( lineStr.startsWith( "src" ) || lineStr.startsWith( "#src" ) || lineStr.startsWith( "# src" ) )
             {
                 char alias[20];
                 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
                 // is next.
                 // Should Handle #src, # src, src, and combinations of
                 sscanf( lineStr, "%*[^r]%*[^ ] %s %s", alias, url );
                 Server s( alias, url );
                 if ( lineStr.startsWith( "src" ) )
                                 s.setActive( true );
                 else
                                 s.setActive( false );
 
                 serverList.push_back( s );
 
             }
             else if ( lineStr.startsWith( "dest" ) )
             {
                 char alias[20];
                 char path[50];
                 sscanf( lineStr, "%*[^ ] %s %s", alias, path );
                 Destination d( alias, path );
                 bool linkToRoot = true;
 #ifdef QWS
                 QString key = alias;
                 key += "_linkToRoot";
                 linkToRoot = cfg.readBoolEntry( key, true );
 #endif
                 d.linkToRoot( linkToRoot );
                 
                 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( );
 }
 
 void DataManager :: reloadServerData( )
 {
         vector<Server>::iterator it = serverList.begin();
     for ( it = serverList.begin() ; it != serverList.end() ; ++it )
     {
             // Now we've read the config file in we need to read the servers
             // The local server is a special case. This holds the contents of the
             // status files the number of which depends on how many destinations
             // we've set up
             // The other servers files hold the contents of the server package list
             if ( it->getServerName() == LOCAL_SERVER )
                 it->readStatusFile( destList );
             else if ( it->getServerName() == LOCAL_IPKGS )
                 it->readLocalIpks( getServer( LOCAL_SERVER ) );
             else
                 it->readPackageFile( getServer( LOCAL_SERVER ) );
         }
 }
 
 void DataManager :: writeOutIpkgConf()
 {
@@ -186,34 +204,59 @@ void DataManager :: writeOutIpkgConf()
         QString alias = it->getServerName();
         // Don't write out local as its a dummy
         if ( alias != LOCAL_SERVER && alias != LOCAL_IPKGS )
         {
             QString url = it->getServerUrl();;
 
             if ( !it->isServerActive() )
                 out << "#";
             out << "src " << alias << " " << url << endl;
         }
 
         it++;
     }
 
     out << endl;
 
     // Write out destinations
     vector<Destination>::iterator it2 = destList.begin();
     while ( it2 != destList.end() )
     {
         out << "dest " << it2->getDestinationName() << " " << it2->getDestinationPath() << endl;
         it2++;
     }
 
+    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();
 }
 
 
 void DataManager :: setAvailableCategories( QString section )
 {
     section = section.lower();
     if ( availableCategories.find( "#" + section + "#" ) == -1 )
         availableCategories += section + "#";
 }
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
@@ -40,30 +40,34 @@ public:
     DataManager();
         ~DataManager();
 
     void setActiveServer( const QString &act )      { activeServer = act; }
             QString &getActiveServer( )                         { return activeServer; }
 
             Server *getLocalServer()                                    { return getServer( LOCAL_SERVER ); }
             vector<Server> &getServerList()                     { return serverList; }
     Server *getServer( const char *name );
 
             vector<Destination> &getDestinationList()           { return destList; }
     Destination *getDestination( const char *name );
 
     void loadServers();
     void reloadServerData( );
 
     void writeOutIpkgConf();
 
     static QString getAvailableCategories() { return availableCategories; }
     static void setAvailableCategories( QString section );
 
 private:
     static QString availableCategories;
     QString activeServer;
+    QString httpProxy;
+    QString ftpProxy;
+    QString proxyUsername;
+    QString proxyPassword;
 
     vector<Server> serverList;
     vector<Destination> destList;
 };
 
 #endif