--- a/tcpiputils/dhcp/include/DHCPStateMachine.h	Tue Aug 31 16:45:15 2010 +0300
+++ b/tcpiputils/dhcp/include/DHCPStateMachine.h	Wed Sep 01 12:33:58 2010 +0100
@@ -24,6 +24,7 @@
 
 #include <e32base.h>
 #include <comms-infras/statemachine.h>
+#include <es_ini.h>
 
 #include "MsgSender.h"
 #include "DHCP_Std.h"
@@ -196,7 +197,7 @@
    virtual void AssembleClientIDsL() = 0;
    void FetchHWAddress();
 
-   void ConfigureInterfaceL( const TSoInet6InterfaceInfo& aInterfaceInfo );
+   void ConfigureInterfaceL( const TSoInetInterfaceInfoExtnDnsSuffix& aInterfaceInfo );
    virtual void PrepareToSendL(CDHCPStateMachine::EAddressType aEAddressType) = 0;
 #ifdef SYMBIAN_NETWORKING_DHCPSERVER   
    	virtual void PrepareToSendServerMsgL(CDHCPStateMachine::EAddressType aEAddressType) = 0;
@@ -274,7 +275,7 @@
 	//DNS client names
 	HBufC8*   iHostName;
 	HBufC8*   iDomainName;
-
+	
 	TUint32 iRenewalTimeT1;			// number of seconds after iStartedAquisitionAt when we send a renew request
 	TUint32 iRebindTimeT2;			// number of seconds after iStartedAquisitionAt when we send a rebind request (only if any renew fails)
 	TUint32 iLeaseTime;				// number of seconds after iStartedAquisitionAt when the lease expires
@@ -299,7 +300,15 @@
 public:	
 	TBool iDhcpInformAckPending;
 	RBuf8 iSavedExtraParameters;
-#endif //SYMBIAN_NETWORKING_DHCP_MSG_HEADERS	
+#endif //SYMBIAN_NETWORKING_DHCP_MSG_HEADERS
+protected:
+	RInetSuffixList iSuffixList;  // Structure to read domain search list from option data returned by dhcp server
+	CESockIniData *iConfig; // Buffer for dhcp.ini content - part of esock framework for ini file parsing
+private:
+    TBool LoadConfigurationFile(); // Load dhcp.ini file to a buffer
+    void UnloadConfigurationFile(); // Destruct allocated space for dhcp ini content
+protected:
+    TInt IniRead(const TDesC& aOptionName, TDes8& aOptionValue); // Ini parser
 	};
 	
 #ifdef SYMBIAN_NETWORKING_DHCPSERVER