From 4e9160f0dd76d03861e418d98a670604c3c2bcf5 Mon Sep 17 00:00:00 2001 From: Jack Halford Date: Fri, 1 Sep 2017 10:39:21 +0200 Subject: [PATCH] stopped caring 23 commits ago --- traceroute/Makefile | 1 + traceroute/libft | 2 +- traceroute/srcs/traceroute.c | 8 +++----- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/traceroute/Makefile b/traceroute/Makefile index 0ce6ee61..f3c02b04 100644 --- a/traceroute/Makefile +++ b/traceroute/Makefile @@ -11,6 +11,7 @@ # **************************************************************************** # NAME = ft_traceroute +SHELL := /bin/bash CC = gcc W_FLAGS = -Wall -Wextra -Werror diff --git a/traceroute/libft b/traceroute/libft index 23c69f13..dd612f58 160000 --- a/traceroute/libft +++ b/traceroute/libft @@ -1 +1 @@ -Subproject commit 23c69f13242ecbff493356c57cb1384eb1dd45f5 +Subproject commit dd612f58c973b6fe9d825557bfa0f62df1e237ef diff --git a/traceroute/srcs/traceroute.c b/traceroute/srcs/traceroute.c index 5a95f31d..5f341a79 100644 --- a/traceroute/srcs/traceroute.c +++ b/traceroute/srcs/traceroute.c @@ -18,7 +18,6 @@ unsigned short checksum(void *b, int len) { unsigned short *buf = b; unsigned int sum=0; - unsigned short result; for (sum = 0; len > 1; len -= 2) sum += *buf++; @@ -26,8 +25,7 @@ unsigned short checksum(void *b, int len) sum += *(unsigned char*)buf; sum = (sum >> 16) + (sum & 0xFFFF); sum += (sum >> 16); - result = ~sum; - return (result); + return (~sum); } int wait_for_reply(struct sockaddr_in *addr, unsigned char buf[1024]) @@ -36,7 +34,7 @@ int wait_for_reply(struct sockaddr_in *addr, unsigned char buf[1024]) if (sd == 0) { - if ((sd = socket(PF_INET, SOCK_DGRAM, IPPROTO_ICMP)) < 0) + if ((sd = socket(PF_INET, SOCK_RAW, IPPROTO_ICMP)) < 0) { perror("socket"); exit(0); @@ -75,7 +73,7 @@ int traceroute(struct sockaddr_in *dest) struct timeval t1, t2, trip; double diff; - if ((sd = socket(PF_INET, SOCK_DGRAM, IPPROTO_ICMP)) < 0) + if ((sd = socket(PF_INET, SOCK_RAW, IPPROTO_ICMP)) < 0) { perror("socket"); return (1);