crabapples
/
websockify
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HyBi/IETF 6455 support to C websockify. 

It's probably broken and it's definitely still messy in several ways,
but basic tests work with Chrome.

Several other C websockify cleanups:

- Remove most of the non-thread safe global variable usage (still
  a little bit that could be fixed so that threading would be easier).

- Remove wswrapper. It is unmaintained, out of date, and never worked
  well anyways (since it really needed a way to do asynchronous queued
  work but it was running in another process context making that
  hard).

- Use md5 routines from openssl.

- Remove md5.c and md5.h since no longer needed.

Thanks to https://github.com/dew111 for spurring me on to get this
done by writing code. I didn't end up using much his forked code, but
having something there goaded me enough to just get it working.
This commit is contained in:
Joel Martin 2012-02-01 19:10:39 -06:00 committed by Cédric de Saint Martin
parent 30e7a98891
commit 6932db6ecf
9 changed files with 403 additions and 1988 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
other/Makefile
View File

@ -3,19 +3,11 @@ CFLAGS += -fPIC
all: $(TARGETS) all: $(TARGETS)
websockify: websockify.o websocket.o md5.o websockify: websockify.o websocket.o
$(CC) $(LDFLAGS) $^ -lssl -lcrypto -lresolv -o $@ $(CC) $(LDFLAGS) $^ -lssl -lcrypto -lresolv -o $@
wswrapper.o: wswrapper.h websocket.o: websocket.c websocket.h
wswrapper.so: wswrapper.o md5.o
$(CC) $(LDFLAGS) $^ -shared -fPIC -ldl -lresolv -o $@
websocket.o: websocket.c websocket.h md5.h
websockify.o: websockify.c websocket.h websockify.o: websockify.c websocket.h
wswrapper.o: wswrapper.c
$(CC) -c $(CFLAGS) -o $@ $*.c
md5.o: md5.c md5.h
$(CC) -c $(CFLAGS) -o $@ $*.c -DHAVE_MEMCPY -DSTDC_HEADERS
kumina: kumina.o kumina: kumina.o
$(CC) $(LDFLAGS) $^ -lresolv -lssl -o $@ $(CC) $(LDFLAGS) $^ -lresolv -lssl -o $@

466
other/md5.c
View File

