From 9491825ddff7a294d1f49061bae7044e426aeb2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 6 Nov 2015 05:38:49 +0100 Subject: Imported Upstream version 1.8.3 --- ccast/Jamfile | 0 ccast/License.txt | 0 ccast/axTLS/Jamfile | 0 ccast/axTLS/aes.c | 0 ccast/axTLS/asn1.c | 0 ccast/axTLS/axTLS_config.h | 0 ccast/axTLS/axTLS_version.h | 0 ccast/axTLS/bigint.c | 0 ccast/axTLS/bigint.h | 0 ccast/axTLS/bigint_impl.h | 0 ccast/axTLS/cert.h | 0 ccast/axTLS/crypto.h | 0 ccast/axTLS/crypto_misc.c | 0 ccast/axTLS/crypto_misc.h | 0 ccast/axTLS/gen_cert.c | 0 ccast/axTLS/hmac.c | 0 ccast/axTLS/loader.c | 0 ccast/axTLS/md2.c | 0 ccast/axTLS/md5.c | 0 ccast/axTLS/openssl.c | 0 ccast/axTLS/os_int.h | 0 ccast/axTLS/os_port.c | 0 ccast/axTLS/os_port.h | 0 ccast/axTLS/p12.c | 0 ccast/axTLS/private_key.h | 0 ccast/axTLS/rc4.c | 0 ccast/axTLS/rsa.c | 0 ccast/axTLS/sha1.c | 0 ccast/axTLS/ssl.h | 0 ccast/axTLS/temp | 0 ccast/axTLS/tls1.c | 2 ++ ccast/axTLS/tls1.h | 0 ccast/axTLS/tls1_clnt.c | 0 ccast/axTLS/tls1_svr.c | 0 ccast/axTLS/x509.c | 0 ccast/cast_channel.proto | 0 ccast/ccast.c | 0 ccast/ccast.h | 0 ccast/ccmdns.c | 3 ++- ccast/ccmdns.h | 0 ccast/ccmes.c | 0 ccast/ccmes.h | 0 ccast/ccpacket.c | 2 +- ccast/ccpacket.h | 0 ccast/cctest.c | 0 ccast/chan/cast_channel.pb-c.c | 0 ccast/chan/cast_channel.pb-c.h | 0 ccast/chan/protobuf-c.c | 0 ccast/chan/protobuf-c.h | 0 ccast/dpat.c | 2 +- ccast/filt.c | 1 + 51 files changed, 7 insertions(+), 3 deletions(-) mode change 100644 => 100755 ccast/Jamfile mode change 100644 => 100755 ccast/License.txt mode change 100644 => 100755 ccast/axTLS/Jamfile mode change 100644 => 100755 ccast/axTLS/aes.c mode change 100644 => 100755 ccast/axTLS/asn1.c mode change 100644 => 100755 ccast/axTLS/axTLS_config.h mode change 100644 => 100755 ccast/axTLS/axTLS_version.h mode change 100644 => 100755 ccast/axTLS/bigint.c mode change 100644 => 100755 ccast/axTLS/bigint.h mode change 100644 => 100755 ccast/axTLS/bigint_impl.h mode change 100644 => 100755 ccast/axTLS/cert.h mode change 100644 => 100755 ccast/axTLS/crypto.h mode change 100644 => 100755 ccast/axTLS/crypto_misc.c mode change 100644 => 100755 ccast/axTLS/crypto_misc.h mode change 100644 => 100755 ccast/axTLS/gen_cert.c mode change 100644 => 100755 ccast/axTLS/hmac.c mode change 100644 => 100755 ccast/axTLS/loader.c mode change 100644 => 100755 ccast/axTLS/md2.c mode change 100644 => 100755 ccast/axTLS/md5.c mode change 100644 => 100755 ccast/axTLS/openssl.c mode change 100644 => 100755 ccast/axTLS/os_int.h mode change 100644 => 100755 ccast/axTLS/os_port.c mode change 100644 => 100755 ccast/axTLS/os_port.h mode change 100644 => 100755 ccast/axTLS/p12.c mode change 100644 => 100755 ccast/axTLS/private_key.h mode change 100644 => 100755 ccast/axTLS/rc4.c mode change 100644 => 100755 ccast/axTLS/rsa.c mode change 100644 => 100755 ccast/axTLS/sha1.c mode change 100644 => 100755 ccast/axTLS/ssl.h mode change 100644 => 100755 ccast/axTLS/temp mode change 100644 => 100755 ccast/axTLS/tls1.c mode change 100644 => 100755 ccast/axTLS/tls1.h mode change 100644 => 100755 ccast/axTLS/tls1_clnt.c mode change 100644 => 100755 ccast/axTLS/tls1_svr.c mode change 100644 => 100755 ccast/axTLS/x509.c mode change 100644 => 100755 ccast/cast_channel.proto mode change 100644 => 100755 ccast/ccast.c mode change 100644 => 100755 ccast/ccast.h mode change 100644 => 100755 ccast/ccmdns.c mode change 100644 => 100755 ccast/ccmdns.h mode change 100644 => 100755 ccast/ccmes.c mode change 100644 => 100755 ccast/ccmes.h mode change 100644 => 100755 ccast/ccpacket.c mode change 100644 => 100755 ccast/ccpacket.h mode change 100644 => 100755 ccast/cctest.c mode change 100644 => 100755 ccast/chan/cast_channel.pb-c.c mode change 100644 => 100755 ccast/chan/cast_channel.pb-c.h mode change 100644 => 100755 ccast/chan/protobuf-c.c mode change 100644 => 100755 ccast/chan/protobuf-c.h mode change 100644 => 100755 ccast/dpat.c mode change 100644 => 100755 ccast/filt.c (limited to 'ccast') diff --git a/ccast/Jamfile b/ccast/Jamfile old mode 100644 new mode 100755 diff --git a/ccast/License.txt b/ccast/License.txt old mode 100644 new mode 100755 diff --git a/ccast/axTLS/Jamfile b/ccast/axTLS/Jamfile old mode 100644 new mode 100755 diff --git a/ccast/axTLS/aes.c b/ccast/axTLS/aes.c old mode 100644 new mode 100755 diff --git a/ccast/axTLS/asn1.c b/ccast/axTLS/asn1.c old mode 100644 new mode 100755 diff --git a/ccast/axTLS/axTLS_config.h b/ccast/axTLS/axTLS_config.h old mode 100644 new mode 100755 diff --git a/ccast/axTLS/axTLS_version.h b/ccast/axTLS/axTLS_version.h old mode 100644 new mode 100755 diff --git a/ccast/axTLS/bigint.c b/ccast/axTLS/bigint.c old mode 100644 new mode 100755 diff --git a/ccast/axTLS/bigint.h b/ccast/axTLS/bigint.h old mode 100644 new mode 100755 diff --git a/ccast/axTLS/bigint_impl.h b/ccast/axTLS/bigint_impl.h old mode 100644 new mode 100755 diff --git a/ccast/axTLS/cert.h b/ccast/axTLS/cert.h old mode 100644 new mode 100755 diff --git a/ccast/axTLS/crypto.h b/ccast/axTLS/crypto.h old mode 100644 new mode 100755 diff --git a/ccast/axTLS/crypto_misc.c b/ccast/axTLS/crypto_misc.c old mode 100644 new mode 100755 diff --git a/ccast/axTLS/crypto_misc.h b/ccast/axTLS/crypto_misc.h old mode 100644 new mode 100755 diff --git a/ccast/axTLS/gen_cert.c b/ccast/axTLS/gen_cert.c old mode 100644 new mode 100755 diff --git a/ccast/axTLS/hmac.c b/ccast/axTLS/hmac.c old mode 100644 new mode 100755 diff --git a/ccast/axTLS/loader.c b/ccast/axTLS/loader.c old mode 100644 new mode 100755 diff --git a/ccast/axTLS/md2.c b/ccast/axTLS/md2.c old mode 100644 new mode 100755 diff --git a/ccast/axTLS/md5.c b/ccast/axTLS/md5.c old mode 100644 new mode 100755 diff --git a/ccast/axTLS/openssl.c b/ccast/axTLS/openssl.c old mode 100644 new mode 100755 diff --git a/ccast/axTLS/os_int.h b/ccast/axTLS/os_int.h old mode 100644 new mode 100755 diff --git a/ccast/axTLS/os_port.c b/ccast/axTLS/os_port.c old mode 100644 new mode 100755 diff --git a/ccast/axTLS/os_port.h b/ccast/axTLS/os_port.h old mode 100644 new mode 100755 diff --git a/ccast/axTLS/p12.c b/ccast/axTLS/p12.c old mode 100644 new mode 100755 diff --git a/ccast/axTLS/private_key.h b/ccast/axTLS/private_key.h old mode 100644 new mode 100755 diff --git a/ccast/axTLS/rc4.c b/ccast/axTLS/rc4.c old mode 100644 new mode 100755 diff --git a/ccast/axTLS/rsa.c b/ccast/axTLS/rsa.c old mode 100644 new mode 100755 diff --git a/ccast/axTLS/sha1.c b/ccast/axTLS/sha1.c old mode 100644 new mode 100755 diff --git a/ccast/axTLS/ssl.h b/ccast/axTLS/ssl.h old mode 100644 new mode 100755 diff --git a/ccast/axTLS/temp b/ccast/axTLS/temp old mode 100644 new mode 100755 diff --git a/ccast/axTLS/tls1.c b/ccast/axTLS/tls1.c old mode 100644 new mode 100755 index b635263..d8ce892 --- a/ccast/axTLS/tls1.c +++ b/ccast/axTLS/tls1.c @@ -309,6 +309,8 @@ EXP_FUNC int STDCALL ssl_read(SSL *ssl, uint8_t **in_data) return ret; } +int basic_readi(SSL *ssl, uint8_t **in_data); + /* * Internal read the SSL connection used for setup */ diff --git a/ccast/axTLS/tls1.h b/ccast/axTLS/tls1.h old mode 100644 new mode 100755 diff --git a/ccast/axTLS/tls1_clnt.c b/ccast/axTLS/tls1_clnt.c old mode 100644 new mode 100755 diff --git a/ccast/axTLS/tls1_svr.c b/ccast/axTLS/tls1_svr.c old mode 100644 new mode 100755 diff --git a/ccast/axTLS/x509.c b/ccast/axTLS/x509.c old mode 100644 new mode 100755 diff --git a/ccast/cast_channel.proto b/ccast/cast_channel.proto old mode 100644 new mode 100755 diff --git a/ccast/ccast.c b/ccast/ccast.c old mode 100644 new mode 100755 diff --git a/ccast/ccast.h b/ccast/ccast.h old mode 100644 new mode 100755 diff --git a/ccast/ccmdns.c b/ccast/ccmdns.c old mode 100644 new mode 100755 index 0ba3318..76ae4d1 --- a/ccast/ccmdns.c +++ b/ccast/ccmdns.c @@ -75,6 +75,7 @@ #else #include "numsup.h" #endif +#include "conv.h" #include "ccmdns.h" #undef DEBUG @@ -223,7 +224,7 @@ static int init_send_mDNS(SOCKET *psock) { // If we're doing a one-shot, we shouldn't transmit from port 5353, */ // but ChromCast won't see the packet if we don't. */ - /* We cant send from port 5353 if someone else is using it, */ + /* We can't send from port 5353 if someone else is using it, */ /* so set the SO_REUSEADDR option (which is enough for MSWin), */ /* and SO_REUSEPORT for OS X and Linux */ { diff --git a/ccast/ccmdns.h b/ccast/ccmdns.h old mode 100644 new mode 100755 diff --git a/ccast/ccmes.c b/ccast/ccmes.c old mode 100644 new mode 100755 diff --git a/ccast/ccmes.h b/ccast/ccmes.h old mode 100644 new mode 100755 diff --git a/ccast/ccpacket.c b/ccast/ccpacket.c old mode 100644 new mode 100755 index 97e28d7..2efc11f --- a/ccast/ccpacket.c +++ b/ccast/ccpacket.c @@ -231,7 +231,7 @@ static ccpacket_err connect_ccpacket_imp( } /* Connect */ - if (rv = (connect(p->sock, (struct sockaddr *)&server, sizeof(server))) != 0) { + if ((rv = (connect(p->sock, (struct sockaddr *)&server, sizeof(server)))) != 0) { DBG((g_log,0, "TCP connect IP '%s' port %d failed with %d, errno %d\n",p->dip, p->dport,rv,ERRNO)) return ccpacket_connect; } diff --git a/ccast/ccpacket.h b/ccast/ccpacket.h old mode 100644 new mode 100755 diff --git a/ccast/cctest.c b/ccast/cctest.c old mode 100644 new mode 100755 diff --git a/ccast/chan/cast_channel.pb-c.c b/ccast/chan/cast_channel.pb-c.c old mode 100644 new mode 100755 diff --git a/ccast/chan/cast_channel.pb-c.h b/ccast/chan/cast_channel.pb-c.h old mode 100644 new mode 100755 diff --git a/ccast/chan/protobuf-c.c b/ccast/chan/protobuf-c.c old mode 100644 new mode 100755 diff --git a/ccast/chan/protobuf-c.h b/ccast/chan/protobuf-c.h old mode 100644 new mode 100755 diff --git a/ccast/dpat.c b/ccast/dpat.c old mode 100644 new mode 100755 index 106c52a..a8792fe --- a/ccast/dpat.c +++ b/ccast/dpat.c @@ -440,7 +440,7 @@ double get_ccast_dith(double ipat[DISIZE][DISIZE][3], double val[3]) { if (vv) { printf("There are %d unique surrounders:\n",nsur); for (n = 0; n < nsur; n++) { - printf("sur %f %f %f\n",ressur[n][0], ressur[n][1], ressur[n][2], ressur[n][3]); + printf("sur %f %f %f\n",ressur[n][0], ressur[n][1], ressur[n][2]); } } #endif diff --git a/ccast/filt.c b/ccast/filt.c old mode 100644 new mode 100755 index ab075ae..65cf7bd --- a/ccast/filt.c +++ b/ccast/filt.c @@ -33,6 +33,7 @@ #include "ccpacket.h" #include "ccmes.h" #include "yajl.h" +#include "ccast.h" #define DO_WEIGHTING #define SUM_CONSTRAINT -- cgit v1.2.3