diff options
Diffstat (limited to 'lanbrowsing')
| -rw-r--r-- | lanbrowsing/lisa/addressvalidator.cpp | 4 | ||||
| -rw-r--r-- | lanbrowsing/lisa/client.cpp | 10 | ||||
| -rw-r--r-- | lanbrowsing/lisa/client.h | 2 | ||||
| -rw-r--r-- | lanbrowsing/lisa/netscanner.cpp | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/lanbrowsing/lisa/addressvalidator.cpp b/lanbrowsing/lisa/addressvalidator.cpp index f4dab083..3ac8ccf0 100644 --- a/lanbrowsing/lisa/addressvalidator.cpp +++ b/lanbrowsing/lisa/addressvalidator.cpp @@ -114,8 +114,8 @@ void AddressValidator::setValidAddresses(MyString addressSpecs) { pos=nextPart.find('/'); MyString netStr=nextPart.left(pos); - MyString tqmaskStr=nextPart.mid(pos+1); - int tqmask=inet_addr(tqmaskStr.data()); + MyString maskStr=nextPart.mid(pos+1); + int tqmask=inet_addr(maskStr.data()); int net= (inet_addr(netStr.data()) & tqmask); dcerr<<"setValidAddresses: net/tqmask: " <<std::ios::hex<<net<<"/"<<tqmask<<std::ios::dec<<std::endl; diff --git a/lanbrowsing/lisa/client.cpp b/lanbrowsing/lisa/client.cpp index e26b2674..92b62dc5 100644 --- a/lanbrowsing/lisa/client.cpp +++ b/lanbrowsing/lisa/client.cpp @@ -35,7 +35,7 @@ Client::Client(NetManager* tqparent, int socketFD, int closeOnDelete) -:tqparentServer(tqparent) +:parentServer(tqparent) ,m_fd(socketFD) ,m_done(0) ,m_closeOnDelete(closeOnDelete) @@ -46,7 +46,7 @@ Client::Client(NetManager* tqparent, int socketFD, int closeOnDelete) } Client::Client() -:tqparentServer(0) +:parentServer(0) ,m_fd(-1) ,m_done(1) ,m_closeOnDelete(1) @@ -55,7 +55,7 @@ Client::Client() } Client::Client(const Client& c) -:tqparentServer(c.tqparentServer) +:parentServer(c.parentServer) ,m_fd(c.m_fd) ,m_creationTime(c.m_creationTime) ,m_done(c.m_done) @@ -74,7 +74,7 @@ int Client::tryToGetInfo() return 1; } dcerr<<"tryToGetInfo: calling data.getFile()"<<std::endl; - if (!tqparentServer->isInformed()) return 0; + if (!parentServer->isInformed()) return 0; //we fork now, so that writing to the client can't block the server process /* int pid=fork(); if (pid==-1) @@ -91,7 +91,7 @@ int Client::tryToGetInfo() //child //this one does it all :-) dcerr<<"tryToGetInfo: sending data to client"<<std::endl; - tqparentServer->writeDataToFD(fd(),0); + parentServer->writeDataToFD(fd(),0); close(); //exit(0); return 1; diff --git a/lanbrowsing/lisa/client.h b/lanbrowsing/lisa/client.h index a82289c4..b6311235 100644 --- a/lanbrowsing/lisa/client.h +++ b/lanbrowsing/lisa/client.h @@ -34,7 +34,7 @@ class Client void close(); time_t age() {return time(0)-m_creationTime;}; private: - NetManager *tqparentServer; + NetManager *parentServer; int m_fd; //if something goes wrong close the connection after a timeout time_t m_creationTime; diff --git a/lanbrowsing/lisa/netscanner.cpp b/lanbrowsing/lisa/netscanner.cpp index ac8f512d..fd6a86bf 100644 --- a/lanbrowsing/lisa/netscanner.cpp +++ b/lanbrowsing/lisa/netscanner.cpp @@ -191,8 +191,8 @@ struct in_addr NetScanner::getIPfromArray(unsigned int index) { //mdcerr<<"net/tqmask combination detected"<<std::endl; MyString netStr(tmp.left(tmp.find("/"))); - MyString tqmaskStr(tmp.mid(tmp.find("/")+1)); - unsigned int tqmask(IPAddress(tqmaskStr).asInt()); + MyString maskStr(tmp.mid(tmp.find("/")+1)); + unsigned int tqmask(IPAddress(maskStr).asInt()); unsigned int net(IPAddress(netStr).asInt()&tqmask); if ((~tqmask)<indexLeft) { |