diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-11-06 07:40:42 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-11-06 07:40:42 +0100 |
| commit | c6739b6427261ac2682a9fca3b23c98df0dc9f60 (patch) | |
| tree | a90193f98739ad96e6ae676409022bd15a648aae /ccast | |
| parent | c6267b450e6858fdff4360104b362d9da2e1806d (diff) | |
New upstream release
Diffstat (limited to 'ccast')
| -rw-r--r-- | ccast/axTLS/tls1.c | 2 | ||||
| -rw-r--r-- | ccast/ccmdns.c | 3 | ||||
| -rw-r--r-- | ccast/ccpacket.c | 2 | ||||
| -rw-r--r-- | ccast/dpat.c | 2 | ||||
| -rw-r--r-- | ccast/filt.c | 1 |
5 files changed, 7 insertions, 3 deletions
diff --git a/ccast/axTLS/tls1.c b/ccast/axTLS/tls1.c index b635263..d8ce892 100644 --- 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/ccmdns.c b/ccast/ccmdns.c index 0ba3318..76ae4d1 100644 --- 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/ccpacket.c b/ccast/ccpacket.c index 97e28d7..2efc11f 100644 --- 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/dpat.c b/ccast/dpat.c index 106c52a..a8792fe 100644 --- 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 --- 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 |