summary refs log tree commit diff stats
path: root/plugins/dns
diff options
context:
space:
mode:
authorTingPing <tingping@tingping.se>2014-01-08 01:32:28 -0500
committerTingPing <tingping@tingping.se>2014-01-08 01:32:28 -0500
commit20d26aea943d8de63a61cb92f506dd51b934fe36 (patch)
treebb9f0377978fcc400e92a07f6ff53b1ec862199e /plugins/dns
parent9cba22c38ab58e7e54258ce012a5e296f81f3f7b (diff)
Rewrite dns command
- Cross platform
- Doesn't depend on external tools
Diffstat (limited to 'plugins/dns')
-rw-r--r--plugins/dns/dns.c332
-rw-r--r--plugins/dns/dns.def3
-rw-r--r--plugins/dns/dns.vcxproj111
-rw-r--r--plugins/dns/dns.vcxproj.filters35
-rw-r--r--plugins/dns/thread.c34
-rw-r--r--plugins/dns/thread.h11
6 files changed, 0 insertions, 526 deletions
diff --git a/plugins/dns/dns.c b/plugins/dns/dns.c
deleted file mode 100644
index 3610e9d0..00000000
--- a/plugins/dns/dns.c
+++ /dev/null
@@ -1,332 +0,0 @@
-/* HexChat Win32 DNS Plugin
- * Copyright (C) 2003-2004 Peter Zelezny.
- * Copyright (C) 2012 Berke Viktor.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-/*
- * Requires MS Visual Studio and IPV6 headers to compile (run nmake).
- * Compiling with gcc (mingw) will fail due to missing gai_strerror.
- */
-
-#define DNS_VERSION "2.4"
-
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <fcntl.h>
-
-#define USE_IPV6
-
-#ifdef WIN32
-#ifdef USE_IPV6
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#else
-#include <winsock2.h>
-#endif
-#include <io.h>
-#else
-#include <unistd.h>
-#include <netdb.h>
-#include <sys/socket.h>
-#endif
-
-#include "hexchat-plugin.h"
-#include "thread.h"
-
-#define HELP "Usage: DNS <nickname|hostname|numerical address>\n"
-#define HEAD "\0034[DNS]\017\t"
-
-#define PIPE_READ 0
-#define PIPE_WRITE 1
-#define MAX_HOSTNAME 128
-
-static hexchat_plugin *ph;
-static thread *active_thread = NULL;
-
-
-static int
-waitline (void *source, char *buf, int bufsize)
-{
-	int i = 0;
-	int len;
-
-	while(1)
-	{
-		len = 1;
-		/* we can't read() here, due to glib's giowin32 */
-		if (ph->hexchat_read_fd (ph, source, buf + i, &len) != 0)
-		{
-			return -1;
-		}
-		if (buf[i] == '\n' || bufsize == i + 1)
-		{
-			buf[i] = 0;
-			return i;
-		}
-		i++;
-	}
-}
-
-static void *
-thread_function (void *ud)
-{
-#ifdef USE_IPV6
-	struct addrinfo *ent;
-	struct addrinfo *cur;
-	struct addrinfo hints;
-#else
-	struct hostent *ent;
-#endif
-	thread *th = ud;
-	int fd = th->pipe_fd[PIPE_WRITE];
-	int ret;
-	char ipstring[MAX_HOSTNAME];
-	char reverse[MAX_HOSTNAME];
-//	int i;
-
-	active_thread = th;
-
-#ifdef USE_IPV6
-	memset (&hints, 0, sizeof (hints));
-	hints.ai_family = PF_UNSPEC; /* support ipv6 and ipv4 */
-	hints.ai_flags = AI_CANONNAME;
-//	hints.ai_socktype = SOCK_STREAM;
-
-	ret = getaddrinfo (th->userdata, NULL, &hints, &ent);
-	if (ret != 0)
-	{
-		sprintf (ipstring, "1%d\n", ret);	/* failed */
-		write (fd, ipstring, strlen (ipstring));
-//		Sleep (3000);
-		active_thread = NULL;
-		return 0;
-	}
-
-//	i = 0;
-	cur = ent;
-	while (cur)
-	{
-		/* find the numeric IP number */
-		ipstring[0] = 0;
-		getnameinfo (cur->ai_addr, cur->ai_addrlen,
-						 ipstring, sizeof (ipstring), NULL, 0, NI_NUMERICHOST);
-
-		if (cur->ai_canonname)
-		{
-			/* force reverse lookup if canonname & ipstring are the same */
-			if (/*i == 0 &&*/ strcmp (cur->ai_canonname, ipstring) == 0)
-				goto lamecode;
-		}
-
-		if (cur->ai_canonname)
-		{
-			write (fd, "0", 1);
-			write (fd, ipstring, strlen (ipstring));
-			write (fd, "\n", 1);
-			write (fd, cur->ai_canonname, strlen (cur->ai_canonname));
-		} else
-		{
-lamecode:
-	//		ret = 1;
-	//		if (i == 0)
-			{
-				/* reverse lookup */
-				reverse[0] = 0;
-				ret = getnameinfo (cur->ai_addr, cur->ai_addrlen,
-							 reverse, sizeof (reverse), NULL, 0, NI_NAMEREQD);
-			}
-
-			write (fd, "0", 1);
-			write (fd, ipstring, strlen (ipstring));
-
-			write (fd, "\n", 1);
-			if (ret == 0)
-				write (fd, reverse, strlen (reverse));
-		}
-		write (fd, "\n", 1);
-
-//		i++;
-		cur = cur->ai_next;
-	}
-
-	/* tell the parent we're done */
-	write (fd, "2\n", 2);
-	freeaddrinfo (ent);
-
-#else
-	ent = gethostbyname (th->userdata);
-	if (ent)
-	{
-		write (fd, "0", 1);
-		write (fd, ent->h_name, strlen (ent->h_name));
-		write (fd, "\n", 1);
-		write (fd, ent->h_name, strlen (ent->h_name));
-		write (fd, "\n", 1);
-		write (fd, "2\n", 2);
-	} else
-	{
-		write (fd, "10\n", 1);
-	}
-#endif
-
-//	Sleep (3000);
-	active_thread = NULL;	/* race condition, better than nothing */
-
-	return 0;
-}
-
-static int
-dns_close_pipe (int fd)
-{
-	close (fd);
-	return 0;
-}
-
-/* read messages comming from the child (through the pipe) */
-
-static int
-dns_read_cb (int fd, int flags, thread *th, void *source)
-{
-	char buf[512];
-	char buf2[512];
-
-	while (waitline (source, buf, sizeof (buf)))
-	{
-		switch (buf[0])
-		{
-		case '0':		/* got data to show */
-			waitline (source, buf2, sizeof (buf2));
-			if (buf2[0] == 0)
-				hexchat_printf(ph, HEAD"\002Numerical\002: %s\n", buf + 1);
-			else
-				hexchat_printf(ph, HEAD"\002Canonical\002: %s \002Numerical\002: %s\n", buf2, buf + 1);
-			return 1;
-
-		case '1':		/* failed */
-			hexchat_printf(ph, HEAD"Lookup failed. %s\n", gai_strerrorA (atoi (buf + 1)));
-
-		case '2':		/* done */
-		//	close (th->pipe_fd[PIPE_WRITE]);
-		//	close (th->pipe_fd[PIPE_READ]);
-			hexchat_hook_timer(ph, 3000, dns_close_pipe, (void *)th->pipe_fd[PIPE_WRITE]);
-			hexchat_hook_timer(ph, 4000, dns_close_pipe, (void *)th->pipe_fd[PIPE_READ]);
-			free (th->userdata); 	/* hostname strdup'ed */
-			free (th);
-			return 0;
-		}
-	}
-
-	return 1;
-}
-
-/* find hostname from nickname (search the userlist, current chan only) */
-
-static char *
-find_nick_host (char *nick)
-{
-	hexchat_list *list;
-	char *at;
-	const char *host;
-
-	list = hexchat_list_get (ph, "users");
-	if (!list)
-		return NULL;
-
-	while (hexchat_list_next (ph, list))
-	{
-		if (stricmp (nick, hexchat_list_str (ph, list, "nick")) == 0)
-		{
-			host = hexchat_list_str (ph, list, "host");
-			if (host)
-			{
-				at = strrchr (host, '@');
-				if (at)
-					return at + 1;
-			}
-			break;
-		}
-	}
-
-	return NULL;
-}
-
-static int
-dns_cmd_cb (char *word[], char *word_eol[], void *ud)
-{
-	thread *th;
-	char *nickhost;
-
-	if (!word[2][0])
-	{
-		hexchat_print (ph, HELP);
-		return HEXCHAT_EAT_ALL;
-	}
-
-	th = thread_new ();
-	if (th)
-	{
-		nickhost = find_nick_host (word[2]);
-		if (nickhost)
-		{
-			hexchat_printf (ph, HEAD"Looking up %s (%s)...\n", nickhost, word[2]);
-			th->userdata = strdup (nickhost);
-		} else
-		{
-			hexchat_printf (ph, HEAD"Looking up %s...\n", word[2]);
-			th->userdata = strdup (word[2]);
-		}
-
-		if (thread_start (th, thread_function, th))
-		{
-			hexchat_hook_fd(ph, th->pipe_fd[PIPE_READ],
-							HEXCHAT_FD_READ | HEXCHAT_FD_EXCEPTION | HEXCHAT_FD_NOTSOCKET,
-							(void *)dns_read_cb, th);
-
-		}
-	}
-
-	return HEXCHAT_EAT_ALL;
-}
-
-int
-hexchat_plugin_deinit (hexchat_plugin *plugin_handle)
-{
-	while (active_thread)	/* children will set this var to NULL soon... */
-	{
-		Sleep (1000);
-	}
-	hexchat_printf (ph, "DNS plugin unloaded\n");
-	return 1;
-}
-
-int
-hexchat_plugin_init
-				(hexchat_plugin *plugin_handle, char **plugin_name,
-				char **plugin_desc, char **plugin_version, char *arg)
-{
-	/* we need to save this for use with any hexchat_* functions */
-	ph = plugin_handle;
-
-	*plugin_name = "DNS";
-	*plugin_desc = "Threaded IPv4/6 DNS Command";
-	*plugin_version = DNS_VERSION;
-
-	hexchat_hook_command(ph, "DNS", HEXCHAT_PRI_LOW, dns_cmd_cb, HELP, 0);
-	hexchat_printf (ph, "DNS plugin loaded\n");
-
-	return 1;       /* return 1 for success */
-}
diff --git a/plugins/dns/dns.def b/plugins/dns/dns.def
deleted file mode 100644
index e560f50f..00000000
--- a/plugins/dns/dns.def
+++ /dev/null
@@ -1,3 +0,0 @@
-EXPORTS 