@ -1,466 +0,0 @@
/* Functions to compute MD5 message digest of files or memory blocks.
according to the definition of MD5 in RFC 1321 from April 1992.
Copyright (C) 1995,1996,1997,1999,2000,2001,2005
Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
/* Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. */
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <sys/types.h>
#if STDC_HEADERS || defined _LIBC
# include <stdlib.h>
# include <string.h>
#else
# ifndef HAVE_MEMCPY
# define memcpy(d, s, n) (bcopy ((s), (d), (n)), (d))
# endif
#endif
#ifndef __THROW
#define __THROW
#endif
#include "md5.h"
#ifdef _LIBC
# include <endian.h>
# if __BYTE_ORDER == __BIG_ENDIAN
# define WORDS_BIGENDIAN 1
# endif
/* We need to keep the namespace clean so define the MD5 function
protected using leading __ . */
# define md5_init_ctx __md5_init_ctx
# define md5_process_block __md5_process_block
# define md5_process_bytes __md5_process_bytes
# define md5_finish_ctx __md5_finish_ctx
# define md5_read_ctx __md5_read_ctx
# define md5_stream __md5_stream
# define md5_buffer __md5_buffer
#else
/* Squelch compiler complaints */
void md5_process_bytes (const void *buffer, size_t len, struct md5_ctx *ctx);
void md5_process_block (const void *buffer, size_t len, struct md5_ctx *ctx);
#endif
#ifdef WORDS_BIGENDIAN
# define SWAP(n) \
(((n) << 24) | (((n) & 0xff00) << 8) | (((n) >> 8) & 0xff00) | ((n) >> 24))
#else
# define SWAP(n) (n)
#endif
/* This array contains the bytes used to pad the buffer to the next
64-byte boundary. (RFC 1321, 3.1: Step 1) */
static const unsigned char fillbuf[64] = { 0x80, 0 /* , 0, 0, ... */ };
/* Initialize structure containing state of computation.
(RFC 1321, 3.3: Step 3) */
void
md5_init_ctx (ctx)
struct md5_ctx *ctx;
{
ctx->A = 0x67452301;
ctx->B = 0xefcdab89;
ctx->C = 0x98badcfe;
ctx->D = 0x10325476;
ctx->total[0] = ctx->total[1] = 0;
ctx->buflen = 0;
}
/* Put result from CTX in first 16 bytes following RESBUF. The result
must be in little endian byte order.
IMPORTANT: On some systems it is required that RESBUF is correctly
aligned for a 32 bits value. */
void *
md5_read_ctx (ctx, resbuf)
const struct md5_ctx *ctx;
void *resbuf;
{
((md5_uint32 *) resbuf)[0] = SWAP (ctx->A);
((md5_uint32 *) resbuf)[1] = SWAP (ctx->B);
((md5_uint32 *) resbuf)[2] = SWAP (ctx->C);
((md5_uint32 *) resbuf)[3] = SWAP (ctx->D);
return resbuf;
}
/* Process the remaining bytes in the internal buffer and the usual
prolog according to the standard and write the result to RESBUF.
IMPORTANT: On some systems it is required that RESBUF is correctly
aligned for a 32 bits value. */
void *
md5_finish_ctx (ctx, resbuf)
struct md5_ctx *ctx;
void *resbuf;
{
/* Take yet unprocessed bytes into account. */
md5_uint32 bytes = ctx->buflen;
size_t pad;
/* Now count remaining bytes. */
ctx->total[0] += bytes;
if (ctx->total[0] < bytes)
++ctx->total[1];
pad = bytes >= 56 ? 64 + 56 - bytes : 56 - bytes;
memcpy (&ctx->buffer[bytes], fillbuf, pad);
/* Put the 64-bit file length in *bits* at the end of the buffer. */
*(md5_uint32 *) &ctx->buffer[bytes + pad] = SWAP (ctx->total[0] << 3);
*(md5_uint32 *) &ctx->buffer[bytes + pad + 4] = SWAP ((ctx->total[1] << 3) |
(ctx->total[0] >> 29));
/* Process last bytes. */
md5_process_block (ctx->buffer, bytes + pad + 8, ctx);
return md5_read_ctx (ctx, resbuf);
}
/* Compute MD5 message digest for bytes read from STREAM. The
resulting message digest number will be written into the 16 bytes
beginning at RESBLOCK. */
int
md5_stream (stream, resblock)
FILE *stream;
void *resblock;
{
/* Important: BLOCKSIZE must be a multiple of 64. */
#define BLOCKSIZE 4096
struct md5_ctx ctx;
char buffer[BLOCKSIZE + 72];
size_t sum;
/* Initialize the computation context. */
md5_init_ctx (&ctx);
/* Iterate over full file contents. */
while (1)
{
/* We read the file in blocks of BLOCKSIZE bytes. One call of the
computation function processes the whole buffer so that with the
next round of the loop another block can be read. */
size_t n;
sum = 0;
/* Read block. Take care for partial reads. */
do
{
n = fread (buffer + sum, 1, BLOCKSIZE - sum, stream);
sum += n;
}
while (sum < BLOCKSIZE && n != 0);
if (n == 0 && ferror (stream))
return 1;
/* If end of file is reached, end the loop. */
if (n == 0)
break;
/* Process buffer with BLOCKSIZE bytes. Note that
BLOCKSIZE % 64 == 0
*/
md5_process_block (buffer, BLOCKSIZE, &ctx);
}
/* Add the last bytes if necessary. */
if (sum > 0)
md5_process_bytes (buffer, sum, &ctx);
/* Construct result in desired memory. */
md5_finish_ctx (&ctx, resblock);
return 0;
}
/* Compute MD5 message digest for LEN bytes beginning at BUFFER. The
result is always in little endian byte order, so that a byte-wise
output yields to the wanted ASCII representation of the message
digest. */
void *
md5_buffer (buffer, len, resblock)
const char *buffer;
size_t len;
void *resblock;
{
struct md5_ctx ctx;
/* Initialize the computation context. */
md5_init_ctx (&ctx);
/* Process whole buffer but last len % 64 bytes. */
md5_process_bytes (buffer, len, &ctx);
/* Put result in desired memory area. */
return md5_finish_ctx (&ctx, resblock);
}
void
md5_process_bytes (buffer, len, ctx)
const void *buffer;
size_t len;
struct md5_ctx *ctx;
{
/* When we already have some bits in our internal buffer concatenate
both inputs first. */
if (ctx->buflen != 0)
{
size_t left_over = ctx->buflen;
size_t add = 128 - left_over > len ? len : 128 - left_over;
memcpy (&ctx->buffer[left_over], buffer, add);
ctx->buflen += add;
if (ctx->buflen > 64)
{
md5_process_block (ctx->buffer, ctx->buflen & ~63, ctx);
ctx->buflen &= 63;
/* The regions in the following copy operation cannot overlap. */
memcpy (ctx->buffer, &ctx->buffer[(left_over + add) & ~63],
ctx->buflen);
}
buffer = (const char *) buffer + add;
len -= add;
}
/* Process available complete blocks. */
if (len >= 64)
{
#if !_STRING_ARCH_unaligned
/* To check alignment gcc has an appropriate operator. Other
compilers don't. */
# if __GNUC__ >= 2
# define UNALIGNED_P(p) (((md5_uintptr) p) % __alignof__ (md5_uint32) != 0)
# else
# define UNALIGNED_P(p) (((md5_uintptr) p) % sizeof (md5_uint32) != 0)
# endif
if (UNALIGNED_P (buffer))
while (len > 64)
{
md5_process_block (memcpy (ctx->buffer, buffer, 64), 64, ctx);
buffer = (const char *) buffer + 64;
len -= 64;
}
else
#endif
{
md5_process_block (buffer, len & ~63, ctx);
buffer = (const char *) buffer + (len & ~63);
len &= 63;
}
}
/* Move remaining bytes in internal buffer. */
if (len > 0)
{
size_t left_over = ctx->buflen;
memcpy (&ctx->buffer[left_over], buffer, len);
left_over += len;
if (left_over >= 64)
{
md5_process_block (ctx->buffer, 64, ctx);
left_over -= 64;
memcpy (ctx->buffer, &ctx->buffer[64], left_over);
}
ctx->buflen = left_over;
}
}
/* These are the four functions used in the four steps of the MD5 algorithm
and defined in the RFC 1321. The first function is a little bit optimized
(as found in Colin Plumbs public domain implementation). */
/* #define FF(b, c, d) ((b & c) | (~b & d)) */
#define FF(b, c, d) (d ^ (b & (c ^ d)))
#define FG(b, c, d) FF (d, b, c)
#define FH(b, c, d) (b ^ c ^ d)
#define FI(b, c, d) (c ^ (b | ~d))
/* Process LEN bytes of BUFFER, accumulating context into CTX.
It is assumed that LEN % 64 == 0. */
void
md5_process_block (buffer, len, ctx)
const void *buffer;
size_t len;
struct md5_ctx *ctx;
{
md5_uint32 correct_words[16];
const md5_uint32 *words = buffer;
size_t nwords = len / sizeof (md5_uint32);
const md5_uint32 *endp = words + nwords;
md5_uint32 A = ctx->A;
md5_uint32 B = ctx->B;
md5_uint32 C = ctx->C;
md5_uint32 D = ctx->D;
/* First increment the byte count. RFC 1321 specifies the possible
length of the file up to 2^64 bits. Here we only compute the
number of bytes. Do a double word increment. */
ctx->total[0] += len;
if (ctx->total[0] < len)
++ctx->total[1];
/* Process all bytes in the buffer with 64 bytes in each round of
the loop. */
while (words < endp)
{
md5_uint32 *cwp = correct_words;
md5_uint32 A_save = A;
md5_uint32 B_save = B;
md5_uint32 C_save = C;
md5_uint32 D_save = D;
/* First round: using the given function, the context and a constant
the next context is computed. Because the algorithms processing
unit is a 32-bit word and it is determined to work on words in
little endian byte order we perhaps have to change the byte order
before the computation. To reduce the work for the next steps
we store the swapped words in the array CORRECT_WORDS. */
#define OP(a, b, c, d, s, T) \
do \
{ \
a += FF (b, c, d) + (*cwp++ = SWAP (*words)) + T; \
++words; \
CYCLIC (a, s); \
a += b; \
} \
while (0)
/* It is unfortunate that C does not provide an operator for
cyclic rotation. Hope the C compiler is smart enough. */
#define CYCLIC(w, s) (w = (w << s) | (w >> (32 - s)))
/* Before we start, one word to the strange constants.
They are defined in RFC 1321 as
T[i] = (int) (4294967296.0 * fabs (sin (i))), i=1..64
*/
/* Round 1. */
OP (A, B, C, D, 7, 0xd76aa478);
OP (D, A, B, C, 12, 0xe8c7b756);
OP (C, D, A, B, 17, 0x242070db);
OP (B, C, D, A, 22, 0xc1bdceee);
OP (A, B, C, D, 7, 0xf57c0faf);
OP (D, A, B, C, 12, 0x4787c62a);
OP (C, D, A, B, 17, 0xa8304613);
OP (B, C, D, A, 22, 0xfd469501);
OP (A, B, C, D, 7, 0x698098d8);
OP (D, A, B, C, 12, 0x8b44f7af);
OP (C, D, A, B, 17, 0xffff5bb1);
OP (B, C, D, A, 22, 0x895cd7be);
OP (A, B, C, D, 7, 0x6b901122);
OP (D, A, B, C, 12, 0xfd987193);
OP (C, D, A, B, 17, 0xa679438e);
OP (B, C, D, A, 22, 0x49b40821);
/* For the second to fourth round we have the possibly swapped words
in CORRECT_WORDS. Redefine the macro to take an additional first
argument specifying the function to use. */
#undef OP
#define OP(f, a, b, c, d, k, s, T) \
do \
{ \
a += f (b, c, d) + correct_words[k] + T; \
CYCLIC (a, s); \
a += b; \
} \
while (0)
/* Round 2. */
OP (FG, A, B, C, D, 1, 5, 0xf61e2562);
OP (FG, D, A, B, C, 6, 9, 0xc040b340);
OP (FG, C, D, A, B, 11, 14, 0x265e5a51);
OP (FG, B, C, D, A, 0, 20, 0xe9b6c7aa);
OP (FG, A, B, C, D, 5, 5, 0xd62f105d);
OP (FG, D, A, B, C, 10, 9, 0x02441453);
OP (FG, C, D, A, B, 15, 14, 0xd8a1e681);
OP (FG, B, C, D, A, 4, 20, 0xe7d3fbc8);
OP (FG, A, B, C, D, 9, 5, 0x21e1cde6);
OP (FG, D, A, B, C, 14, 9, 0xc33707d6);
OP (FG, C, D, A, B, 3, 14, 0xf4d50d87);
OP (FG, B, C, D, A, 8, 20, 0x455a14ed);
OP (FG, A, B, C, D, 13, 5, 0xa9e3e905);
OP (FG, D, A, B, C, 2, 9, 0xfcefa3f8);
OP (FG, C, D, A, B, 7, 14, 0x676f02d9);
OP (FG, B, C, D, A, 12, 20, 0x8d2a4c8a);
/* Round 3. */
OP (FH, A, B, C, D, 5, 4, 0xfffa3942);
OP (FH, D, A, B, C, 8, 11, 0x8771f681);
OP (FH, C, D, A, B, 11, 16, 0x6d9d6122);
OP (FH, B, C, D, A, 14, 23, 0xfde5380c);
OP (FH, A, B, C, D, 1, 4, 0xa4beea44);
OP (FH, D, A, B, C, 4, 11, 0x4bdecfa9);
OP (FH, C, D, A, B, 7, 16, 0xf6bb4b60);
OP (FH, B, C, D, A, 10, 23, 0xbebfbc70);
OP (FH, A, B, C, D, 13, 4, 0x289b7ec6);
OP (FH, D, A, B, C, 0, 11, 0xeaa127fa);
OP (FH, C, D, A, B, 3, 16, 0xd4ef3085);
OP (FH, B, C, D, A, 6, 23, 0x04881d05);
OP (FH, A, B, C, D, 9, 4, 0xd9d4d039);
OP (FH, D, A, B, C, 12, 11, 0xe6db99e5);
OP (FH, C, D, A, B, 15, 16, 0x1fa27cf8);
OP (FH, B, C, D, A, 2, 23, 0xc4ac5665);
/* Round 4. */
OP (FI, A, B, C, D, 0, 6, 0xf4292244);
OP (FI, D, A, B, C, 7, 10, 0x432aff97);
OP (FI, C, D, A, B, 14, 15, 0xab9423a7);
OP (FI, B, C, D, A, 5, 21, 0xfc93a039);
OP (FI, A, B, C, D, 12, 6, 0x655b59c3);
OP (FI, D, A, B, C, 3, 10, 0x8f0ccc92);
OP (FI, C, D, A, B, 10, 15, 0xffeff47d);
OP (FI, B, C, D, A, 1, 21, 0x85845dd1);
OP (FI, A, B, C, D, 8, 6, 0x6fa87e4f);
OP (FI, D, A, B, C, 15, 10, 0xfe2ce6e0);
OP (FI, C, D, A, B, 6, 15, 0xa3014314);
OP (FI, B, C, D, A, 13, 21, 0x4e0811a1);
OP (FI, A, B, C, D, 4, 6, 0xf7537e82);
OP (FI, D, A, B, C, 11, 10, 0xbd3af235);
OP (FI, C, D, A, B, 2, 15, 0x2ad7d2bb);
OP (FI, B, C, D, A, 9, 21, 0xeb86d391);
/* Add the starting values of the context. */
A += A_save;
B += B_save;
C += C_save;
D += D_save;
}
/* Put checksum in context given as argument. */
ctx->A = A;
ctx->B = B;
ctx->C = C;
ctx->D = D;
}

