--- parser3/src/classes/inet.C 2015/08/20 22:16:47 1.9 +++ parser3/src/classes/inet.C 2026/07/19 14:25:42 1.22 @@ -1,8 +1,8 @@ /** @file Parser: @b inet parser class. - Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com) - Author: Alexandr Petrosian (http://paf.design.ru) + Copyright (c) 2001-2026 Art. Lebedev Studio (https://www.artlebedev.com) + Authors: Konstantin Morshnev , Alexandr Petrosian */ #include "pa_vmethod_frame.h" @@ -10,10 +10,11 @@ #include "pa_vtable.h" #ifdef _MSC_VER +#include "winsock2.h" #include "ws2tcpip.h" #endif -volatile const char * IDENT_INET_C="$Id: inet.C,v 1.9 2015/08/20 22:16:47 moko Exp $"; +volatile const char * IDENT_INET_C="$Id: inet.C,v 1.22 2026/07/19 14:25:42 moko Exp $"; class MInet: public Methoded { public: @@ -22,7 +23,7 @@ public: // global variables -DECLARE_CLASS_VAR(inet, new MInet, 0); +DECLARE_CLASS_VAR(inet, new MInet); static void _ntoa(Request& r, MethodParams& params){ @@ -30,7 +31,7 @@ static void _ntoa(Request& r, MethodPara static const int ip_cstr_bufsize=3*4+3+1/*zero-teminator*/+1/*for faulty snprintfs*/; char* ip_cstr=new(PointerFreeGC) char[ip_cstr_bufsize]; snprintf(ip_cstr, ip_cstr_bufsize, "%u.%u.%u.%u", (l>>24) & 0xFF, (l>>16) & 0xFF, (l>>8) & 0xFF, l & 0xFF); - r.write_no_lang(*new String(ip_cstr)); + r.write(*new String(ip_cstr)); } static void _aton(Request& r, MethodParams& params){ @@ -73,7 +74,7 @@ static void _aton(Request& r, MethodPara throw Exception(PARSER_RUNTIME, 0, "Invalid IP address '%s' specified.", ip_cstr); } else { result=(result << 8)+(ulong)byte_value; - r.write_no_lang(*new VDouble(result)); + r.write(*new VDouble(result)); } } @@ -96,12 +97,12 @@ static void _ip2name(Request& r, MethodP hints.ai_family=AF_INET; hints.ai_socktype=SOCK_STREAM; hints.ai_flags=AI_NUMERICHOST; // to disable DNS lookup - + if(params.count() == 2) if(HashStringValue* options=params.as_hash(1)){ int valid_options=0; if(Value* value=options->get("ipv")){ - hints.ai_family=ipv_format(r.process_to_value(*value).as_string()); + hints.ai_family=ipv_format(r.process(*value).as_string()); valid_options++; } if(valid_options!=options->count()) @@ -120,11 +121,46 @@ static void _ip2name(Request& r, MethodP freeaddrinfo(info); if(!error){ - r.write_no_lang(*new String(pa_idna_decode(pa_strdup(hbuf), r.charsets.source()), String::L_TAINTED)); + r.write(*new String(pa_idna_decode(pa_strdup(hbuf), r.charsets.source()), String::L_TAINTED)); } else if(error!=EAI_NONAME){ throw Exception(PARSER_RUNTIME, 0, "Can't resolve IP address '%s': %s", ip_cstr, gai_strerror(error)); } } + +// also used in curl.C, returns first address or fills the table if not null +const char *pa_name2ip(const char *name, int family, Table *table, const char *exception_type){ + struct addrinfo hints, *info; + memset(&hints, 0, sizeof(hints)); + hints.ai_family=family; + hints.ai_socktype=SOCK_STREAM; + + int error=getaddrinfo(name, NULL, &hints, &info); + + if(error) + throw Exception(exception_type, 0, "Can't resolve domain name '%s': %s", name, gai_strerror(error)); + + const char *result=0; + char hbuf[INET6_ADDRSTRLEN]; + + for(struct addrinfo *cur=info; cur; cur=cur->ai_next) { + if(error=getnameinfo(cur->ai_addr, cur->ai_addrlen, hbuf, sizeof(hbuf), NULL, 0, NI_NUMERICHOST)) + throw Exception(exception_type, 0, "Can't translate address: %s", gai_strerror(error)); + if(table){ + Table::element_type row(new ArrayString()); + static const String sv4("4"), sv6("6"), sunknown("unknown"); + *row+=new String(pa_strdup(hbuf), String::L_TAINTED); + *row+=cur->ai_family == AF_INET ? &sv4 : cur->ai_family == AF_INET6 ? &sv6 : &sunknown; + *table+=row; + } else { + result=pa_strdup(hbuf); + break; + } + } + + freeaddrinfo(info); + return result; +} + static void _name2ip(Request& r, MethodParams& params){ const String sname=params.as_string(0, PARAMETER_MUST_BE_STRING); if(sname.is_empty()) @@ -132,22 +168,18 @@ static void _name2ip(Request& r, MethodP const char* name_cstr=pa_idna_encode(sname.cstr(), r.charsets.source()); - struct addrinfo hints, *info; - memset(&hints, 0, sizeof(hints)); - hints.ai_family=AF_INET; - hints.ai_socktype=SOCK_STREAM; - + int family=AF_INET; Table *table=NULL; if(params.count() == 2) if(HashStringValue* options=params.as_hash(1)){ int valid_options=0; if(Value* value=options->get("ipv")){ - hints.ai_family=ipv_format(r.process_to_value(*value).as_string()); + family=ipv_format(r.process(*value).as_string()); valid_options++; } if(Value* value=options->get("table")){ - if(r.process_to_value(*value).as_bool()){ + if(r.process(*value).as_bool()){ Table::columns_type columns(new ArrayString); static const String sip("ip"), sversion("version"); *columns+=&sip; *columns+=&sversion; @@ -159,33 +191,20 @@ static void _name2ip(Request& r, MethodP throw Exception(PARSER_RUNTIME, 0, CALLED_WITH_INVALID_OPTION); } - int error=getaddrinfo(name_cstr, NULL, &hints, &info); + if(const char *ip=pa_name2ip(name_cstr, family, table, PARSER_RUNTIME)) + r.write(*new String(ip, String::L_TAINTED)); - if(error) - throw Exception(PARSER_RUNTIME, 0, "Can't resolve domain name '%s': %s", name_cstr, gai_strerror(error)); - - char hbuf[INET6_ADDRSTRLEN]; + if(table) + r.write(*new VTable(table)); +} - for(struct addrinfo *cur=info; cur; cur=cur->ai_next) { - if(error=getnameinfo(cur->ai_addr, cur->ai_addrlen, hbuf, sizeof(hbuf), NULL, 0, NI_NUMERICHOST)) - throw Exception(PARSER_RUNTIME, 0, "Can't translate address: %s", gai_strerror(error)); - String *saddr=new String(pa_strdup(hbuf), String::L_TAINTED); - if(table){ - Table::element_type row(new ArrayString()); - static const String sv4("4"), sv6("6"), sunknown("unknown"); - *row+=saddr; - *row+=cur->ai_family == AF_INET ? &sv4 : cur->ai_family == AF_INET6 ? &sv6 : &sunknown; - *table+=row; - } else { - r.write_no_lang(*saddr); - break; - } - } +static void _hostname(Request& r, MethodParams&){ + char buf[MAX_STRING]; - if(table) - r.write_no_lang(*new VTable(table)); + if(gethostname(buf, MAX_STRING)) + throw Exception(PARSER_RUNTIME, 0, "Cant't get hostname"); - freeaddrinfo(info); + r.write(*new String(pa_strdup(buf), String::L_TAINTED)); } // constructor @@ -196,4 +215,6 @@ MInet::MInet(): Methoded("inet") { add_native_method("ip2name", Method::CT_STATIC, _ip2name, 1, 2); // ^inet:name2ip[name; $.ipv[4|6|any] $.table(true) ] add_native_method("name2ip", Method::CT_STATIC, _name2ip, 1, 2); + // ^inet:hostname[] + add_native_method("hostname", Method::CT_STATIC, _hostname, 0, 0); }