-hexchat_plugin_init 

-hexchat_plugin_deinit 

diff --git a/plugins/dns/dns.vcxproj b/plugins/dns/dns.vcxproj
deleted file mode 100644
index 8709d2a5..00000000
--- a/plugins/dns/dns.vcxproj
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup Label="Configuration">

-    <PlatformToolset>v120</PlatformToolset>

-  </PropertyGroup>

-  <ItemGroup Label="ProjectConfigurations">

-    <ProjectConfiguration Include="Release|Win32">

-      <Configuration>Release</Configuration>

-      <Platform>Win32</Platform>

-    </ProjectConfiguration>

-    <ProjectConfiguration Include="Release|x64">

-      <Configuration>Release</Configuration>

-      <Platform>x64</Platform>

-    </ProjectConfiguration>

-  </ItemGroup>

-  <PropertyGroup Label="Globals">

-    <ProjectGuid>{3786FA8C-3E76-45E3-984E-FCCFF44729C9}</ProjectGuid>

-    <Keyword>Win32Proj</Keyword>

-    <RootNamespace>dns</RootNamespace>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

-    <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <UseDebugLibraries>false</UseDebugLibraries>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

-    <ConfigurationType>DynamicLibrary</ConfigurationType>

-    <UseDebugLibraries>false</UseDebugLibraries>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-    <CharacterSet>MultiByte</CharacterSet>