148
other/md5.h
View File

@ -1,148 +0,0 @@
/* Declaration of functions and data types used for MD5 sum computing
library functions.
Copyright (C) 1995-1997,1999,2000,2001,2004,2005
Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
#ifndef _MD5_H
#define _MD5_H 1
#include <stdio.h>
#if defined HAVE_LIMITS_H || _LIBC
# include <limits.h>
#endif
#define MD5_DIGEST_SIZE 16
#define MD5_BLOCK_SIZE 64
/* The following contortions are an attempt to use the C preprocessor
to determine an unsigned integral type that is 32 bits wide. An
alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but
doing that would require that the configure script compile and *run*
the resulting executable. Locally running cross-compiled executables
is usually not possible. */
#ifdef _LIBC
# include <stdint.h>
typedef uint32_t md5_uint32;
typedef uintptr_t md5_uintptr;
#else
# if defined __STDC__ && __STDC__
# define UINT_MAX_32_BITS 4294967295U
# else
# define UINT_MAX_32_BITS 0xFFFFFFFF
# endif
/* If UINT_MAX isn't defined, assume it's a 32-bit type.
This should be valid for all systems GNU cares about because
that doesn't include 16-bit systems, and only modern systems
(that certainly have <limits.h>) have 64+-bit integral types. */
# ifndef UINT_MAX
# define UINT_MAX UINT_MAX_32_BITS
# endif
# if UINT_MAX == UINT_MAX_32_BITS
typedef unsigned int md5_uint32;
# else
# if USHRT_MAX == UINT_MAX_32_BITS
typedef unsigned short md5_uint32;
# else
# if ULONG_MAX == UINT_MAX_32_BITS
typedef unsigned long md5_uint32;
# else
/* The following line is intended to evoke an error.
Using #error is not portable enough. */
"Cannot determine unsigned 32-bit data type."
# endif
# endif
# endif
/* We have to make a guess about the integer type equivalent in size
to pointers which should always be correct. */
typedef unsigned long int md5_uintptr;
#endif
/* Structure to save state of computation between the single steps. */
struct md5_ctx
{
md5_uint32 A;
md5_uint32 B;
md5_uint32 C;
md5_uint32 D;
md5_uint32 total[2];
md5_uint32 buflen;
char buffer[128] __attribute__ ((__aligned__ (__alignof__ (md5_uint32))));
};
/*
* The following three functions are build up the low level used in
* the functions `md5_stream' and `md5_buffer'.
*/
/* Initialize structure containing state of computation.
(RFC 1321, 3.3: Step 3) */
extern void __md5_init_ctx (struct md5_ctx *ctx) __THROW;
/* Starting with the result of former calls of this function (or the
initialization function update the context for the next LEN bytes
starting at BUFFER.
It is necessary that LEN is a multiple of 64!!! */
extern void __md5_process_block (const void *buffer, size_t len,
struct md5_ctx *ctx) __THROW;
/* Starting with the result of former calls of this function (or the
initialization function update the context for the next LEN bytes
starting at BUFFER.
It is NOT required that LEN is a multiple of 64. */
extern void __md5_process_bytes (const void *buffer, size_t len,
struct md5_ctx *ctx) __THROW;
/* Process the remaining bytes in the buffer and put result from CTX
in first 16 bytes following RESBUF. The result is always in little
endian byte order, so that a byte-wise output yields to the wanted
ASCII representation of the message digest.
IMPORTANT: On some systems it is required that RESBUF is correctly
aligned for a 32 bits value. */
extern void *__md5_finish_ctx (struct md5_ctx *ctx, void *resbuf) __THROW;
/* Put result from CTX in first 16 bytes following RESBUF. The result is
always in little endian byte order, so that a byte-wise output yields
to the wanted ASCII representation of the message digest.
IMPORTANT: On some systems it is required that RESBUF is correctly
aligned for a 32 bits value. */
extern void *__md5_read_ctx (const struct md5_ctx *ctx, void *resbuf) __THROW;
/* Compute MD5 message digest for bytes read from STREAM. The
resulting message digest number will be written into the 16 bytes
beginning at RESBLOCK. */
extern int __md5_stream (FILE *stream, void *resblock) __THROW;
/* Compute MD5 message digest for LEN bytes beginning at BUFFER. The
result is always in little endian byte order, so that a byte-wise
output yields to the wanted ASCII representation of the message
digest. */
extern void *__md5_buffer (const char *buffer, size_t len,
void *resblock) __THROW;
#endif /* md5.h */

