Revert "Merge branch 'fix_dns_name' into main"

This reverts commit 5ecd9d6, reversing
changes made to 6b93f45.

inc/libft_network/ipv4.h

@@ -46,7 +46,7 @@
 # endif // NI_MAXHOST
 
 # define HTOI4_USE_SOCKET		1
-# define I4TOH_USE_SOCKET		1
+# define I4TOH_USE_SOCKET		0
 
 # define		DNS_TYPE_A		1
 // # define		DNS_TYPE_NS		2

inc/libft_network/packet.h

@@ -6,7 +6,7 @@
 /*   By: brda-sil <brda-sil@students.42angouleme    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2022/11/09 00:48:48 by brda-sil          #+#    #+#             */
-/*   Updated: 2024/06/03 13:12:21 by brda-sil         ###   ########.fr       */
+/*   Updated: 2024/05/28 22:04:49 by brda-sil         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -217,22 +217,6 @@ typedef struct s_dnsq
 	t_uint16	class;
 }	t_dnsq;
 
-	// DNS RECORD
-
-typedef	struct	s_dnsr_name
-{
-	t_uint16			offset;
-	char				*name;
-	struct s_dnsr_name	*next;
-}	t_dnsr_name;
-
-typedef	struct	s_dnsr_struct
-{
-	unsigned char	*data;
-	t_dnsr_name		*names;
-	t_uint16		offset;
-}	t_dnsr_struct;
-
 typedef struct s_dnsr
 {
 	t_uint16	type;
@@ -295,16 +279,6 @@ char						*ft_dns_get_domain_fmt(char *domain);
 // network/packet/dns/get_ptr_record.c
 char						*ft_dns_get_ptr_record(t_packet *pkt);
 
-// network/packet/dns/get_record/main.c
-void						append_name(t_dnsr_name *name, t_dnsr_struct **dnsr);
-char						*get_name_by_offset(t_uint16 offset, t_dnsr_struct *dnsr);
-t_uint32					get_dnsr_name(t_dnsr_struct *dnsr);
-t_uint16					get_dnsr_type(t_dnsr_struct *dnsr, t_uint16 name_len);
-t_uint16					get_dnsr_class(t_dnsr_struct *dnsr, t_uint16 name_len);
-char						*get_last_name(t_dnsr_struct *dnsr);
-t_bool						get_dnsr_record(t_dnsr_struct *dnsr, t_uint16 type);
-char						*ft_dns_get_record(t_packet *pkt, t_uint16 type);
-
 // network/packet/dns/ip_to_domain.c
 char						*ft_dns_ip_to_domain(t_int4 ip);
 

mk/srcs.mk

@@ -210,7 +210,6 @@ SRC_NET_PACK := network/packet/checksum.c \
 				network/packet/dns/get_a_record.c \
 				network/packet/dns/get_domain_fmt.c \
 				network/packet/dns/get_ptr_record.c \
-				network/packet/dns/get_record/main.c \
 				network/packet/dns/ip_to_domain.c \
 				network/packet/dns/name_get.c \
 				network/packet/dns/print.c \

src/network/ipv4/i4toh_socket/recv_packet.c

@@ -6,7 +6,7 @@
 /*   By: brda-sil <brda-sil@students.42angouleme    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/05/26 00:22:20 by brda-sil          #+#    #+#             */
-/*   Updated: 2024/06/03 13:40:25 by brda-sil         ###   ########.fr       */
+/*   Updated: 2024/05/28 16:03:34 by brda-sil         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -57,5 +57,5 @@ char	*ft_i4toh_recv_packet(int sock)
 		if (check_reply(&pkt))
 			break;
 	}
-	return (ft_dns_get_record(&pkt, DNS_TYPE_PTR));
+	return (ft_dns_get_ptr_record(&pkt));
 }

test/src/i4toh.c

@@ -6,7 +6,7 @@
 /*   By: brda-sil <brda-sil@students.42angouleme    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/03/31 22:56:30 by brda-sil          #+#    #+#             */
-/*   Updated: 2024/06/03 13:57:46 by brda-sil         ###   ########.fr       */
+/*   Updated: 2024/05/28 23:35:13 by brda-sil         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -18,6 +18,8 @@
 # define CI_TEST FALSE
 #endif
 
+# define TARGET_IP	0xacd914ce
+
 void	test_getnameinfo(char *ip);
 
 int	test_i4toh(t_int4 ip)
@@ -26,11 +28,11 @@ int	test_i4toh(t_int4 ip)
 	char	*ip_str;
 
 	ip_str = ft_getip_str(ft_htonl(ip));
-	name = ft_i4toh(ip);
+	name = ft_i4toh_socket(ip);
 	// test_getnameinfo(ip_str);
 	free(ip_str);
 	ft_putip_fd(ip, 1);
-	ft_printf("%s -> ", CSI "20G");
+	ft_putstr_fd(" -> ", 1);
 	if (!name)
 	{
 		ft_putstr_fd("error\n", 1);
@@ -47,14 +49,9 @@ int	ci_test(void)
 	int	ret;
 
 	ret = 0;
-	for (int i = 0; i < 1; i++)
-	{
-		// ret += test_i4toh(0xd83ad6ae);
-		// ret += test_i4toh(0x4d9aed79);
-		// ret += test_i4toh(0xd5f50030);
-		ret += test_i4toh(0xc0b251f9);
-		// ret += test_i4toh(0xc0b26915);
-	}
+	ret += test_i4toh(0xd83ad6ae);
+	ret += test_i4toh(0x4d9aed79);
+	ret += test_i4toh(0xd5f50030);
 	// ret += test_i4toh(0xc0a80001); // not working for local ip
 	// ret += test_i4toh(0xc0a8000c);
 	return (ret);
@@ -74,3 +71,44 @@ int	main(void)
 		return (interactive());
 	return (0);
 }
+
+
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+static int convert4(struct sockaddr_in *sa, const char *name)
+{
+    return inet_pton(sa->sin_family = AF_INET, name, &sa->sin_addr);
+}
+
+static int convert6(struct sockaddr_in6 *sa, const char *name)
+{
+    return inet_pton(sa->sin6_family = AF_INET6, name, &sa->sin6_addr);
+}
+
+
+void	test_getnameinfo(char *ip)
+{
+    union {
+        struct sockaddr         sa;
+        struct sockaddr_in      s4;
+        struct sockaddr_in6     s6;
+        struct sockaddr_storage ss;
+    } addr;
+
+    if (convert4(&addr.s4, ip) != 1 && convert6(&addr.s6, ip) != 1) {
+        ft_printf("%s: not a valid IP address.\n", ip);
+        return ;
+    }
+
+    char node[NI_MAXHOST];
+    int res = getnameinfo(&addr.sa, sizeof addr, node, sizeof node, NULL, 0, NI_NAMEREQD);
+    if (res) {
+        ft_printf("%s: %s\n", ip, gai_strerror(res));
+        return ;
+    }
+	ft_printf("REAL: %s\n", node);
+    return ;
+}