From: Pavel Tvrdik <pawel.tvrdik@gmail.com>
Date: Wed, 6 Apr 2016 13:23:15 +0000 (+0200)
Subject: Socktest: Fix setting of TTL value
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2bd35b0609becb5eb27027dc8a4b51a9d33c42a5;p=thirdparty%2Fbird.git

Socktest: Fix setting of TTL value
---

diff --git a/socktest/common.c b/socktest/common.c
index df00388c7..7e7637525 100644
--- a/socktest/common.c
+++ b/socktest/common.c
@@ -58,8 +58,6 @@ skt_open(sock *s)
     sk_join_group(s, s->daddr);	/* reception */
   }
 
-  sk_set_ttl(s, cf_ttl);
-
   if (cf_bcast)
     sk_setup_broadcast(s);
 }
@@ -74,7 +72,6 @@ skt_parse_args(int argc, char *argv[], int is_send)
   /* Set defaults */
   uint port = PKT_PORT;
   cf_value = PKT_VALUE;
-  cf_ttl = 1;
   cf_mcast = cf_bcast = cf_bind = cf_count = counter = 0;
 
   /* Create socket */
@@ -124,7 +121,7 @@ skt_parse_args(int argc, char *argv[], int is_send)
       cf_value = parse_uint(optarg);
       break;
     case 't':
-      cf_ttl = parse_uint(optarg);
+      s->ttl = parse_uint(optarg);
       break;
 
     default:
diff --git a/socktest/common.h b/socktest/common.h
index 1dfd8d70d..a8b3f5fa1 100644
--- a/socktest/common.h
+++ b/socktest/common.h
@@ -50,7 +50,6 @@ int cf_bind;		/* Bind by address */
 uint cf_count;		/* How many packets send */
 uint counter;		/* global counter of send/recv packets */
 uint cf_value;		/* a value in packet */
-uint cf_ttl;
 
 sock *skt_parse_args(int argc, char **argv, int is_send);
 void bird_init(void);