Revert "totemip: Add support for sin6_scope_id"

This reverts commit 934c47ed4384daf2819c26306bebba3225807499 which is
causing protocol incompatibility in needle. Master seems to be not
affected, but it needs more checking.

Signed-off-by: Jan Friesse <jfriesse@redhat.com>

exec/totemip.c

@@ -289,7 +289,7 @@ int totemip_totemip_to_sockaddr_convert(struct totem_ip_address *ip_addr,
 #endif
 		sin->sin6_family = ip_addr->family;
 		sin->sin6_port = ntohs(port);
-		sin->sin6_scope_id = ip_addr->sin6_scope_id;
+		sin->sin6_scope_id = 2;
 		memcpy(&sin->sin6_addr, ip_addr->addr, sizeof(struct in6_addr));
 
 		*addrlen = sizeof(struct sockaddr_in6);
@@ -401,12 +401,10 @@ int totemip_parse(struct totem_ip_address *totemip, const char *addr,
 	if (ainfo_final->ai_family == AF_INET) {
 		sa = (struct sockaddr_in *)ainfo_final->ai_addr;
 		memcpy(totemip->addr, &sa->sin_addr, sizeof(struct in_addr));
-		totemip->sin6_scope_id = 0;
 		debug_ip_family = 4;
 	} else {
 		sa6 = (struct sockaddr_in6 *)ainfo_final->ai_addr;
 		memcpy(totemip->addr, &sa6->sin6_addr, sizeof(struct in6_addr));
-		totemip->sin6_scope_id = sa6->sin6_scope_id;
 		debug_ip_family = 6;
 	}
 
@@ -431,7 +429,6 @@ int totemip_sockaddr_to_totemip_convert(const struct sockaddr_storage *saddr,
 		const struct sockaddr_in *sin = (const struct sockaddr_in *)saddr;
 
 		memcpy(ip_addr->addr, &sin->sin_addr, sizeof(struct in_addr));
-		ip_addr->sin6_scope_id = 0;
 		ret = 0;
 	}
 
@@ -440,7 +437,6 @@ int totemip_sockaddr_to_totemip_convert(const struct sockaddr_storage *saddr,
 		  = (const struct sockaddr_in6 *)saddr;
 
 		memcpy(ip_addr->addr, &sin->sin6_addr, sizeof(struct in6_addr));
-		ip_addr->sin6_scope_id = sin->sin6_scope_id;
 
 		ret = 0;
 	}

include/corosync/coroapi.h

@@ -112,7 +112,6 @@ struct totem_ip_address {
 	unsigned int   nodeid;
 	unsigned short family;
 	unsigned char  addr[TOTEMIP_ADDRLEN];
-	unsigned int   sin6_scope_id;
 } __attribute__((packed));
 #endif
 

include/corosync/totem/totemip.h

@@ -65,7 +65,6 @@ struct totem_ip_address
 	unsigned int   nodeid;
 	unsigned short family;
 	unsigned char  addr[TOTEMIP_ADDRLEN];
-	unsigned int   sin6_scope_id;
 } __attribute__((packed));
 
 enum totem_ip_version_enum {