-  </PropertyGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

-  <ImportGroup Label="ExtensionSettings">

-  </ImportGroup>

-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-    <Import Project="..\..\win32\hexchat.props" />

-  </ImportGroup>

-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

-    <Import Project="..\..\win32\hexchat.props" />

-  </ImportGroup>

-  <PropertyGroup Label="UserMacros" />

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <LinkIncremental>false</LinkIncremental>

-    <TargetName>hcdns</TargetName>

-    <OutDir>$(HexChatBin)</OutDir>

-    <IntDir>$(HexChatObj)$(ProjectName)\</IntDir>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <LinkIncremental>false</LinkIncremental>

-    <TargetName>hcdns</TargetName>

-    <OutDir>$(HexChatBin)</OutDir>

-    <IntDir>$(HexChatObj)$(ProjectName)\</IntDir>

-  </PropertyGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

-    <ClCompile>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <IntrinsicFunctions>true</IntrinsicFunctions>

-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;DNS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <MultiProcessorCompilation>true</MultiProcessorCompilation>

-    </ClCompile>

-    <Link>

-      <SubSystem>Windows</SubSystem>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <OptimizeReferences>true</OptimizeReferences>

-      <AdditionalLibraryDirectories>$(DepsRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

-      <AdditionalDependencies>$(DepLibs);%(AdditionalDependencies)</AdditionalDependencies>

-      <ModuleDefinitionFile>dns.def</ModuleDefinitionFile>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

-    <ClCompile>

-      <PrecompiledHeader>

-      </PrecompiledHeader>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <IntrinsicFunctions>true</IntrinsicFunctions>

-      <PreprocessorDefinitions>WIN32;_WIN64;_AMD64_;NDEBUG;_WINDOWS;_USRDLL;DNS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <AdditionalIncludeDirectories>..\..\src\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <MultiProcessorCompilation>true</MultiProcessorCompilation>

-    </ClCompile>

-    <Link>

-      <SubSystem>Windows</SubSystem>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <OptimizeReferences>true</OptimizeReferences>

-      <AdditionalLibraryDirectories>$(DepsRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

-      <AdditionalDependencies>$(DepLibs);%(AdditionalDependencies)</AdditionalDependencies>

-      <ModuleDefinitionFile>dns.def</ModuleDefinitionFile>

-    </Link>

-  </ItemDefinitionGroup>

-  <ItemGroup>

-    <None Include="dns.def" />

-  </ItemGroup>

-  <ItemGroup>

-    <ClCompile Include="dns.c" />

-    <ClCompile Include="thread.c" />

-  </ItemGroup>

-  <ItemGroup>

-    <ClInclude Include="thread.h" />

-  </ItemGroup>

-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

-  <ImportGroup Label="ExtensionTargets">

-  </ImportGroup>

-</Project>
\ No newline at end of file
diff --git a/plugins/dns/dns.vcxproj.filters b/plugins/dns/dns.vcxproj.filters
deleted file mode 100644
index a49dc1e2..00000000
--- a/plugins/dns/dns.vcxproj.filters
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ItemGroup>

-    <Filter Include="Source Files">

-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>

-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>

-    </Filter>

-    <Filter Include="Header Files">

-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>

-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>

-    </Filter>

-    <Filter Include="Resource Files">

-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>

-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>

-    </Filter>

-  </ItemGroup>

-  <ItemGroup>

-    <None Include="dns.def">

-      <Filter>Resource Files</Filter>

-    </None>

-  </ItemGroup>

-  <ItemGroup>

-    <ClCompile Include="dns.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ClCompile Include="thread.c">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-  </ItemGroup>

-  <ItemGroup>

-    <ClInclude Include="thread.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

-  </ItemGroup>

-</Project>
\ No newline at end of file
diff --git a/plugins/dns/thread.c b/plugins/dns/thread.c
deleted file mode 100644
index d0347130..00000000
--- a/plugins/dns/thread.c
+++ /dev/null
@@ -1,34 +0,0 @@
-#include <io.h>
-#include <fcntl.h>
-#include "thread.h"
-
-thread *
-thread_new (void)
-{
-	thread *th;
-
-	th = calloc (1, sizeof (*th));
-	if (!th)
-	{
-		return NULL;
-	}
-
-	if (_pipe (th->pipe_fd, 4096, _O_BINARY) == -1)
-	{
-		free (th);
-		return NULL;
-	}
-
-	return th;
-}
-
-int
-thread_start (thread *th, void *(*start_routine)(void *), void *arg)
-{
-	DWORD id;
-
-	CloseHandle (CreateThread (NULL, 0, (LPTHREAD_START_ROUTINE)start_routine, arg, 0, (DWORD *)&id));
-	th->threadid = id;
-
-	return 1;
-}
diff --git a/plugins/dns/thread.h b/plugins/dns/thread.h
deleted file mode 100644
index 1ec6932d..00000000
--- a/plugins/dns/thread.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <windows.h>
-
-typedef struct
-{
-	DWORD threadid;
-	int pipe_fd[2];
-	void *userdata;
-} thread;
-
-thread *thread_new (void);
-int thread_start (thread *th, void *(*start_routine)(void *), void *arg);