diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-11-06 05:38:49 +0100 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-11-06 05:38:49 +0100 |
commit | 9491825ddff7a294d1f49061bae7044e426aeb2e (patch) | |
tree | 06e651099f87140ec534ae47fb8ce1ac6ec7976d /ccast | |
parent | fa756339d4204bff7f2820067f58214d32780d17 (diff) |
Imported Upstream version 1.8.3
Diffstat (limited to 'ccast')
-rwxr-xr-x[-rw-r--r--] | ccast/Jamfile | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | ccast/License.txt | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | ccast/axTLS/Jamfile | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | ccast/axTLS/aes.c | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | ccast/axTLS/asn1.c | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | ccast/axTLS/axTLS_config.h | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | ccast/axTLS/axTLS_version.h | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | ccast/axTLS/bigint.c | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | ccast/axTLS/bigint.h | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | ccast/axTLS/bigint_impl.h | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | ccast/axTLS/cert.h | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | ccast/axTLS/crypto.h | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | ccast/axTLS/crypto_misc.c | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | ccast/axTLS/crypto_misc.h | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | ccast/axTLS/gen_cert.c | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | ccast/axTLS/hmac.c | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | ccast/axTLS/loader.c | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | ccast/axTLS/md2.c | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | ccast/axTLS/md5.c | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | ccast/axTLS/openssl.c | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | ccast/axTLS/os_int.h | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | ccast/axTLS/os_port.c | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | ccast/axTLS/os_port.h | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | ccast/axTLS/p12.c | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | ccast/axTLS/private_key.h | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | ccast/axTLS/rc4.c | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | ccast/axTLS/rsa.c | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | ccast/axTLS/sha1.c | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | ccast/axTLS/ssl.h | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | ccast/axTLS/temp | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | ccast/axTLS/tls1.c | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | ccast/axTLS/tls1.h | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | ccast/axTLS/tls1_clnt.c | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | ccast/axTLS/tls1_svr.c | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | ccast/axTLS/x509.c | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | ccast/cast_channel.proto | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | ccast/ccast.c | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | ccast/ccast.h | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | ccast/ccmdns.c | 3 | ||||
-rwxr-xr-x[-rw-r--r--] | ccast/ccmdns.h | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | ccast/ccmes.c | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | ccast/ccmes.h | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | ccast/ccpacket.c | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | ccast/ccpacket.h | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | ccast/cctest.c | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | ccast/chan/cast_channel.pb-c.c | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | ccast/chan/cast_channel.pb-c.h | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | ccast/chan/protobuf-c.c | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | ccast/chan/protobuf-c.h | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | ccast/dpat.c | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | ccast/filt.c | 1 |
51 files changed, 7 insertions, 3 deletions
diff --git a/ccast/Jamfile b/ccast/Jamfile index 3d03a2f..3d03a2f 100644..100755 --- a/ccast/Jamfile +++ b/ccast/Jamfile diff --git a/ccast/License.txt b/ccast/License.txt index a871fcf..a871fcf 100644..100755 --- a/ccast/License.txt +++ b/ccast/License.txt diff --git a/ccast/axTLS/Jamfile b/ccast/axTLS/Jamfile index 9a8aff4..9a8aff4 100644..100755 --- a/ccast/axTLS/Jamfile +++ b/ccast/axTLS/Jamfile diff --git a/ccast/axTLS/aes.c b/ccast/axTLS/aes.c index 9b07e27..9b07e27 100644..100755 --- a/ccast/axTLS/aes.c +++ b/ccast/axTLS/aes.c diff --git a/ccast/axTLS/asn1.c b/ccast/axTLS/asn1.c index b082275..b082275 100644..100755 --- a/ccast/axTLS/asn1.c +++ b/ccast/axTLS/asn1.c diff --git a/ccast/axTLS/axTLS_config.h b/ccast/axTLS/axTLS_config.h index ffda4e3..ffda4e3 100644..100755 --- a/ccast/axTLS/axTLS_config.h +++ b/ccast/axTLS/axTLS_config.h diff --git a/ccast/axTLS/axTLS_version.h b/ccast/axTLS/axTLS_version.h index e8158cc..e8158cc 100644..100755 --- a/ccast/axTLS/axTLS_version.h +++ b/ccast/axTLS/axTLS_version.h diff --git a/ccast/axTLS/bigint.c b/ccast/axTLS/bigint.c index e9ca04c..e9ca04c 100644..100755 --- a/ccast/axTLS/bigint.c +++ b/ccast/axTLS/bigint.c diff --git a/ccast/axTLS/bigint.h b/ccast/axTLS/bigint.h index 2966a3e..2966a3e 100644..100755 --- a/ccast/axTLS/bigint.h +++ b/ccast/axTLS/bigint.h diff --git a/ccast/axTLS/bigint_impl.h b/ccast/axTLS/bigint_impl.h index 820620d..820620d 100644..100755 --- a/ccast/axTLS/bigint_impl.h +++ b/ccast/axTLS/bigint_impl.h diff --git a/ccast/axTLS/cert.h b/ccast/axTLS/cert.h index 30c7b65..30c7b65 100644..100755 --- a/ccast/axTLS/cert.h +++ b/ccast/axTLS/cert.h diff --git a/ccast/axTLS/crypto.h b/ccast/axTLS/crypto.h index bf2c187..bf2c187 100644..100755 --- a/ccast/axTLS/crypto.h +++ b/ccast/axTLS/crypto.h diff --git a/ccast/axTLS/crypto_misc.c b/ccast/axTLS/crypto_misc.c index f43fd04..f43fd04 100644..100755 --- a/ccast/axTLS/crypto_misc.c +++ b/ccast/axTLS/crypto_misc.c diff --git a/ccast/axTLS/crypto_misc.h b/ccast/axTLS/crypto_misc.h index acb5c73..acb5c73 100644..100755 --- a/ccast/axTLS/crypto_misc.h +++ b/ccast/axTLS/crypto_misc.h diff --git a/ccast/axTLS/gen_cert.c b/ccast/axTLS/gen_cert.c index fa22c4e..fa22c4e 100644..100755 --- a/ccast/axTLS/gen_cert.c +++ b/ccast/axTLS/gen_cert.c diff --git a/ccast/axTLS/hmac.c b/ccast/axTLS/hmac.c index 24a04d7..24a04d7 100644..100755 --- a/ccast/axTLS/hmac.c +++ b/ccast/axTLS/hmac.c diff --git a/ccast/axTLS/loader.c b/ccast/axTLS/loader.c index 92167be..92167be 100644..100755 --- a/ccast/axTLS/loader.c +++ b/ccast/axTLS/loader.c diff --git a/ccast/axTLS/md2.c b/ccast/axTLS/md2.c index dee909a..dee909a 100644..100755 --- a/ccast/axTLS/md2.c +++ b/ccast/axTLS/md2.c diff --git a/ccast/axTLS/md5.c b/ccast/axTLS/md5.c index 7f50713..7f50713 100644..100755 --- a/ccast/axTLS/md5.c +++ b/ccast/axTLS/md5.c diff --git a/ccast/axTLS/openssl.c b/ccast/axTLS/openssl.c index e3f8972..e3f8972 100644..100755 --- a/ccast/axTLS/openssl.c +++ b/ccast/axTLS/openssl.c diff --git a/ccast/axTLS/os_int.h b/ccast/axTLS/os_int.h index 8ae5878..8ae5878 100644..100755 --- a/ccast/axTLS/os_int.h +++ b/ccast/axTLS/os_int.h diff --git a/ccast/axTLS/os_port.c b/ccast/axTLS/os_port.c index 0bb74f8..0bb74f8 100644..100755 --- a/ccast/axTLS/os_port.c +++ b/ccast/axTLS/os_port.c diff --git a/ccast/axTLS/os_port.h b/ccast/axTLS/os_port.h index 8ede75a..8ede75a 100644..100755 --- a/ccast/axTLS/os_port.h +++ b/ccast/axTLS/os_port.h diff --git a/ccast/axTLS/p12.c b/ccast/axTLS/p12.c index 2bafaf7..2bafaf7 100644..100755 --- a/ccast/axTLS/p12.c +++ b/ccast/axTLS/p12.c diff --git a/ccast/axTLS/private_key.h b/ccast/axTLS/private_key.h index ce7985c..ce7985c 100644..100755 --- a/ccast/axTLS/private_key.h +++ b/ccast/axTLS/private_key.h diff --git a/ccast/axTLS/rc4.c b/ccast/axTLS/rc4.c index 12a1211..12a1211 100644..100755 --- a/ccast/axTLS/rc4.c +++ b/ccast/axTLS/rc4.c diff --git a/ccast/axTLS/rsa.c b/ccast/axTLS/rsa.c index e707f2b..e707f2b 100644..100755 --- a/ccast/axTLS/rsa.c +++ b/ccast/axTLS/rsa.c diff --git a/ccast/axTLS/sha1.c b/ccast/axTLS/sha1.c index 1082733..1082733 100644..100755 --- a/ccast/axTLS/sha1.c +++ b/ccast/axTLS/sha1.c diff --git a/ccast/axTLS/ssl.h b/ccast/axTLS/ssl.h index 3f001da..3f001da 100644..100755 --- a/ccast/axTLS/ssl.h +++ b/ccast/axTLS/ssl.h diff --git a/ccast/axTLS/temp b/ccast/axTLS/temp index 859e8be..859e8be 100644..100755 --- a/ccast/axTLS/temp +++ b/ccast/axTLS/temp diff --git a/ccast/axTLS/tls1.c b/ccast/axTLS/tls1.c index b635263..d8ce892 100644..100755 --- 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 index 14c6382..14c6382 100644..100755 --- a/ccast/axTLS/tls1.h +++ b/ccast/axTLS/tls1.h diff --git a/ccast/axTLS/tls1_clnt.c b/ccast/axTLS/tls1_clnt.c index cb8b990..cb8b990 100644..100755 --- a/ccast/axTLS/tls1_clnt.c +++ b/ccast/axTLS/tls1_clnt.c diff --git a/ccast/axTLS/tls1_svr.c b/ccast/axTLS/tls1_svr.c index 51c9d76..51c9d76 100644..100755 --- a/ccast/axTLS/tls1_svr.c +++ b/ccast/axTLS/tls1_svr.c diff --git a/ccast/axTLS/x509.c b/ccast/axTLS/x509.c index c2ca49f..c2ca49f 100644..100755 --- a/ccast/axTLS/x509.c +++ b/ccast/axTLS/x509.c diff --git a/ccast/cast_channel.proto b/ccast/cast_channel.proto index d321eaf..d321eaf 100644..100755 --- a/ccast/cast_channel.proto +++ b/ccast/cast_channel.proto diff --git a/ccast/ccast.c b/ccast/ccast.c index 981b5ae..981b5ae 100644..100755 --- a/ccast/ccast.c +++ b/ccast/ccast.c diff --git a/ccast/ccast.h b/ccast/ccast.h index 7014679..7014679 100644..100755 --- a/ccast/ccast.h +++ b/ccast/ccast.h diff --git a/ccast/ccmdns.c b/ccast/ccmdns.c index 0ba3318..76ae4d1 100644..100755 --- 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 index 5144448..5144448 100644..100755 --- a/ccast/ccmdns.h +++ b/ccast/ccmdns.h diff --git a/ccast/ccmes.c b/ccast/ccmes.c index d0581d9..d0581d9 100644..100755 --- a/ccast/ccmes.c +++ b/ccast/ccmes.c diff --git a/ccast/ccmes.h b/ccast/ccmes.h index 5eae02a..5eae02a 100644..100755 --- a/ccast/ccmes.h +++ b/ccast/ccmes.h diff --git a/ccast/ccpacket.c b/ccast/ccpacket.c index 97e28d7..2efc11f 100644..100755 --- 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 index e4f6f76..e4f6f76 100644..100755 --- a/ccast/ccpacket.h +++ b/ccast/ccpacket.h diff --git a/ccast/cctest.c b/ccast/cctest.c index 2000cc5..2000cc5 100644..100755 --- a/ccast/cctest.c +++ b/ccast/cctest.c diff --git a/ccast/chan/cast_channel.pb-c.c b/ccast/chan/cast_channel.pb-c.c index ec79608..ec79608 100644..100755 --- a/ccast/chan/cast_channel.pb-c.c +++ b/ccast/chan/cast_channel.pb-c.c diff --git a/ccast/chan/cast_channel.pb-c.h b/ccast/chan/cast_channel.pb-c.h index 982e420..982e420 100644..100755 --- a/ccast/chan/cast_channel.pb-c.h +++ b/ccast/chan/cast_channel.pb-c.h diff --git a/ccast/chan/protobuf-c.c b/ccast/chan/protobuf-c.c index 1157d8b..1157d8b 100644..100755 --- a/ccast/chan/protobuf-c.c +++ b/ccast/chan/protobuf-c.c diff --git a/ccast/chan/protobuf-c.h b/ccast/chan/protobuf-c.h index 8c4ba1d..8c4ba1d 100644..100755 --- a/ccast/chan/protobuf-c.h +++ b/ccast/chan/protobuf-c.h diff --git a/ccast/dpat.c b/ccast/dpat.c index 106c52a..a8792fe 100644..100755 --- 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 index ab075ae..65cf7bd 100644..100755 --- 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 |