1 files changed, 401 insertions, 0 deletions
diff --git a/3rdparty/openpgm-svn-r1135/pgm/packet_test.c.c89.patch b/3rdparty/openpgm-svn-r1135/pgm/packet_test.c.c89.patch
new file mode 100644
index 0000000..72dbcac
--- /dev/null
+++ b/3rdparty/openpgm-svn-r1135/pgm/packet_test.c.c89.patch
@@ -0,0 +1,401 @@
+--- packet_test.c	2010-08-04 15:24:51.000000000 +0800
++++ packet_test.c89	2010-08-04 15:40:35.000000000 +0800
+@@ -66,12 +66,13 @@
+ /* minimum size should be IP header plus PGM header */
+ 	if (len < (sizeof(struct pgm_ip) + sizeof(struct pgm_header))) 
+ 	{
+-		printf ("Packet size too small: %zu bytes, expecting at least %zu bytes.\n",
++		printf ("Packet size too small: %lu bytes, expecting at least %lu bytes.\n",
+ 			len, sizeof(struct pgm_ip) + sizeof(struct pgm_header));
+ 		return FALSE;
+ 	}
+ 
+ /* decode IP header */
++	{
+ 	const struct pgm_ip* ip = (const struct pgm_ip*)data;
+ 	if (ip->ip_v != 4) 				/* IP version, 4 or 6 */
+ 	{
+@@ -80,6 +81,7 @@
+ 	}
+ 	printf ("IP ");
+ 
++	{
+ 	const size_t ip_header_length = ip->ip_hl * 4;		/* IP header length in 32bit octets */
+ 	if (ip_header_length < sizeof(struct pgm_ip)) 
+ 	{
+@@ -87,6 +89,7 @@
+ 		return FALSE;
+ 	}
+ 
++	{
+ 	size_t packet_length = ntohs(ip->ip_len);	/* total packet length */
+ 
+ /* ip_len can equal packet_length - ip_header_length in FreeBSD/NetBSD
+@@ -109,6 +112,7 @@
+ 		return FALSE;
+ 	}
+ 
++	{
+ 	const uint16_t offset = ntohs(ip->ip_off);
+ 
+ /* 3 bits routing priority, 4 bits type of service: delay, throughput, reliability, cost */
+@@ -135,7 +139,7 @@
+ 		(offset & 0x1fff) * 8,
+ 		((offset & IP_DF) ? "DF" : ""),
+ 		((offset & IP_MF) ? "+" : ""));
+-	printf (", length %zu", packet_length);
++	printf (", length %lu", packet_length);
+ 
+ /* IP options */
+ 	if ((ip_header_length - sizeof(struct pgm_ip)) > 0) {
+@@ -146,6 +150,7 @@
+ 
+ /* packets that fail checksum will generally not be passed upstream except with rfc3828
+  */
++	{
+ 	const uint16_t ip_sum = pgm_inet_checksum(data, packet_length, 0);
+ 	if (ip_sum != 0) {
+ 		const uint16_t encoded_ip_sum = ntohs(ip->ip_sum);
+@@ -176,6 +181,7 @@
+  * | Type specific data ...
+  * +-+-+-+-+-+-+-+-+-+- ...
+  */
++	{
+ 	const struct pgm_header* pgm_header = (const struct pgm_header*)((const char*)data + ip_header_length);
+ 	const size_t pgm_length = packet_length - ip_header_length;
+ 
+@@ -227,6 +233,7 @@
+ 	}
+ 
+ /* now decode PGM packet types */
++	{
+ 	const void* pgm_data = pgm_header + 1;
+ 	const size_t pgm_data_length = pgm_length - sizeof(pgm_header);		/* can equal zero for SPMR's */
+ 
+@@ -246,6 +253,13 @@
+ 	}
+ 
+ 	return err;
++	}
++	}
++	}
++	}
++	}
++	}
++	}
+ }
+ 
+ /* 8.1.  Source Path Messages (SPM)
+@@ -293,6 +307,7 @@
+ 		return FALSE;
+ 	}
+ 
++	{
+ 	const struct pgm_spm * spm  = (const struct pgm_spm *)data;
+ 	const struct pgm_spm6* spm6 = (const struct pgm_spm6*)data;
+ 	const uint16_t spm_nla_afi = ntohs (spm->spm_nla_afi);
+@@ -303,6 +318,7 @@
+ 		ntohl(spm->spm_lead),
+ 		spm_nla_afi);	/* address family indicator */
+ 
++	{
+ 	char s[INET6_ADDRSTRLEN];
+ 	const void* pgm_opt;
+ 	size_t pgm_opt_len;
+@@ -340,6 +356,8 @@
+ 
+ 	printf ("\n");
+ 	return TRUE;
++	}
++	}
+ }
+ 
+ /* 14.7.1.  Poll Request
+@@ -389,6 +407,7 @@
+ 		return FALSE;
+ 	}
+ 
++	{
+ 	const struct pgm_poll * poll4 = (const struct pgm_poll *)data;
+ 	const struct pgm_poll6* poll6 = (const struct pgm_poll6*)data;
+ 	const uint16_t poll_nla_afi = ntohs (poll4->poll_nla_afi);
+@@ -399,6 +418,7 @@
+ 		ntohs(poll4->poll_s_type),
+ 		poll_nla_afi);	/* address family indicator */
+ 
++	{
+ 	char s[INET6_ADDRSTRLEN];
+ 	const void* pgm_opt;
+ 	size_t pgm_opt_len;
+@@ -463,6 +483,8 @@
+ 
+ 	printf ("\n");
+ 	return TRUE;
++	}
++	}
+ }
+ 
+ /* 14.7.2.  Poll Response
+@@ -498,12 +520,14 @@
+ 		return FALSE;
+ 	}
+ 
++	{
+ 	const struct pgm_polr* polr = (const struct pgm_polr*)data;
+ 
+ 	printf("sqn %" PRIu32 " round %u",
+ 		ntohl(polr->polr_sqn),
+ 		ntohs(polr->polr_round));
+ 
++	{
+ 	const void* pgm_opt = (const uint8_t*)data + sizeof(struct pgm_polr);
+ 	size_t pgm_opt_len = len - sizeof(struct pgm_polr);
+ 
+@@ -516,6 +540,8 @@
+ 
+ 	printf ("\n");
+ 	return TRUE;
++	}
++	}
+ }
+ 
+ /* 8.2.  Data Packet
+@@ -553,6 +579,7 @@
+ 		return FALSE;
+ 	}
+ 
++	{
+ 	const struct pgm_data* odata = (const struct pgm_data*)data;
+ 
+ 	printf ("sqn %" PRIu32 " trail %" PRIu32 " [",
+@@ -560,6 +587,7 @@
+ 		ntohl(odata->data_trail));
+ 
+ /* option extensions */
++	{
+ 	const void* pgm_opt = (const uint8_t*)data + sizeof(struct pgm_data);
+ 	size_t pgm_opt_len = len - sizeof(struct pgm_data);
+ 	const char* payload = pgm_opt;
+@@ -572,6 +600,7 @@
+ 	}
+ 
+ /* data */
++	{
+ 	const char* end = payload + ntohs (header->pgm_tsdu_length);
+ 	while (payload < end) {
+ 		if (isprint (*payload))
+@@ -583,6 +612,9 @@
+ 
+ 	printf ("]\n");
+ 	return TRUE;
++	}
++	}
++	}
+ }
+ 
+ /* 8.2.  Repair Data
+@@ -608,6 +640,7 @@
+ 		return FALSE;
+ 	}
+ 
++	{
+ 	const struct pgm_data* rdata = (const struct pgm_data*)data;
+ 
+ 	printf ("sqn %" PRIu32 " trail %" PRIu32 " [",
+@@ -615,6 +648,7 @@
+ 		ntohl (rdata->data_trail));
+ 
+ /* option extensions */
++	{
+ 	const void* pgm_opt = (const uint8_t*)data + sizeof(struct pgm_data);
+ 	size_t pgm_opt_len = len - sizeof(struct pgm_data);
+ 	const char* payload = pgm_opt;
+@@ -627,6 +661,7 @@
+ 	}
+ 
+ /* data */
++	{
+ 	const char* end = payload + ntohs (header->pgm_tsdu_length);
+ 	while (payload < end) {
+ 		if (isprint (*payload))
+@@ -638,6 +673,9 @@
+ 
+ 	printf ("]\n");
+ 	return TRUE;
++	}
++	}
++	}
+ }
+ 
+ /* 8.3.  NAK
+@@ -686,6 +724,7 @@
+ 		return FALSE;
+ 	}
+ 
++	{
+ 	const struct pgm_nak * nak  = (const struct pgm_nak *)data;
+ 	const struct pgm_nak6* nak6 = (const struct pgm_nak6*)data;
+ 	const uint16_t nak_src_nla_afi = ntohs (nak->nak_src_nla_afi);
+@@ -693,6 +732,7 @@
+ 	printf ("sqn %" PRIu32 " src ", 
+ 		ntohl(nak->nak_sqn));
+ 
++	{
+ 	char s[INET6_ADDRSTRLEN];
+ 	const void* pgm_opt;
+ 	size_t pgm_opt_len;
+@@ -722,6 +762,7 @@
+ 			return FALSE;
+ 		}
+ 
++		{
+ 		const uint16_t nak_grp_nla_afi = ntohs (nak6->nak6_grp_nla_afi);
+ 		if (nak_src_nla_afi != nak_grp_nla_afi) {
+ 			puts ("different source & group afi very wibbly wobbly :(");
+@@ -736,6 +777,7 @@
+ 		pgm_inet_ntop (AF_INET6, &nak6->nak6_grp_nla, s, sizeof(s));
+ 		printf ("%s", s);
+ 		break;
++		}
+ 	}
+ 
+ 	default:
+@@ -753,6 +795,8 @@
+ 
+ 	printf ("\n");
+ 	return TRUE;
++	}
++	}
+ }
+ 
+ /* 8.3.  N-NAK
+@@ -873,11 +917,15 @@
+ 
+ 	printf ("ACK: ");
+ 
++	{
+ 	const struct pgm_ack* ack = (const struct pgm_ack*)data;
+ 	char bitmap[33];
+ 
+-	for (unsigned i = 31; i; i--)
++	{
++	unsigned i;
++	for (i = 31; i; i--)
+ 		bitmap[i] = (ack->ack_bitmap & (1 << i)) ? '1' : '0';
++	}
+ 	bitmap[32] = '\0';
+ 
+ 	printf ("rx_max %" PRIu32 " bitmap [%s] ",
+@@ -892,6 +940,7 @@
+ 
+ 	printf ("\n");
+ 	return TRUE;
++	}
+ }
+ 
+ 
+@@ -917,12 +966,14 @@
+ 		return -1;
+ 	}
+ 
++	{
+ 	const struct pgm_opt_length* opt_len = (const struct pgm_opt_length*)data;
+ 	if (opt_len->opt_length != sizeof(struct pgm_opt_length)) {
+ 		printf (" bad opt_length length %u\n", (unsigned)opt_len->opt_length);
+ 		return -1;
+ 	}
+ 
++	{
+ 	uint16_t opt_total_length = ntohs (opt_len->opt_total_length);
+ 	printf (" total len %u ", opt_total_length);
+ 	if (opt_total_length < (sizeof(struct pgm_opt_length) + sizeof(struct pgm_opt_header)) ||
+@@ -934,6 +985,7 @@
+ 
+ /* total length includes opt_length option */
+ 	opt_total_length -= sizeof(struct pgm_opt_length);
++	{
+ 	const struct pgm_opt_header* opt_header = (const struct pgm_opt_header*)(opt_len + 1);
+ 
+ /* iterate through options (max 16) */
+@@ -1037,6 +1089,9 @@
+ 	}
+ 
+ 	return ((const uint8_t*)opt_header - (const uint8_t*)data);
++	}
++	}
++	}
+ }
+ 
+ const char*
+@@ -1074,22 +1129,30 @@
+ 		services = pgm_hashtable_new (pgm_int_hash, pgm_int_equal);
+ 	}
+ 
++	{
+ 	const int hash_key = port;
+ 	void* service_string = pgm_hashtable_lookup (services, &hash_key);
+ 	if (service_string != NULL) {
+ 		return service_string;
+ 	}
+ 
++	{
+ 	struct servent* se = getservbyport (port, "udp");
+ 	if (se == NULL) {
+ 		char buf[sizeof("00000")];
+-		snprintf(buf, sizeof(buf), "%u", ntohs(port));
++#ifdef _MSC_VER
++		_snprintf_s (buf, sizeof(buf), _TRUNCATE, "%u", ntohs(port));
++#else
++		snprintf (buf, sizeof(buf), "%u", ntohs(port));
++#endif
+ 		service_string = pgm_strdup(buf);
+ 	} else {
+ 		service_string = pgm_strdup(se->s_name);
+ 	}
+ 	pgm_hashtable_insert (services, &hash_key, service_string);
+ 	return service_string;
++	}
++	}
+ }
+ 
+ const char*
+@@ -1103,12 +1166,14 @@
+ 		hosts = pgm_hashtable_new (pgm_str_hash, pgm_int_equal);
+ 	}
+ 
++	{
+ 	const int hash_key = (int)ap->s_addr;
+ 	void* host_string = pgm_hashtable_lookup (hosts, &hash_key);
+ 	if (host_string != NULL) {
+ 		return host_string;
+ 	}
+ 
++	{
+ 	struct hostent* he = gethostbyaddr((const char*)ap, sizeof(struct in_addr), AF_INET);
+ 	if (he == NULL) {
+ 		struct in_addr in;
+@@ -1119,6 +1184,8 @@
+ 	}
+ 	pgm_hashtable_insert (hosts, &hash_key, host_string);
+ 	return host_string;
++	}
++	}
+ }
+ 
+ void
+@@ -1130,6 +1197,7 @@
+ /* pre-conditions */
+ 	pgm_assert (NULL != ipopt);
+ 
++	{
+ 	const char* op = ipopt;
+ 
+ 	while (length)
+@@ -1157,6 +1225,7 @@
+ 		op += len;
+ 		length -= len;
+ 	}
++	}
+ }
+ 
+ /* eof */