move stringfromipv4 into common.c

rofl0r · Nov 7, 2012 · c698d48 · c698d48
1 parent 8b19829
commit c698d48
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 27 deletions.
diff --git a/src/common.c b/src/common.c
@@ -3,6 +3,30 @@
 #include <unistd.h>
 #include <stdio.h>
 
+// stolen from libulz (C) rofl0r
+void pc_stringfromipv4(unsigned char *ip_buf_4_bytes, char *outbuf_16_bytes) {
+	unsigned char *p;
+	char *o = outbuf_16_bytes;
+	unsigned char n;
+	for(p = ip_buf_4_bytes; p < ip_buf_4_bytes + 4; p++) {
+		n = *p;
+		if(*p >= 100) {
+			if(*p >= 200)
+				*(o++) = '2';
+			else
+				*(o++) = '1';
+			n %= 100;
+		}
+		if(*p >= 10) {
+			*(o++) = (n / 10) + '0';
+			n %= 10;
+		}
+		*(o++) = n + '0';
+		*(o++) = '.';
+	}
+	o[-1] = 0;
+}
+
 static int check_path(char *path) {
 	if(!path)
 		return 0;

diff --git a/src/common.h b/src/common.h
@@ -12,6 +12,7 @@
 #include <stddef.h>
 
 char *get_config_path(char* default_path, char* pbuf, size_t bufsize);
+void pc_stringfromipv4(unsigned char *ip_buf_4_bytes, char *outbuf_16_bytes);
 
 //RcB: DEP "common.c"
 #endif
diff --git a/src/core.c b/src/core.c
@@ -47,30 +47,6 @@ extern int tcp_connect_time_out;
 extern int proxychains_quiet_mode;
 extern unsigned int remote_dns_subnet;
 
-// stolen from libulz (C) rofl0r
-void pc_stringfromipv4(unsigned char *ip_buf_4_bytes, char *outbuf_16_bytes) {
-	unsigned char *p;
-	char *o = outbuf_16_bytes;
-	unsigned char n;
-	for(p = ip_buf_4_bytes; p < ip_buf_4_bytes + 4; p++) {
-		n = *p;
-		if(*p >= 100) {
-			if(*p >= 200)
-				*(o++) = '2';
-			else
-				*(o++) = '1';
-			n %= 100;
-		}
-		if(*p >= 10) {
-			*(o++) = (n / 10) + '0';
-			n %= 10;
-		}
-		*(o++) = n + '0';
-		*(o++) = '.';
-	}
-	o[-1] = 0;
-}
-
 static int poll_retry(struct pollfd *fds, nfds_t nfsd, int timeout) {
 	int ret;
 	int time_remain = timeout;

diff --git a/src/core.h b/src/core.h
@@ -114,8 +114,6 @@ int proxy_getaddrinfo(const char *node, const char *service,
 		      const struct addrinfo *hints, struct addrinfo **res);
 void proxy_freeaddrinfo(struct addrinfo *res);
 
-void pc_stringfromipv4(unsigned char *ip_buf_4_bytes, char *outbuf_16_bytes);
-
 void core_initialize(void);
 void core_unload(void);
 

diff --git a/tests/test_gethostent.c b/tests/test_gethostent.c
@@ -1,6 +1,6 @@
 #include <netdb.h>
 #include <stdio.h>
-#include "../src/core.h"
+#include "../src/common.h"
 
 void printhostent(struct hostent *hp) {
 	char ipbuf[16];

diff --git a/tests/test_proxy_gethostbyname.c b/tests/test_proxy_gethostbyname.c
@@ -1,4 +1,5 @@
 #include "../src/core.h"
+#include "../src/common.h"
 #include <stdio.h>
 
 void printhostent(struct hostent *hp) {