430
other/websocket.c
View File

@ -22,18 +22,10 @@
#include <openssl/err.h> #include <openssl/err.h>
#include <openssl/ssl.h> #include <openssl/ssl.h>
#include <resolv.h> /* base64 encode/decode */ #include <resolv.h> /* base64 encode/decode */
#include <openssl/md5.h> /* md5 hash */
#include <openssl/sha.h> /* sha1 hash */
#include "websocket.h" #include "websocket.h"
const char server_handshake[] = "HTTP/1.1 101 Web Socket Protocol Handshake\r\n\
Upgrade: WebSocket\r\n\
Connection: Upgrade\r\n\
%sWebSocket-Origin: %s\r\n\
%sWebSocket-Location: %s://%s%s\r\n\
%sWebSocket-Protocol: sample\r\n\
\r\n%s";
const char policy_response[] = "<cross-domain-policy><allow-access-from domain=\"*\" to-ports=\"*\" /></cross-domain-policy>\n";
/* /*
* Global state * Global state
* *
@ -41,10 +33,9 @@ const char policy_response[] = "<cross-domain-policy><allow-access-from domain=\
*/ */
int ssl_initialized = 0; int ssl_initialized = 0;
int pipe_error = 0; int pipe_error = 0;
char *tbuf, *cbuf, *tbuf_tmp, *cbuf_tmp;
unsigned int bufsize, dbufsize;
settings_t settings; settings_t settings;
void traffic(char * token) { void traffic(char * token) {
if ((settings.verbose) && (! settings.daemon)) { if ((settings.verbose) && (! settings.daemon)) {
fprintf(stdout, "%s", token); fprintf(stdout, "%s", token);
@ -109,21 +100,43 @@ ssize_t ws_send(ws_ctx_t *ctx, const void *buf, size_t len) {
} }
} }
ws_ctx_t *ws_socket(int socket) { ws_ctx_t *alloc_ws_ctx() {
ws_ctx_t *ctx; ws_ctx_t *ctx;
ctx = malloc(sizeof(ws_ctx_t)); if (! (ctx = malloc(sizeof(ws_ctx_t))) )
ctx->sockfd = socket; { fatal("malloc()"); }
if (! (ctx->tbuf = malloc(BUFSIZE)) )
{ fatal("malloc of tbuf"); }
if (! (ctx->cbuf = malloc(BUFSIZE)) )
{ fatal("malloc of cbuf"); }
if (! (ctx->tbuf_tmp = malloc(BUFSIZE)) )
{ fatal("malloc of tbuf_tmp"); }
if (! (ctx->cbuf_tmp = malloc(BUFSIZE)) )
{ fatal("malloc of cbuf_tmp"); }
ctx->headers = malloc(sizeof(headers_t));
ctx->ssl = NULL; ctx->ssl = NULL;
ctx->ssl_ctx = NULL; ctx->ssl_ctx = NULL;
return ctx; return ctx;
} }
ws_ctx_t *ws_socket_ssl(int socket, char * certfile, char * keyfile) { int free_ws_ctx(ws_ctx_t *ctx) {
free(ctx->tbuf);
free(ctx->cbuf);
free(ctx->tbuf_tmp);
free(ctx->cbuf_tmp);
free(ctx);
}
ws_ctx_t *ws_socket(ws_ctx_t *ctx, int socket) {
ctx->sockfd = socket;
}
ws_ctx_t *ws_socket_ssl(ws_ctx_t *ctx, int socket, char * certfile, char * keyfile) {
int ret; int ret;
char msg[1024]; char msg[1024];
char * use_keyfile; char * use_keyfile;
ws_ctx_t *ctx; ws_socket(ctx, socket);
ctx = ws_socket(socket);
if (keyfile && (keyfile[0] != '\0')) { if (keyfile && (keyfile[0] != '\0')) {
// Separate key file // Separate key file
@ -192,15 +205,14 @@ int ws_socket_free(ws_ctx_t *ctx) {
close(ctx->sockfd); close(ctx->sockfd);
ctx->sockfd = 0; ctx->sockfd = 0;
} }
free(ctx);
} }
/* ------------------------------------------------------- */ /* ------------------------------------------------------- */
int encode(u_char const *src, size_t srclength, char *target, size_t targsize) { int encode_hixie(u_char const *src, size_t srclength,
int i, sz = 0, len = 0; char *target, size_t targsize) {
unsigned char chr; int sz = 0, len = 0;
target[sz++] = '\x00'; target[sz++] = '\x00';
len = b64_ntop(src, srclength, target+sz, targsize-sz); len = b64_ntop(src, srclength, target+sz, targsize-sz);
if (len < 0) { if (len < 0) {
@ -211,7 +223,8 @@ int encode(u_char const *src, size_t srclength, char *target, size_t targsize) {
return sz; return sz;
} }
int decode(char *src, size_t srclength, u_char *target, size_t targsize) { int decode_hixie(char *src, size_t srclength,
u_char *target, size_t targsize, unsigned int *opcode) {
char *start, *end, cntstr[4]; char *start, *end, cntstr[4];
int i, len, framecount = 0, retlen = 0; int i, len, framecount = 0, retlen = 0;
unsigned char chr; unsigned char chr;
@ -219,10 +232,19 @@ int decode(char *src, size_t srclength, u_char *target, size_t targsize) {
handler_emsg("WebSocket framing error\n"); handler_emsg("WebSocket framing error\n");
return -1; return -1;
} }
if (srclength == 2 &&
(src[0] == '\xff') &&
(src[1] == '\x00')) {
// client sent orderly close frame
*opcode = 0x8; // Close frame
return 0;
}
*opcode = 0x1; // Text frame
start = src+1; // Skip '\x00' start start = src+1; // Skip '\x00' start
do { do {
/* We may have more than one frame */ /* We may have more than one frame */
end = memchr(start, '\xff', srclength); end = (char *)memchr(start, '\xff', srclength);
*end = '\x00'; *end = '\x00';
len = b64_pton(start, target+retlen, targsize-retlen); len = b64_pton(start, target+retlen, targsize-retlen);
if (len < 0) { if (len < 0) {
@ -239,9 +261,154 @@ int decode(char *src, size_t srclength, u_char *target, size_t targsize) {
return retlen; return retlen;
} }
int parse_handshake(char *handshake, headers_t *headers) { int encode_hybi(u_char const *src, size_t srclength,
char *start, *end; char *target, size_t targsize, unsigned int opcode)
{
unsigned long long b64_sz, len_offset = 1, payload_offset = 2, len = 0;
if ((int)srclength <= 0)
{
return 0;
}
b64_sz = ((srclength - 1) / 3) * 4 + 4;
target[0] = (char)(opcode & 0x0F | 0x80);
if (b64_sz <= 125) {
target[1] = (char) b64_sz;
payload_offset = 2;
} else if ((b64_sz > 125) && (b64_sz < 65536)) {
target[1] = (char) 126;
*(u_short*)&(target[2]) = htons(b64_sz);
payload_offset = 4;
} else {
handler_emsg("Sending frames larger than 65535 bytes not supported\n");
return -1;
//target[1] = (char) 127;
//*(u_long*)&(target[2]) = htonl(b64_sz);
//payload_offset = 10;
}
len = b64_ntop(src, srclength, target+payload_offset, targsize-payload_offset);
if (len < 0) {
return len;
}
return len + payload_offset;
}
int decode_hybi(unsigned char *src, size_t srclength,
u_char *target, size_t targsize, unsigned int *opcode)
{
unsigned char *frame, *mask, *payload, save_char, cntstr[4];;
int i = 0, len, framecount = 0;
unsigned int target_offset = 0, hdr_length = 0, payload_length = 0;
if ((unsigned int) srclength <= 0)
{
return 0;
}
frame = src;
//printf("Deocde new frame\n");
while (frame - src < srclength) {
framecount ++;
*opcode = frame[0] & 0x0f;
//printf("opcode %d, frame[0..3]: 0x%x 0x%x 0x%x 0x%x\n", *opcode,
// (unsigned char) frame[0],
// (unsigned char) frame[1],
// (unsigned char) frame[2],
// (unsigned char) frame[3]);
payload_length = frame[1] & 0x7f;
if (payload_length == 0) {
// TODO: next frame
handler_msg("empty frame\n");
frame += 6;
continue;
} else if (payload_length < 126) {
hdr_length = 2;
//frame += 2 * sizeof(char);
} else if (payload_length == 126) {
payload_length = (frame[2] << 8) + frame[3];
hdr_length = 4;
} else {
handler_emsg("Receiving frames larger than 65535 bytes not supported\n");
return -1;
}
//printf(" payload_length: %u, raw remaining: %u\n", payload_length, (unsigned int) srclength - target_offset);
payload = frame + hdr_length + 4;
if (*opcode == 0x8) {
// client sent orderly close frame
break;
}
if (*opcode != 1 && *opcode != 2) {
handler_msg("Ignoring non-data frame, opcode 0x%x\n", *opcode);
frame = frame + hdr_length + 4 + payload_length;
continue;
}
if ((payload_length > 0) && (!(frame[1] & 0x80))) {
handler_emsg("Received unmasked payload from client\n");
return -1;
}
if ((hdr_length + 4 + payload_length) > (srclength - target_offset)) {
handler_emsg("Truncated frame received from client\n");
return -1;
}
// Terminate with a null for base64 decode
save_char = payload[payload_length];
payload[payload_length] = '\0';
// unmask the data
mask = payload - 4;
for (i = 0; i < payload_length; i++) {
payload[i] ^= mask[i%4];
}
// base64 decode the data
len = b64_pton((const char*)payload, target+target_offset, targsize);
// Restore the first character of the next frame
payload[payload_length] = save_char;
if (len < 0) {
handler_emsg("Base64 decode error code %d", len);
return len;
}
//printf(" len %d, raw %s\n", len, frame);
target_offset += len;
frame = frame + hdr_length + 4 + payload_length;
}
if (framecount > 1) {
snprintf(cntstr, 3, "%d", framecount);
traffic(cntstr);
}
return target_offset;
}
int parse_handshake(ws_ctx_t *ws_ctx, char *handshake) {
char *start, *end;
headers_t *headers = ws_ctx->headers;
headers->key1[0] = '\0';
headers->key2[0] = '\0';
headers->key3[0] = '\0';
if ((strlen(handshake) < 92) || (bcmp(handshake, "GET ", 4) != 0)) { if ((strlen(handshake) < 92) || (bcmp(handshake, "GET ", 4) != 0)) {
return 0; return 0;
} }
@ -258,92 +425,137 @@ int parse_handshake(char *handshake, headers_t *headers) {
strncpy(headers->host, start, end-start); strncpy(headers->host, start, end-start);
headers->host[end-start] = '\0'; headers->host[end-start] = '\0';
headers->origin[0] = '\0';
start = strstr(handshake, "\r\nOrigin: "); start = strstr(handshake, "\r\nOrigin: ");
if (!start) { return 0; } if (start) {
start += 10; start += 10;
} else {
start = strstr(handshake, "\r\nSec-WebSocket-Origin: ");
if (!start) { return 0; }
start += 24;
}
end = strstr(start, "\r\n"); end = strstr(start, "\r\n");
strncpy(headers->origin, start, end-start); strncpy(headers->origin, start, end-start);
headers->origin[end-start] = '\0'; headers->origin[end-start] = '\0';
start = strstr(handshake, "\r\n\r\n"); start = strstr(handshake, "\r\nSec-WebSocket-Version: ");
if (!start) { return 0; } if (start) {
start += 4; // HyBi/RFC 6455
if (strlen(start) == 8) { start += 25;
strncpy(headers->key3, start, 8); end = strstr(start, "\r\n");
headers->key3[8] = '\0'; strncpy(headers->version, start, end-start);
headers->version[end-start] = '\0';
ws_ctx->hixie = 0;
ws_ctx->hybi = strtol(headers->version, NULL, 10);
start = strstr(handshake, "\r\nSec-WebSocket-Key1: "); start = strstr(handshake, "\r\nSec-WebSocket-Key: ");
if (!start) { return 0; } if (!start) { return 0; }
start += 22; start += 21;
end = strstr(start, "\r\n"); end = strstr(start, "\r\n");
strncpy(headers->key1, start, end-start); strncpy(headers->key1, start, end-start);
headers->key1[end-start] = '\0'; headers->key1[end-start] = '\0';
start = strstr(handshake, "\r\nSec-WebSocket-Key2: "); start = strstr(handshake, "\r\nConnection: ");
if (!start) { return 0; } if (!start) { return 0; }
start += 22; start += 14;
end = strstr(start, "\r\n"); end = strstr(start, "\r\n");
strncpy(headers->key2, start, end-start); strncpy(headers->connection, start, end-start);
headers->key2[end-start] = '\0'; headers->connection[end-start] = '\0';
start = strstr(handshake, "\r\nSec-WebSocket-Protocol: ");
if (!start) { return 0; }
start += 26;
end = strstr(start, "\r\n");
strncpy(headers->protocols, start, end-start);
headers->protocols[end-start] = '\0';
} else { } else {
headers->key1[0] = '\0'; // Hixie 75 or 76
headers->key2[0] = '\0'; ws_ctx->hybi = 0;
headers->key3[0] = '\0';
start = strstr(handshake, "\r\n\r\n");
if (!start) { return 0; }
start += 4;
if (strlen(start) == 8) {
ws_ctx->hixie = 76;
strncpy(headers->key3, start, 8);
headers->key3[8] = '\0';
start = strstr(handshake, "\r\nSec-WebSocket-Key1: ");
if (!start) { return 0; }
start += 22;
end = strstr(start, "\r\n");
strncpy(headers->key1, start, end-start);
headers->key1[end-start] = '\0';
start = strstr(handshake, "\r\nSec-WebSocket-Key2: ");
if (!start) { return 0; }
start += 22;
end = strstr(start, "\r\n");
strncpy(headers->key2, start, end-start);
headers->key2[end-start] = '\0';
} else {
ws_ctx->hixie = 75;
}
} }
return 1; return 1;
} }
int parse_hixie76_key(char * key) {
unsigned long i, spaces = 0, num = 0;
for (i=0; i < strlen(key); i++) {
if (key[i] == ' ') {
spaces += 1;
}
if ((key[i] >= 48) && (key[i] <= 57)) {
num = num * 10 + (key[i] - 48);
}
}
return num / spaces;
}
int gen_md5(headers_t *headers, char *target) { int gen_md5(headers_t *headers, char *target) {
unsigned int i, spaces1 = 0, spaces2 = 0; unsigned long key1 = parse_hixie76_key(headers->key1);
unsigned long num1 = 0, num2 = 0; unsigned long key2 = parse_hixie76_key(headers->key2);
unsigned char buf[17]; char *key3 = headers->key3;
for (i=0; i < strlen(headers->key1); i++) {
if (headers->key1[i] == ' ') {
spaces1 += 1;
}
if ((headers->key1[i] >= 48) && (headers->key1[i] <= 57)) {
num1 = num1 * 10 + (headers->key1[i] - 48);
}
}
num1 = num1 / spaces1;
for (i=0; i < strlen(headers->key2); i++) { MD5_CTX c;
if (headers->key2[i] == ' ') { char in[HIXIE_MD5_DIGEST_LENGTH] = {
spaces2 += 1; key1 >> 24, key1 >> 16, key1 >> 8, key1,
} key2 >> 24, key2 >> 16, key2 >> 8, key2,
if ((headers->key2[i] >= 48) && (headers->key2[i] <= 57)) { key3[0], key3[1], key3[2], key3[3],
num2 = num2 * 10 + (headers->key2[i] - 48); key3[4], key3[5], key3[6], key3[7]
} };
}
num2 = num2 / spaces2;
/* Pack it big-endian */ MD5_Init(&c);
buf[0] = (num1 & 0xff000000) >> 24; MD5_Update(&c, (void *)in, sizeof in);
buf[1] = (num1 & 0xff0000) >> 16; MD5_Final((void *)target, &c);
buf[2] = (num1 & 0xff00) >> 8;
buf[3] = num1 & 0xff;
buf[4] = (num2 & 0xff000000) >> 24; target[HIXIE_MD5_DIGEST_LENGTH] = '\0';
buf[5] = (num2 & 0xff0000) >> 16;
buf[6] = (num2 & 0xff00) >> 8;
buf[7] = num2 & 0xff;
strncpy(buf+8, headers->key3, 8);
buf[16] = '\0';
md5_buffer(buf, 16, target);
target[16] = '\0';
return 1; return 1;
} }
static void gen_sha1(headers_t *headers, char *target) {
SHA_CTX c;
unsigned char hash[SHA_DIGEST_LENGTH];
int r;
SHA1_Init(&c);
SHA1_Update(&c, headers->key1, strlen(headers->key1));
SHA1_Update(&c, HYBI_GUID, 36);
SHA1_Final(hash, &c);
r = b64_ntop(hash, sizeof hash, target, HYBI10_ACCEPTHDRLEN);
//assert(r == HYBI10_ACCEPTHDRLEN - 1);
}
ws_ctx_t *do_handshake(int sock) { ws_ctx_t *do_handshake(int sock) {
char handshake[4096], response[4096], trailer[17]; char handshake[4096], response[4096], sha1[29], trailer[17];
char *scheme, *pre; char *scheme, *pre;
headers_t headers; headers_t *headers;
int len, ret; int len, ret;
ws_ctx_t * ws_ctx; ws_ctx_t * ws_ctx;
@ -357,7 +569,7 @@ ws_ctx_t *do_handshake(int sock) {
len = recv(sock, handshake, 1024, 0); len = recv(sock, handshake, 1024, 0);
handshake[len] = 0; handshake[len] = 0;
handler_msg("sending flash policy response\n"); handler_msg("sending flash policy response\n");
send(sock, policy_response, sizeof(policy_response), 0); send(sock, POLICY_RESPONSE, sizeof(POLICY_RESPONSE), 0);
return NULL; return NULL;
} else if ((bcmp(handshake, "\x16", 1) == 0) || } else if ((bcmp(handshake, "\x16", 1) == 0) ||
(bcmp(handshake, "\x80", 1) == 0)) { (bcmp(handshake, "\x80", 1) == 0)) {
@ -370,7 +582,8 @@ ws_ctx_t *do_handshake(int sock) {
settings.cert); settings.cert);
return NULL; return NULL;
} }
ws_ctx = ws_socket_ssl(sock, settings.cert, settings.key); ws_ctx = alloc_ws_ctx();
ws_socket_ssl(ws_ctx, sock, settings.cert, settings.key);
if (! ws_ctx) { return NULL; } if (! ws_ctx) { return NULL; }
scheme = "wss"; scheme = "wss";
handler_msg("using SSL socket\n"); handler_msg("using SSL socket\n");
@ -378,7 +591,8 @@ ws_ctx_t *do_handshake(int sock) {
handler_msg("non-SSL connection disallowed\n"); handler_msg("non-SSL connection disallowed\n");
return NULL; return NULL;
} else { } else {
ws_ctx = ws_socket(sock); ws_ctx = alloc_ws_ctx();
ws_socket(ws_ctx, sock);
if (! ws_ctx) { return NULL; } if (! ws_ctx) { return NULL; }
scheme = "ws"; scheme = "ws";
handler_msg("using plain (not SSL) socket\n"); handler_msg("using plain (not SSL) socket\n");
@ -390,23 +604,31 @@ ws_ctx_t *do_handshake(int sock) {
} }
handshake[len] = 0; handshake[len] = 0;
if (!parse_handshake(handshake, &headers)) { //handler_msg("handshake: %s\n", handshake);
if (!parse_handshake(ws_ctx, handshake)) {
handler_emsg("Invalid WS request\n"); handler_emsg("Invalid WS request\n");
return NULL; return NULL;
} }
if (headers.key3[0] != '\0') { headers = ws_ctx->headers;
gen_md5(&headers, trailer); if (ws_ctx->hybi > 0) {
pre = "Sec-"; handler_msg("using protocol HyBi/IETF 6455 %d\n", ws_ctx->hybi);
handler_msg("using protocol version 76\n"); gen_sha1(headers, sha1);
sprintf(response, SERVER_HANDSHAKE_HYBI, sha1, "base64");
} else { } else {
trailer[0] = '\0'; if (ws_ctx->hixie == 76) {
pre = ""; handler_msg("using protocol Hixie 76\n");
handler_msg("using protocol version 75\n"); gen_md5(headers, trailer);
pre = "Sec-";
} else {
handler_msg("using protocol Hixie 75\n");
trailer[0] = '\0';
pre = "";
}
sprintf(response, SERVER_HANDSHAKE_HIXIE, pre, headers->origin, pre, scheme,
headers->host, headers->path, pre, "base64", trailer);
} }
sprintf(response, server_handshake, pre, headers.origin, pre, scheme,
headers.host, headers.path, pre, trailer);
//handler_msg("response: %s\n", response); //handler_msg("response: %s\n", response);
ws_send(ws_ctx, response, strlen(response)); ws_send(ws_ctx, response, strlen(response));
@ -461,17 +683,8 @@ void start_server() {
struct sockaddr_in serv_addr, cli_addr; struct sockaddr_in serv_addr, cli_addr;
ws_ctx_t *ws_ctx; ws_ctx_t *ws_ctx;
/* Initialize buffers */
bufsize = 65536;
if (! (tbuf = malloc(bufsize)) )
{ fatal("malloc()"); }
if (! (cbuf = malloc(bufsize)) )
{ fatal("malloc()"); }
if (! (tbuf_tmp = malloc(bufsize)) )
{ fatal("malloc()"); }
if (! (cbuf_tmp = malloc(bufsize)) )
{ fatal("malloc()"); }
/* Initialize buffers */
lsock = socket(AF_INET, SOCK_STREAM, 0); lsock = socket(AF_INET, SOCK_STREAM, 0);
if (lsock < 0) { error("ERROR creating listener socket"); } if (lsock < 0) { error("ERROR creating listener socket"); }
bzero((char *) &serv_addr, sizeof(serv_addr)); bzero((char *) &serv_addr, sizeof(serv_addr));
@ -499,6 +712,7 @@ void start_server() {
daemonize(lsock); daemonize(lsock);
} }
// Reep zombies // Reep zombies
signal(SIGCHLD, SIG_IGN); signal(SIGCHLD, SIG_IGN);
@ -518,9 +732,6 @@ void start_server() {
} }
handler_msg("got client connection from %s\n", handler_msg("got client connection from %s\n",
inet_ntoa(cli_addr.sin_addr)); inet_ntoa(cli_addr.sin_addr));
/* base64 is 4 bytes for every 3
* 20 for WS '\x00' / '\xff' and good measure */
dbufsize = (bufsize * 3)/4 - 20;
handler_msg("forking handler process\n"); handler_msg("forking handler process\n");
pid = fork(); pid = fork();
@ -544,6 +755,7 @@ void start_server() {
if (pid == 0) { if (pid == 0) {
if (ws_ctx) { if (ws_ctx) {
ws_socket_free(ws_ctx); ws_socket_free(ws_ctx);
free_ws_ctx(ws_ctx);
} else { } else {
shutdown(csock, SHUT_RDWR); shutdown(csock, SHUT_RDWR);
close(csock); close(csock);

60
other/websocket.h
View File

@ -1,9 +1,54 @@
#include <openssl/ssl.h> #include <openssl/ssl.h>
#define BUFSIZE 65536
#define DBUFSIZE (BUFSIZE * 3) / 4 - 20
#define SERVER_HANDSHAKE_HIXIE "HTTP/1.1 101 Web Socket Protocol Handshake\r\n\
Upgrade: WebSocket\r\n\
Connection: Upgrade\r\n\
%sWebSocket-Origin: %s\r\n\
%sWebSocket-Location: %s://%s%s\r\n\
%sWebSocket-Protocol: %s\r\n\
\r\n%s"
#define SERVER_HANDSHAKE_HYBI "HTTP/1.1 101 Switching Protocols\r\n\
Upgrade: websocket\r\n\
Connection: Upgrade\r\n\
Sec-WebSocket-Accept: %s\r\n\
Sec-WebSocket-Protocol: %s\r\n\
\r\n"
#define HYBI_GUID "258EAFA5-E914-47DA-95CA-C5AB0DC85B11"
#define HYBI10_ACCEPTHDRLEN 29
#define HIXIE_MD5_DIGEST_LENGTH 16
#define POLICY_RESPONSE "<cross-domain-policy><allow-access-from domain=\"*\" to-ports=\"*\" /></cross-domain-policy>\n"
typedef struct { typedef struct {
int sockfd; char path[1024+1];
SSL_CTX *ssl_ctx; char host[1024+1];
SSL *ssl; char origin[1024+1];
char version[1024+1];
char connection[1024+1];
char protocols[1024+1];
char key1[1024+1];
char key2[1024+1];
char key3[8+1];
} headers_t;
typedef struct {
int sockfd;
SSL_CTX *ssl_ctx;
SSL *ssl;
int hixie;
int hybi;
headers_t *headers;
char *tbuf;
char *cbuf;
char *tbuf_tmp;
char *cbuf_tmp;
} ws_ctx_t; } ws_ctx_t;
typedef struct { typedef struct {
@ -18,15 +63,6 @@ typedef struct {
int daemon; int daemon;
} settings_t; } settings_t;
typedef struct {
char path[1024+1];
char host[1024+1];
char origin[1024+1];
char key1[1024+1];
char key2[1024+1];
char key3[8+1];
} headers_t;
ssize_t ws_recv(ws_ctx_t *ctx, void *buf, size_t len); ssize_t ws_recv(ws_ctx_t *ctx, void *buf, size_t len);

53
other/websockify.c
View File

@ -49,14 +49,12 @@ int target_port;
extern pipe_error; extern pipe_error;
extern settings_t settings; extern settings_t settings;
extern char *tbuf, *cbuf, *tbuf_tmp, *cbuf_tmp;
extern unsigned int bufsize, dbufsize;
void do_proxy(ws_ctx_t *ws_ctx, int target) { void do_proxy(ws_ctx_t *ws_ctx, int target) {
fd_set rlist, wlist, elist; fd_set rlist, wlist, elist;
struct timeval tv; struct timeval tv;
int i, maxfd, client = ws_ctx->sockfd; int i, maxfd, client = ws_ctx->sockfd;
unsigned int tstart, tend, cstart, cend, ret; unsigned int opcode, tstart, tend, cstart, cend, ret;
ssize_t len, bytes; ssize_t len, bytes;
tstart = tend = cstart = cend = 0; tstart = tend = cstart = cend = 0;
@ -110,7 +108,7 @@ void do_proxy(ws_ctx_t *ws_ctx, int target) {
if (FD_ISSET(target, &wlist)) { if (FD_ISSET(target, &wlist)) {
len = tend-tstart; len = tend-tstart;
bytes = send(target, tbuf + tstart, len, 0); bytes = send(target, ws_ctx->tbuf + tstart, len, 0);
if (pipe_error) { break; } if (pipe_error) { break; }
if (bytes < 0) { if (bytes < 0) {
handler_emsg("target connection error: %s\n", handler_emsg("target connection error: %s\n",
@ -128,10 +126,12 @@ void do_proxy(ws_ctx_t *ws_ctx, int target) {
if (FD_ISSET(client, &wlist)) { if (FD_ISSET(client, &wlist)) {
len = cend-cstart; len = cend-cstart;
bytes = ws_send(ws_ctx, cbuf + cstart, len); bytes = ws_send(ws_ctx, ws_ctx->cbuf + cstart, len);
if (pipe_error) { break; } if (pipe_error) { break; }
if (len < 3) { if (len < 3) {
handler_emsg("len: %d, bytes: %d: %d\n", len, bytes, *(cbuf + cstart)); handler_emsg("len: %d, bytes: %d: %d\n",
(int) len, (int) bytes,
(int) *(ws_ctx->cbuf + cstart));
} }
cstart += bytes; cstart += bytes;
if (cstart >= cend) { if (cstart >= cend) {
@ -143,18 +143,24 @@ void do_proxy(ws_ctx_t *ws_ctx, int target) {
} }
if (FD_ISSET(target, &rlist)) { if (FD_ISSET(target, &rlist)) {
bytes = recv(target, cbuf_tmp, dbufsize , 0); bytes = recv(target, ws_ctx->cbuf_tmp, DBUFSIZE , 0);
if (pipe_error) { break; } if (pipe_error) { break; }
if (bytes <= 0) { if (bytes <= 0) {
handler_emsg("target closed connection\n"); handler_emsg("target closed connection\n");
break; break;
} }
cstart = 0; cstart = 0;
cend = encode(cbuf_tmp, bytes, cbuf, bufsize); if (ws_ctx->hybi) {
cend = encode_hybi(ws_ctx->cbuf_tmp, bytes,
ws_ctx->cbuf, BUFSIZE, 1);
} else {
cend = encode_hixie(ws_ctx->cbuf_tmp, bytes,
ws_ctx->cbuf, BUFSIZE);
}
/* /*
printf("encoded: "); printf("encoded: ");
for (i=0; i< cend; i++) { for (i=0; i< cend; i++) {
printf("%u,", (unsigned char) *(cbuf+i)); printf("%u,", (unsigned char) *(ws_ctx->cbuf+i));
} }
printf("\n"); printf("\n");
*/ */
@ -166,29 +172,36 @@ void do_proxy(ws_ctx_t *ws_ctx, int target) {
} }
if (FD_ISSET(client, &rlist)) { if (FD_ISSET(client, &rlist)) {
bytes = ws_recv(ws_ctx, tbuf_tmp, bufsize-1); bytes = ws_recv(ws_ctx, ws_ctx->tbuf_tmp, BUFSIZE-1);
if (pipe_error) { break; } if (pipe_error) { break; }
if (bytes <= 0) { if (bytes <= 0) {
handler_emsg("client closed connection\n"); handler_emsg("client closed connection\n");
break; break;
} else if ((bytes == 2) &&
(tbuf_tmp[0] == '\xff') &&
(tbuf_tmp[1] == '\x00')) {
handler_emsg("client sent orderly close frame\n");
break;
} }
/* /*
printf("before decode: "); printf("before decode: ");
for (i=0; i< bytes; i++) { for (i=0; i< bytes; i++) {
printf("%u,", (unsigned char) *(tbuf_tmp+i)); printf("%u,", (unsigned char) *(ws_ctx->tbuf_tmp+i));
} }
printf("\n"); printf("\n");
*/ */
len = decode(tbuf_tmp, bytes, tbuf, bufsize-1); if (ws_ctx->hybi) {
len = decode_hybi(ws_ctx->tbuf_tmp, bytes,
ws_ctx->tbuf, BUFSIZE-1, &opcode);
} else {
len = decode_hixie(ws_ctx->tbuf_tmp, bytes,
ws_ctx->tbuf, BUFSIZE-1, &opcode);
}
if (opcode == 8) {
handler_emsg("client sent orderly close frame\n");
break;
}
/* /*
printf("decoded: "); printf("decoded: ");
for (i=0; i< len; i++) { for (i=0; i< len; i++) {
printf("%u,", (unsigned char) *(tbuf+i)); printf("%u,", (unsigned char) *(ws_ctx->tbuf+i));
} }
printf("\n"); printf("\n");
*/ */
@ -346,8 +359,4 @@ int main(int argc, char *argv[])
settings.handler = proxy_handler; settings.handler = proxy_handler;
start_server(); start_server();
free(tbuf);
free(cbuf);
free(tbuf_tmp);
free(cbuf_tmp);
} }

1156
other/wswrapper.c
View File

File diff suppressed because it is too large Load Diff

64
other/wswrapper.h
View File

@ -1,64 +0,0 @@
/*
* wswrap/wswrapper: Add WebSockets support to any service.
* Copyright 2010 Joel Martin
* Licensed under LGPL version 3 (see docs/LICENSE.LGPL-3)
*/
#ifdef DO_MSG
#define MSG(...) \
fprintf(stderr, "wswrapper: "); \
fprintf(stderr, __VA_ARGS__);
#else
#define MSG(...)
#endif
#ifdef DO_DEBUG
#define DEBUG(...) \
if (DO_DEBUG) { \
fprintf(stderr, "wswrapper: "); \
fprintf(stderr, __VA_ARGS__); \
}
#else
#define DEBUG(...)
#endif
#ifdef DO_TRACE
#define TRACE(...) \
if (DO_TRACE) { \
fprintf(stderr, "wswrapper: "); \
fprintf(stderr, __VA_ARGS__); \
}
#else
#define TRACE(...)
#endif
#define RET_ERROR(eno, ...) \
fprintf(stderr, "wswrapper error: "); \
fprintf(stderr, __VA_ARGS__); \
errno = eno; \
return -1;
const char _WS_response[] = "\
HTTP/1.1 101 Web Socket Protocol Handshake\r\n\
Upgrade: WebSocket\r\n\
Connection: Upgrade\r\n\
%sWebSocket-Origin: %s\r\n\
%sWebSocket-Location: %s://%s%s\r\n\
%sWebSocket-Protocol: sample\r\n\
\r\n%s";
#define WS_BUFSIZE 65536
#define WS_MAX_FDS 1024
/* Buffers and state for each wrapped WebSocket connection */
typedef struct {
char rbuf[WS_BUFSIZE];
char sbuf[WS_BUFSIZE];
int rcarry_cnt;
char rcarry[3];
int newframe;
int refcnt;
} _WS_connection;

2
rebind.c
View File

@ -31,7 +31,7 @@
#if defined(DO_DEBUG) #if defined(DO_DEBUG)
#define DEBUG(...) \ #define DEBUG(...) \
fprintf(stderr, "wswrapper: "); \ fprintf(stderr, "rebind: "); \
fprintf(stderr, __VA_ARGS__); fprintf(stderr, __VA_ARGS__);
#else #else
#define DEBUG(...) #define DEBUG(...)