Refactor context models

* Introduce MsgContext concept.
* Link TCP connection oriented context to ModuleContext.
* Merge HostsContext into ModuleContext.
* Use MsgContext as Module Context Item. Less memcpy.

dnscache.c

@@ -599,8 +599,9 @@ static int DNSCache_AddAItemToCache(DnsSimpleParserIterator *i,
     return 0;
 }
 
-int DNSCache_AddItemsToCache(IHeader *Header, BOOL IsFirst)
+int DNSCache_AddItemsToCache(MsgContext *MsgCtx, BOOL IsFirst)
 {
+    IHeader *Header = (IHeader *)MsgCtx;
     char *DnsEntity = IHEADER_TAIL(Header);
     const CtrlContent *TtlContent = NULL;
 
@@ -844,8 +845,9 @@ static int DNSCache_GetByQuestion(__inout DnsGenerator *g,
 }
 
 /* Content length returned */
-int DNSCache_FetchFromCache(IHeader *h /* Entity followed */, int BufferLength)
+int DNSCache_FetchFromCache(MsgContext *MsgCtx, int BufferLength)
 {
+    IHeader *h = (IHeader *)MsgCtx;
     char *RequestContent = (char *)(h + 1);
 
     DnsSimpleParser p;
@@ -913,7 +915,7 @@ int DNSCache_FetchFromCache(IHeader *h /* Entity followed */, int BufferLength)
     memmove(RequestContent, HereToGenerate, ResultLength);
 
     h->EntityLength = ResultLength;
-    if( IHeader_SendBack(h) < 0 )
+    if( MsgContext_SendBack(MsgCtx) < 0 )
     {
         /** TODO: Error handling */
         return -861;

dnscache.h

@@ -9,8 +9,8 @@ int DNSCache_Init(ConfigFileInfo *ConfigInfo);
 
 BOOL Cache_IsInited(void);
 
-int DNSCache_AddItemsToCache(IHeader *Header, BOOL IsFirst);
+int DNSCache_AddItemsToCache(MsgContext *MsgCtx, BOOL IsFirst);
 
-int DNSCache_FetchFromCache(IHeader *h /* Entity followed */, int BufferLength);
+int DNSCache_FetchFromCache(MsgContext *MsgCtx, int BufferLength);
 
 #endif /* _DNS_CACHE_ */

dnsgenerator.c

@@ -772,7 +772,7 @@ static int StripedLength(const char *Origin, int OriginLength)
 }
 
 int DnsGenerator_Init(DnsGenerator *g,
-                      char *Buffer,
+                      char *Buffer, /* generate to here */
                       int BufferLength,
                       const char *CopyFrom,
                       int SourceLength,

dnsgenerator.h

@@ -12,8 +12,11 @@
 
 /* Handle DNS header*/
 #define DNSSetTcpLength(dns_start, Len)         SET_16_BIT_U_INT((char *)(dns_start), Len)
+
 #define DNSSetQueryIdentifier(dns_start, QId)   SET_16_BIT_U_INT((char *)(dns_start), QId)
 
+#define DNSCopyQueryIdentifier(dst, src)        (*(uint16_t *)(dst) = *(uint16_t *)(src))
+
 #define DNSSetFlags(dns_start, Flags)           SET_16_BIT_U_INT((char *)(dns_start) + 2, Flags)
 
 #define DNSSetQuestionCount(dns_start, QC)      SET_16_BIT_U_INT((char *)(dns_start) + 4, QC)

dynamichosts.c

@@ -288,7 +288,7 @@ BOOL DynamicHosts_TypeExisting(const char *Domain, HostsRecordType Type)
     return ret;
 }
 
-HostsUtilsTryResult DynamicHosts_Try(IHeader *Header, int BufferLength)
+HostsUtilsTryResult DynamicHosts_Try(MsgContext *MsgCtx, int BufferLength)
 {
     HostsUtilsTryResult ret;
 
@@ -299,7 +299,7 @@ HostsUtilsTryResult DynamicHosts_Try(IHeader *Header, int BufferLength)
 
     RWLock_RdLock(HostsLock);
 
-    ret = HostsUtils_Try(Header,
+    ret = HostsUtils_Try(MsgCtx,
                          BufferLength,
                          (HostsContainer *)MainDynamicContainer
                          );

dynamichosts.h

@@ -10,6 +10,6 @@ int DynamicHosts_GetCName(const char *Domain, char *Buffer);
 
 BOOL DynamicHosts_TypeExisting(const char *Domain, HostsRecordType Type);
 
-HostsUtilsTryResult DynamicHosts_Try(IHeader *Header, int BufferLength);
+HostsUtilsTryResult DynamicHosts_Try(MsgContext *MsgCtx, int BufferLength);
 
 #endif // DYNAMICHOSTS_H_INCLUDED

filter.c

@@ -296,11 +296,13 @@ static BOOL IsDisabledDomain(const char *Domain, uint32_t HashValue)
     return ret;
 }
 
-BOOL Filter_Out(IHeader *h)
+BOOL Filter_Out(MsgContext *MsgCtx)
 {
+    IHeader *h = (IHeader *)MsgCtx;
+
     if(IsDisabledType(h->Type) || IsDisabledDomain(h->Domain, h->HashValue) )
     {
-        IHeader_SendBackRefusedMessage(h);
+        MsgContext_SendBackRefusedMessage(MsgCtx);
         ShowRefusingMessage(h, "Disabled type or domain");
         DomainStatistic_Add(h, STATISTIC_TYPE_REFUSED);
 

filter.h

@@ -10,6 +10,6 @@ int Filter_Init(ConfigFileInfo *ConfigInfo);
 
 int Filter_Update(void);
 
-BOOL Filter_Out(IHeader *h);
+BOOL Filter_Out(MsgContext *MsgCtx);
 
 #endif // EXCLUDEDLIST_H_INCLUDED