--- a/networkprotocols/dnsproxy/test/src/t_dnsproxymain.cpp Fri Jul 02 18:44:43 2010 +0530
+++ b/networkprotocols/dnsproxy/test/src/t_dnsproxymain.cpp Thu Jul 08 15:21:49 2010 +0530
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
@@ -168,9 +168,7 @@
ERR_PRINTF2(_L("<font color=FF0000>No parameter %S</font>"), &KUSEIAP());
SetBlockResult(EFail);
}
-
-
- _LIT(KTestCaseName,"eth");
+
TBuf8<256> name8;
name8.Copy(pname16);
@@ -244,11 +242,17 @@
}
iUseNapt = ETrue;
+#ifdef SIROCCO_CODE_MIGRATION
+ _LIT(KInterfaceName,"wlan");
+ _LIT(KInterfaceName2,"wlan");
+#else
+ _LIT(KInterfaceName,"eth");
+ _LIT(KInterfaceName2,"eth");
+#endif
+
RSocket sock;
sock.Open(iSs,KAfInet, KSockDatagram, KProtocolInetUdp);
- _LIT(KInterfaceName,"eth");
TUint32 testaddr = GetInterfaceAddress(sock,KInterfaceName());
- _LIT(KInterfaceName2,"eth");
TUint32 ifindex = GetInterfaceIndex(sock, KInterfaceName2());
sock.Close();
@@ -775,11 +779,17 @@
}
iUseNapt = ETrue;
+#ifdef SIROCCO_CODE_MIGRATION
+ _LIT(KInterfaceName,"wlan");
+ _LIT(KInterfaceName2,"wlan");
+#else
+ _LIT(KInterfaceName,"eth");
+ _LIT(KInterfaceName2,"eth");
+#endif
+
RSocket sock;
sock.Open(iSs,KAfInet, KSockDatagram, KProtocolInetUdp);
- _LIT(KInterfaceName,"eth");
TUint32 testaddr = GetInterfaceAddress(sock,KInterfaceName());
- _LIT(KInterfaceName2,"eth");
TUint32 ifindex = GetInterfaceIndex(sock, KInterfaceName2());
sock.Close();