diff -r bb2423252ea3 -r c1029e558ef5 networkprotocols/tcpipv4v6prt/src/res.cpp --- a/networkprotocols/tcpipv4v6prt/src/res.cpp Wed Sep 15 13:53:10 2010 +0300 +++ b/networkprotocols/tcpipv4v6prt/src/res.cpp Wed Oct 13 16:17:27 2010 +0300 @@ -268,8 +268,6 @@ public: void NoDndAvailable(); RTimeout iTimeout; -private: - TInt iFlowRequestType; //< = 0 for IMPLICIT, 1 for SUBCONNECTION EXPLICIT, 2 for EXPLICIT }; // CHostResolverLinkage @@ -1171,8 +1169,6 @@ // Complete the request with network id // iRequest.iId = iCurrentId; - // Set the flow request type to the DND request message - iRequest.iFlowRequestType = iFlowRequestType; #ifdef SYMBIAN_DNS_PUNYCODE iRequest.iScope |= EScopeType_NET; #else @@ -1220,18 +1216,14 @@ return KErrArgument; } } - else if (aName == static_cast(KSoGetErrorCode)) + else + if (aName == static_cast(KSoGetErrorCode)) { // Return a TCP/IP failure code appropriate to the last operation. // Kludge - SetOption does not allow for any return value via aOption (being const), so // return a positive value representing the error code. return (iRequest.iType == KDnsRequestType_GetByAddress) ? -KErrDndAddrNotFound : -KErrDndNameNotFound; } - else if (aName == KSoFlowRequestType) - { - // Receive the flow request passed on from esock layer to the resolver - iFlowRequestType = *reinterpret_cast(aOption.Ptr()); - } } #else