Usermode/(libnet,libpsocket) - Call new DNS code from getaddrinfo

[tpg/acess2.git] / Usermode / Libraries / libnet.so_src / hostnames.c

diff --git a/Usermode/Libraries/libnet.so_src/hostnames.c b/Usermode/Libraries/libnet.so_src/hostnames.c
index 203f4aa..88093de 100644 (file)
--- a/Usermode/Libraries/libnet.so_src/hostnames.c
+++ b/Usermode/Libraries/libnet.so_src/hostnames.c
@@ -24,16 +24,23 @@ struct sHostEntry
        char    *Names[];
 };
 
-struct sDNSCallbackInfo
+struct sLookupAnyInfo
 {
-        int    expected_size;
+        int    expected_type;
        void    *dest_ptr;
+       bool    have_result;
+};
+struct sDNSCallbackInfo
+{
+       void    *cb_info;
+       tNet_LookupAddrs_Callback       *callback;
        enum eTypes     desired_type;
        enum eClass     desired_class;
-       bool    have_result;
+       bool    got_value;
 };
 
 // === PROTOTYPES ===
+ int   int_lookupany_callback(void *info_v, int AddrType, const void *Addr);
 void   int_DNS_callback(void *info, const char *name, enum eTypes type, enum eClass class, unsigned int ttl, size_t rdlength, const void *rdata);
 
 // === GLOBALS ===
@@ -44,6 +51,28 @@ struct sHostEntry    *gaHostEntries;
 
 // === CODE ===
 int Net_Lookup_AnyAddr(const char *Name, int AddrType, void *Addr)
+{
+       struct sLookupAnyInfo   cb_info = {
+               .expected_type = AddrType,
+               .dest_ptr = Addr,
+               .have_result = false,
+               };
+       return Net_Lookup_Addrs(Name, &cb_info, int_lookupany_callback);
+}
+int int_lookupany_callback(void *info_v, int AddrType, const void *Addr)
+{
+       struct sLookupAnyInfo   *info = info_v;
+       if( AddrType == info->expected_type && info->have_result == false )
+       {
+               memcpy(info->dest_ptr, Addr, Net_GetAddressSize(AddrType));
+               
+               info->have_result = true;
+               return 1;
+       }
+       return 0;
+}
+
+int Net_Lookup_Addrs(const char *Name, void *cb_info, tNet_LookupAddrs_Callback *callback)
 {
        // 1. Load (if not loaded) the DNS config from "/Acess/Conf/dns"
        // - "* <ip> <ip>" for DNS server(s)
@@ -53,33 +82,29 @@ int Net_Lookup_AnyAddr(const char *Name, int AddrType, void *Addr)
        for( int i = 0; i < giNumHostEntries; i ++ )
        {
                const struct sHostEntry* he = &gaHostEntries[i];
-               if( he->AddrType == AddrType )
+               for( const char * const *namep = (const char**)he->Names; *namep; namep ++ )
                {
-                       for( const char * const *namep = (const char**)he->Names; *namep; namep ++ )
+                       if( strcasecmp(Name, *namep) == 0 )
                        {
-                               if( strcasecmp(Name, *namep) == 0 )
-                               {
-                                       memcpy(Addr, he->AddrData, Net_GetAddressSize(AddrType));
+                               if( callback(cb_info, he->AddrType, he->AddrData) != 0 )
                                        return 0;
-                               }
                        }
                }
        }
        // 3. Contact DNS server specified in config
        for( int i = 0; i < giNumDNSServers; i ++ )
        {
-               // TODO
                const struct sDNSServer *s = &gaDNSServers[i];
                struct sDNSCallbackInfo info = {
-                       .expected_size = Net_GetAddressSize(AddrType),
-                       .dest_ptr = Addr,
+                       .cb_info = cb_info,
+                       .callback = callback,
                        .desired_type = TYPE_A,
                        .desired_class = CLASS_IN,
-                       .have_result = false
+                       .got_value = false,
                        };
                if( ! DNS_Query(s->AddrType, s->AddrData, Name, info.desired_type, info.desired_class, int_DNS_callback, &info) )
                {
-                       if( info.have_result )
+                       if( info.got_value )
                        {
                                return 0;
                        }
@@ -96,18 +121,30 @@ int Net_Lookup_AnyAddr(const char *Name, int AddrType, void *Addr)
 void int_DNS_callback(void *info_v, const char *name, enum eTypes type, enum eClass class, unsigned int ttl, size_t rdlength, const void *rdata)
 {
        struct sDNSCallbackInfo *info = info_v;
-       if( type == info->desired_type && class == info->desired_class && info->have_result == false )
+       
+       // Check type matches (if pattern was provided)
+       if( info->desired_type != QTYPE_STAR && type != info->desired_type )
+               return ;
+       if( info->desired_class != QCLASS_STAR && class != info->desired_class )
+               return ;
+       
+       switch( type )
        {
-               // We're just working with A and AAAA, so copying from rdata is safe
-               if( rdlength != info->expected_size ) {
-                       // ... oh, that's not good
+       case TYPE_A:
+               if( rdlength != 4 )
                        return ;
-               }
-               
-               memcpy(info->dest_ptr, rdata, rdlength);
-               
-               info->have_result = true;
+               info->callback( info->cb_info, 4, rdata );
+               break;
+       //case TYPE_AAAA:
+       //      if( rdlength != 16 )
+       //              return ;
+       //      info->callback( info->cb_info, 6, rdata );
+       //      break;
+       default:
+               // Ignore anything not A/AAAA
+               break;
        }
+       info->got_value = true;
 }
 
 int Net_Lookup_Name(int AddrType, const void *Addr, char *Dest[256])