mirror of
https://github.com/warmcat/libwebsockets.git
synced 2025-03-30 00:00:16 +01:00
clean windows warnings
Signed-off-by: Andy Green <andy.green@linaro.org>
This commit is contained in:
parent
40e607b876
commit
07f194686f
3 changed files with 12 additions and 12 deletions
|
@ -242,7 +242,7 @@ static struct option options[] = {
|
||||||
{ NULL, 0, 0, 0 }
|
{ NULL, 0, 0, 0 }
|
||||||
};
|
};
|
||||||
|
|
||||||
static int ratelimit_connects(unsigned int *last, int secs)
|
static int ratelimit_connects(unsigned int *last, unsigned int secs)
|
||||||
{
|
{
|
||||||
struct timeval tv;
|
struct timeval tv;
|
||||||
|
|
||||||
|
@ -345,7 +345,7 @@ int main(int argc, char **argv)
|
||||||
|
|
||||||
while (!force_exit) {
|
while (!force_exit) {
|
||||||
|
|
||||||
if (!wsi_dumb && ratelimit_connects(&rl_dumb, 2)) {
|
if (!wsi_dumb && ratelimit_connects(&rl_dumb, 2u)) {
|
||||||
lwsl_notice("dumb: connecting\n");
|
lwsl_notice("dumb: connecting\n");
|
||||||
wsi_dumb = lws_client_connect(context, address, port,
|
wsi_dumb = lws_client_connect(context, address, port,
|
||||||
use_ssl, "/", argv[optind], argv[optind],
|
use_ssl, "/", argv[optind], argv[optind],
|
||||||
|
@ -353,7 +353,7 @@ int main(int argc, char **argv)
|
||||||
ietf_version);
|
ietf_version);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!wsi_mirror && ratelimit_connects(&rl_mirror, 2)) {
|
if (!wsi_mirror && ratelimit_connects(&rl_mirror, 2u)) {
|
||||||
lwsl_notice("mirror: connecting\n");
|
lwsl_notice("mirror: connecting\n");
|
||||||
wsi_mirror = lws_client_connect(context,
|
wsi_mirror = lws_client_connect(context,
|
||||||
address, port, use_ssl, "/",
|
address, port, use_ssl, "/",
|
||||||
|
|
|
@ -97,7 +97,7 @@ callback_fraggle(struct lws *wsi, enum lws_callback_reasons reason,
|
||||||
|
|
||||||
case FRAGSTATE_RANDOM_PAYLOAD:
|
case FRAGSTATE_RANDOM_PAYLOAD:
|
||||||
|
|
||||||
for (n = 0; n < len; n++)
|
for (n = 0; (unsigned int)n < len; n++)
|
||||||
psf->sum += p[n];
|
psf->sum += p[n];
|
||||||
|
|
||||||
psf->total_message += len;
|
psf->total_message += len;
|
||||||
|
@ -184,9 +184,9 @@ callback_fraggle(struct lws *wsi, enum lws_callback_reasons reason,
|
||||||
psf->total_message, psf->sum);
|
psf->total_message, psf->sum);
|
||||||
|
|
||||||
bp[0] = psf->sum >> 24;
|
bp[0] = psf->sum >> 24;
|
||||||
bp[1] = psf->sum >> 16;
|
bp[1] = (unsigned char)(psf->sum >> 16);
|
||||||
bp[2] = psf->sum >> 8;
|
bp[2] = (unsigned char)(psf->sum >> 8);
|
||||||
bp[3] = psf->sum;
|
bp[3] = (unsigned char)psf->sum;
|
||||||
|
|
||||||
n = lws_write(wsi, (unsigned char *)bp,
|
n = lws_write(wsi, (unsigned char *)bp,
|
||||||
4, LWS_WRITE_BINARY);
|
4, LWS_WRITE_BINARY);
|
||||||
|
|
|
@ -225,18 +225,18 @@ callback_lws_mirror(struct lws *wsi, enum lws_callback_reasons reason,
|
||||||
/* 64-bit ping index in network byte order */
|
/* 64-bit ping index in network byte order */
|
||||||
|
|
||||||
while (shift >= 0) {
|
while (shift >= 0) {
|
||||||
*p++ = psd->ping_index >> shift;
|
*p++ = (unsigned char)(psd->ping_index >> shift);
|
||||||
shift -= 8;
|
shift -= 8;
|
||||||
}
|
}
|
||||||
|
|
||||||
while (p - &pingbuf[LWS_SEND_BUFFER_PRE_PADDING] < size)
|
while ((unsigned int)(p - &pingbuf[LWS_SEND_BUFFER_PRE_PADDING]) < size)
|
||||||
*p++ = 0;
|
*p++ = 0;
|
||||||
|
|
||||||
gettimeofday(&tv, NULL);
|
gettimeofday(&tv, NULL);
|
||||||
|
|
||||||
psd->ringbuffer[psd->ringbuffer_head].issue_timestamp =
|
psd->ringbuffer[psd->ringbuffer_head].issue_timestamp =
|
||||||
(tv.tv_sec * 1000000) + tv.tv_usec;
|
(tv.tv_sec * 1000000) + tv.tv_usec;
|
||||||
psd->ringbuffer[psd->ringbuffer_head].index = psd->ping_index++;
|
psd->ringbuffer[psd->ringbuffer_head].index = (unsigned long)psd->ping_index++;
|
||||||
psd->ringbuffer[psd->ringbuffer_head].seen = 0;
|
psd->ringbuffer[psd->ringbuffer_head].seen = 0;
|
||||||
|
|
||||||
if (psd->ringbuffer_head == PING_RINGBUFFER_SIZE - 1)
|
if (psd->ringbuffer_head == PING_RINGBUFFER_SIZE - 1)
|
||||||
|
@ -266,7 +266,7 @@ callback_lws_mirror(struct lws *wsi, enum lws_callback_reasons reason,
|
||||||
|
|
||||||
if (n < 0)
|
if (n < 0)
|
||||||
return -1;
|
return -1;
|
||||||
if (n < size) {
|
if (n < (int)size) {
|
||||||
lwsl_err("Partial write\n");
|
lwsl_err("Partial write\n");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
@ -374,7 +374,7 @@ int main(int argc, char **argv)
|
||||||
protocols[PROTOCOL_LWS_MIRROR].name = protocol_name;
|
protocols[PROTOCOL_LWS_MIRROR].name = protocol_name;
|
||||||
break;
|
break;
|
||||||
case 'i':
|
case 'i':
|
||||||
interval_us = 1000000.0 * atof(optarg);
|
interval_us = (unsigned int)(1000000.0 * atof(optarg));
|
||||||
break;
|
break;
|
||||||
case 's':
|
case 's':
|
||||||
size = atoi(optarg);
|
size = atoi(optarg);
|
||||||
|
|
Loading…
Add table
Reference in a new issue