summaryrefslogtreecommitdiff
authorandyq <andyq>2002-11-20 21:20:13 (UTC)
committer andyq <andyq>2002-11-20 21:20:13 (UTC)
commit726a5ade50098f208f9169176ff1ca099d8f0852 (patch) (side-by-side diff)
treed97fc08e447dd156b2db5c8ee4a7b6f8a87acecb
parent19cec7475afb19b9a3096a5e01a87ae80690ce21 (diff)
downloadopie-726a5ade50098f208f9169176ff1ca099d8f0852.zip
opie-726a5ade50098f208f9169176ff1ca099d8f0852.tar.gz
opie-726a5ade50098f208f9169176ff1ca099d8f0852.tar.bz2
Now keeps proxy settings if set
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
@@ -57,163 +57,206 @@ Server *DataManager :: getServer( const char *name )
Destination *DataManager :: getDestination( const char *name )
{
Destination *d = 0;
vector<Destination>::iterator it = destList.begin();
while ( it != destList.end() && d == 0 )
{
if ( it->getDestinationName() == name )
d = &(*it);
++it;
}
return d;
}
void DataManager :: loadServers()
{
// First add our local server - not really a server but
// the local config (which packages are installed)
serverList.push_back( Server( LOCAL_SERVER, "" ) );
serverList.push_back( Server( LOCAL_IPKGS, "" ) );
#ifdef QWS
Config cfg( "aqpkg" );
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 );
+ s.setActive( true );
else
- s.setActive( false );
+ 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()
{
QString ipkg_conf = IPKG_CONF;
ofstream out( ipkg_conf );
out << "# Written by AQPkg" << endl;
out << "# Must have one or more source entries of the form:" << endl;
out << "#" << endl;
out << "# src <src-name> <source-url>" << endl;
out << "#" << endl;
out << "# and one or more destination entries of the form:" << endl;
out << "#" << endl;
out << "# dest <dest-name> <target-path>" << endl;
out << "#" << endl;
out << "# where <src-name> and <dest-names> are identifiers that" << endl;
out << "# should match [a-zA-Z0-9._-]+, <source-url> should be a" << endl;
out << "# URL that points to a directory containing a Familiar" << endl;
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();
while ( it != serverList.end() )
{
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
@@ -16,54 +16,58 @@
***************************************************************************/
#ifndef DATAMGR_H
#define DATAMGR_H
#include <map>
using namespace std;
#include <qstring.h>
#include "server.h"
#include "destination.h"
#define LOCAL_SERVER "Installed Pkgs"
#define LOCAL_IPKGS "local IPKG"
/**
*@author Andy Qua
*/
class DataManager
{
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