diff --git a/.gitignore b/.gitignore index da9e275130..51edfbf0f1 100644 --- a/.gitignore +++ b/.gitignore @@ -214,6 +214,9 @@ ipch/ /src/mod/languages/mod_managed/Win32/Debug_CLR/mod_managed.*.log /src/mod/languages/mod_managed/Win32/Release_CLR/mod_managed.*.log +/src/.dirstamp +/src/mod/languages/mod_v8/src/.dirstamp + libs/libsndfile/Scripts/build-test-tarball.mk libs/libsndfile/doc/libsndfile.css libs/libsndfile/echo-install-dirs diff --git a/Makefile.am b/Makefile.am index ff89b8b79d..3d948a80fb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ EXTRA_DIST = SUBDIRS = . src -AUTOMAKE_OPTIONS = foreign +AUTOMAKE_OPTIONS = foreign subdir-objects NAME = freeswitch AM_LIBAPR_CFLAGS := $(shell ./libs/apr/apr-1-config --cflags) @@ -220,7 +220,8 @@ library_include_HEADERS = \ libs/libtpl-1.5/src/tpl.h \ src/include/switch_limit.h \ src/include/switch_odbc.h \ - src/include/switch_pgsql.h + src/include/switch_pgsql.h \ + src/include/switch_hashtable.h nodist_libfreeswitch_la_SOURCES = \ src/include/switch_frame.h \ @@ -287,6 +288,7 @@ libfreeswitch_la_SOURCES = \ src/switch_profile.c \ src/switch_json.c \ src/switch_curl.c \ + src/switch_hashtable.c\ libs/libtpl-1.5/src/tpl.c \ libs/stfu/stfu.c \ libs/libteletone/src/libteletone_detect.c \ diff --git a/bootstrap.sh b/bootstrap.sh index cdf0711a7b..349a9e5dac 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -9,7 +9,7 @@ VERBOSE=false BASEDIR=`pwd`; LIBDIR=${BASEDIR}/libs; SUBDIRS="apr \ - libzrtp ilbc curl iksemel js js/nsprpub ldns libdingaling libedit libsndfile pcre sofia-sip libwebsockets \ + libzrtp ilbc curl iksemel js js/nsprpub ldns libdingaling libedit libsndfile pcre sofia-sip \ speex sqlite srtp openzap freetdm spandsp libg722_1 portaudio unimrcp tiff-4.0.2 broadvoice silk libcodec2 \ fs"; diff --git a/build/modmake.rulesam b/build/modmake.rulesam index 51e2f809c2..386fd41e06 100644 --- a/build/modmake.rulesam +++ b/build/modmake.rulesam @@ -1,6 +1,10 @@ +AUTOMAKE_OPTIONS = foreign subdir-objects AM_CFLAGS = $(SWITCH_AM_CFLAGS) $(SWITCH_ANSI_CFLAGS) AM_CPPFLAGS = $(SWITCH_AM_CXXFLAGS) AM_LDFLAGS = $(SWITCH_AM_LDFLAGS) +DEFAULT_VARS = CFLAGS="$(CFLAGS)" CPPFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)" CXX="$(CXX)" +DEFAULT_ARGS = --build=$(build) --host=$(host) --target=$(target) --prefix="$(prefix)" --exec_prefix="$(exec_prefix)" --libdir="$(libdir)" --disable-shared --with-pic + #we should set all these vars from configure, no reason to have these in each Makefile.am LIBTOOL = echo "`link=\`echo $@|grep .la;echo $@|grep .so;echo $@|grep .dll\`;if test -n "$$link"; then echo Creating $@;fi`";`if test -z "$(VERBOSE)" ; \ then echo $(SHELL) $(switch_builddir)/quiet_libtool ;else echo $(SHELL) $(switch_builddir)/libtool; fi` diff --git a/conf/vanilla/dialplan/default.xml b/conf/vanilla/dialplan/default.xml index 4dc615157a..2abeb38e12 100644 --- a/conf/vanilla/dialplan/default.xml +++ b/conf/vanilla/dialplan/default.xml @@ -135,7 +135,7 @@ --> - + diff --git a/conf/vanilla/vars.xml b/conf/vanilla/vars.xml index 8ea964e2f5..906110384c 100644 --- a/conf/vanilla/vars.xml +++ b/conf/vanilla/vars.xml @@ -50,14 +50,108 @@ - + + - * - * HTTP/1.1 101 WebSocket Protocol Handshake - * Upgrade: WebSocket - * Connection: Upgrade - * Sec-WebSocket-Origin: http://127.0.0.1 - * Sec-WebSocket-Location: ws://127.0.0.1:9999/socket.io/websocket - * - * xxxxxxxxxxxxxxxx - */ - - if (wsi->ietf_spec_revision == 0) { - if (!wsi->utf8_token[WSI_TOKEN_HTTP].token_len || - !wsi->utf8_token[WSI_TOKEN_UPGRADE].token_len || - !wsi->utf8_token[WSI_TOKEN_CHALLENGE].token_len || - !wsi->utf8_token[WSI_TOKEN_CONNECTION].token_len || - (!wsi->utf8_token[WSI_TOKEN_PROTOCOL].token_len && - wsi->c_protocol != NULL)) { - debug("libwebsocket_client_handshake " - "missing required header(s)\n"); - pkt[len] = '\0'; - debug("%s", pkt); - goto bail3; - } - - strtolower(wsi->utf8_token[WSI_TOKEN_HTTP].token); - if (strncmp(wsi->utf8_token[WSI_TOKEN_HTTP].token, "101", 3)) { - fprintf(stderr, "libwebsocket_client_handshake " - "server sent bad HTTP response '%s'\n", - wsi->utf8_token[WSI_TOKEN_HTTP].token); - goto bail3; - } - - if (wsi->utf8_token[WSI_TOKEN_CHALLENGE].token_len < 16) { - fprintf(stderr, "libwebsocket_client_handshake " - "challenge reply too short %d\n", - wsi->utf8_token[ - WSI_TOKEN_CHALLENGE].token_len); - pkt[len] = '\0'; - debug("%s", pkt); - goto bail3; - - } - - goto select_protocol; - } - - /* - * well, what the server sent looked reasonable for syntax. - * Now let's confirm it sent all the necessary headers - */ -#if 0 - fprintf(stderr, "WSI_TOKEN_HTTP: %d\n", - wsi->utf8_token[WSI_TOKEN_HTTP].token_len); - fprintf(stderr, "WSI_TOKEN_UPGRADE: %d\n", - wsi->utf8_token[WSI_TOKEN_UPGRADE].token_len); - fprintf(stderr, "WSI_TOKEN_CONNECTION: %d\n", - wsi->utf8_token[WSI_TOKEN_CONNECTION].token_len); - fprintf(stderr, "WSI_TOKEN_ACCEPT: %d\n", - wsi->utf8_token[WSI_TOKEN_ACCEPT].token_len); - fprintf(stderr, "WSI_TOKEN_NONCE: %d\n", - wsi->utf8_token[WSI_TOKEN_NONCE].token_len); - fprintf(stderr, "WSI_TOKEN_PROTOCOL: %d\n", - wsi->utf8_token[WSI_TOKEN_PROTOCOL].token_len); -#endif - if (!wsi->utf8_token[WSI_TOKEN_HTTP].token_len || - !wsi->utf8_token[WSI_TOKEN_UPGRADE].token_len || - !wsi->utf8_token[WSI_TOKEN_CONNECTION].token_len || - !wsi->utf8_token[WSI_TOKEN_ACCEPT].token_len || - (!wsi->utf8_token[WSI_TOKEN_NONCE].token_len && - wsi->ietf_spec_revision == 4) || - (!wsi->utf8_token[WSI_TOKEN_PROTOCOL].token_len && - wsi->c_protocol != NULL)) { - debug("libwebsocket_client_handshake " - "missing required header(s)\n"); - pkt[len] = '\0'; - debug("%s", pkt); - goto bail3; - } - - /* - * Everything seems to be there, now take a closer look at what - * is in each header - */ - - strtolower(wsi->utf8_token[WSI_TOKEN_HTTP].token); - if (strncmp(wsi->utf8_token[WSI_TOKEN_HTTP].token, "101", 3)) { - fprintf(stderr, "libwebsocket_client_handshake " - "server sent bad HTTP response '%s'\n", - wsi->utf8_token[WSI_TOKEN_HTTP].token); - goto bail3; - } - - strtolower(wsi->utf8_token[WSI_TOKEN_UPGRADE].token); - if (strcmp(wsi->utf8_token[WSI_TOKEN_UPGRADE].token, - "websocket")) { - fprintf(stderr, "libwebsocket_client_handshake server " - "sent bad Upgrade header '%s'\n", - wsi->utf8_token[WSI_TOKEN_UPGRADE].token); - goto bail3; - } - - strtolower(wsi->utf8_token[WSI_TOKEN_CONNECTION].token); - if (strcmp(wsi->utf8_token[WSI_TOKEN_CONNECTION].token, - "upgrade")) { - fprintf(stderr, "libwebsocket_client_handshake server " - "sent bad Connection hdr '%s'\n", - wsi->utf8_token[WSI_TOKEN_CONNECTION].token); - goto bail3; - } - -select_protocol: - pc = wsi->c_protocol; - if (pc == NULL) - fprintf(stderr, "lws_client_interpret_server_handshake: " - "NULL c_protocol\n"); - else - debug("lws_client_interpret_server_handshake: " - "cPprotocol='%s'\n", pc); - - /* - * confirm the protocol the server wants to talk was in the list - * of protocols we offered - */ - - if (!wsi->utf8_token[WSI_TOKEN_PROTOCOL].token_len) { - - fprintf(stderr, "lws_client_interpret_server_handshake " - "WSI_TOKEN_PROTOCOL is null\n"); - /* - * no protocol name to work from, - * default to first protocol - */ - wsi->protocol = &context->protocols[0]; - wsi->c_callback = wsi->protocol->callback; - free(wsi->c_protocol); - - goto check_accept; - } - - while (*pc && !okay) { - if ((!strncmp(pc, wsi->utf8_token[WSI_TOKEN_PROTOCOL].token, - wsi->utf8_token[WSI_TOKEN_PROTOCOL].token_len)) && - (pc[wsi->utf8_token[WSI_TOKEN_PROTOCOL].token_len] == ',' || - pc[wsi->utf8_token[WSI_TOKEN_PROTOCOL].token_len] == '\0')) { - okay = 1; - continue; - } - while (*pc && *pc != ',') - pc++; - while (*pc && *pc != ' ') - pc++; - } - - /* done with him now */ - - if (wsi->c_protocol) - free(wsi->c_protocol); - - if (!okay) { - fprintf(stderr, "libwebsocket_client_handshake server " - "sent bad protocol '%s'\n", - wsi->utf8_token[WSI_TOKEN_PROTOCOL].token); - goto bail2; - } - - /* - * identify the selected protocol struct and set it - */ - n = 0; - wsi->protocol = NULL; - while (context->protocols[n].callback && !wsi->protocol) { /* Stop after finding first one?? */ - if (strcmp(wsi->utf8_token[WSI_TOKEN_PROTOCOL].token, - context->protocols[n].name) == 0) { - wsi->protocol = &context->protocols[n]; - wsi->c_callback = wsi->protocol->callback; - } - n++; - } - - if (wsi->protocol == NULL) { - fprintf(stderr, "libwebsocket_client_handshake server " - "requested protocol '%s', which we " - "said we supported but we don't!\n", - wsi->utf8_token[WSI_TOKEN_PROTOCOL].token); - goto bail2; - } - - - /* instantiate the accepted extensions */ - - if (!wsi->utf8_token[WSI_TOKEN_EXTENSIONS].token_len) { - debug("no client extenstions allowed by server\n"); - goto check_accept; - } - - /* - * break down the list of server accepted extensions - * and go through matching them or identifying bogons - */ - - c = wsi->utf8_token[WSI_TOKEN_EXTENSIONS].token; - n = 0; - while (more) { - - if (*c && (*c != ',' && *c != ' ' && *c != '\t')) { - ext_name[n] = *c++; - if (n < sizeof(ext_name) - 1) - n++; - continue; - } - ext_name[n] = '\0'; - if (!*c) - more = 0; - else { - c++; - if (!n) - continue; - } - - /* check we actually support it */ - - debug("checking client ext %s\n", ext_name); - - n = 0; - ext = wsi->protocol->owning_server->extensions; - while (ext && ext->callback) { - - if (strcmp(ext_name, ext->name)) { - ext++; - continue; - } - - n = 1; - - debug("instantiating client ext %s\n", ext_name); - - /* instantiate the extension on this conn */ - - wsi->active_extensions_user[ - wsi->count_active_extensions] = - malloc(ext->per_session_data_size); - memset(wsi->active_extensions_user[ - wsi->count_active_extensions], 0, - ext->per_session_data_size); - wsi->active_extensions[ - wsi->count_active_extensions] = ext; - - /* allow him to construct his context */ - - ext->callback(wsi->protocol->owning_server, - ext, wsi, - LWS_EXT_CALLBACK_CLIENT_CONSTRUCT, - wsi->active_extensions_user[ - wsi->count_active_extensions], - NULL, 0); - - wsi->count_active_extensions++; - - ext++; - } - - if (n == 0) { - fprintf(stderr, "Server said we should use" - "an unknown extension '%s'!\n", ext_name); - goto bail2; - } - - n = 0; - } - - -check_accept: - - if (wsi->ietf_spec_revision == 0) { - - if (memcmp(wsi->initial_handshake_hash_base64, - wsi->utf8_token[WSI_TOKEN_CHALLENGE].token, 16)) { - fprintf(stderr, "libwebsocket_client_handshake " - "failed 00 challenge compare\n"); - pkt[len] = '\0'; - fprintf(stderr, "%s", pkt); - goto bail2; - } - - goto accept_ok; - } - - /* - * Confirm his accept token is the one we precomputed - */ - - if (strcmp(wsi->utf8_token[WSI_TOKEN_ACCEPT].token, - wsi->initial_handshake_hash_base64)) { - fprintf(stderr, "libwebsocket_client_handshake server " - "sent bad ACCEPT '%s' vs computed '%s'\n", - wsi->utf8_token[WSI_TOKEN_ACCEPT].token, - wsi->initial_handshake_hash_base64); - goto bail2; - } - - if (wsi->ietf_spec_revision == 4) { - /* - * Calculate the 04 masking key to use when - * sending data to server - */ - - strcpy((char *)buf, wsi->key_b64); - p = (char *)buf + strlen(wsi->key_b64); - strcpy(p, wsi->utf8_token[WSI_TOKEN_NONCE].token); - p += wsi->utf8_token[WSI_TOKEN_NONCE].token_len; - strcpy(p, magic_websocket_04_masking_guid); - SHA1(buf, strlen((char *)buf), wsi->masking_key_04); - } -accept_ok: - - /* allocate the per-connection user memory (if any) */ - if (wsi->protocol->per_session_data_size && - !libwebsocket_ensure_user_space(wsi)) - goto bail2; - - /* clear his proxy connection timeout */ - - libwebsocket_set_timeout(wsi, NO_PENDING_TIMEOUT, 0); - - /* mark him as being alive */ - - wsi->state = WSI_STATE_ESTABLISHED; - wsi->mode = LWS_CONNMODE_WS_CLIENT; - - debug("handshake OK for protocol %s\n", wsi->protocol->name); - - /* call him back to inform him he is up */ - - wsi->protocol->callback(context, wsi, - LWS_CALLBACK_CLIENT_ESTABLISHED, - wsi->user_space, NULL, 0); - - /* - * inform all extensions, not just active ones since they - * already know - */ - - ext = context->extensions; - - while (ext && ext->callback) { - v = NULL; - for (n = 0; n < wsi->count_active_extensions; n++) - if (wsi->active_extensions[n] == ext) - v = wsi->active_extensions_user[n]; - - ext->callback(context, ext, wsi, - LWS_EXT_CALLBACK_ANY_WSI_ESTABLISHED, v, NULL, 0); - ext++; - } - - return 0; - -bail3: - if (wsi->c_protocol) - free(wsi->c_protocol); - -bail2: - if (wsi->c_callback) wsi->c_callback(context, wsi, - LWS_CALLBACK_CLIENT_CONNECTION_ERROR, - wsi->user_space, - NULL, 0); - libwebsocket_close_and_free_session(context, wsi, - LWS_CLOSE_STATUS_NOSTATUS); // But this should be LWS_CLOSE_STATUS_PROTOCOL_ERR - - return 1; -} - - - -/** - * libwebsocket_service_fd() - Service polled socket with something waiting - * @context: Websocket context - * @pollfd: The pollfd entry describing the socket fd and which events - * happened. - * - * This function closes any active connections and then frees the - * context. After calling this, any further use of the context is - * undefined. - */ - -int -libwebsocket_service_fd(struct libwebsocket_context *context, - struct pollfd *pollfd) -{ - unsigned char buf[LWS_SEND_BUFFER_PRE_PADDING + 1 + - MAX_BROADCAST_PAYLOAD + LWS_SEND_BUFFER_POST_PADDING]; - struct libwebsocket *wsi; - struct libwebsocket *new_wsi; - int n; - int m; - ssize_t len; - int accept_fd; - unsigned int clilen; - struct sockaddr_in cli_addr; - struct timeval tv; - char pkt[1024]; - char *p = &pkt[0]; - int more = 1; - struct lws_tokens eff_buf; - int opt = 1; - char c; - -#ifdef LWS_OPENSSL_SUPPORT - char ssl_err_buf[512]; -#endif - /* - * you can call us with pollfd = NULL to just allow the once-per-second - * global timeout checks; if less than a second since the last check - * it returns immediately then. - */ - - gettimeofday(&tv, NULL); - - if (context->last_timeout_check_s != tv.tv_sec) { - context->last_timeout_check_s = tv.tv_sec; - - /* global timeout check once per second */ - - for (n = 0; n < context->fds_count; n++) { - wsi = wsi_from_fd(context, context->fds[n].fd); - - libwebsocket_service_timeout_check(context, wsi, - tv.tv_sec); - } - } - - /* just here for timeout management? */ - - if (pollfd == NULL) - return 0; - - /* no, here to service a socket descriptor */ - - wsi = wsi_from_fd(context, pollfd->fd); - - if (wsi == NULL) - return 1; - - switch (wsi->mode) { - case LWS_CONNMODE_SERVER_LISTENER: - - /* pollin means a client has connected to us then */ - - if (!pollfd->revents & POLLIN) - break; - - if (context->fds_count >= MAX_CLIENTS) { - fprintf(stderr, "too busy to accept new client\n"); - break; - } - - /* listen socket got an unencrypted connection... */ - - clilen = sizeof(cli_addr); - accept_fd = accept(pollfd->fd, (struct sockaddr *)&cli_addr, - &clilen); - if (accept_fd < 0) { - debug("ERROR on accept\n"); - return -1; - } - - /* Disable Nagle */ - opt = 1; - setsockopt(accept_fd, IPPROTO_TCP, TCP_NODELAY, - (const void *)&opt, sizeof(opt)); - - /* - * look at who we connected to and give user code a chance - * to reject based on client IP. There's no protocol selected - * yet so we issue this to protocols[0] - */ - - if ((context->protocols[0].callback)(context, wsi, - LWS_CALLBACK_FILTER_NETWORK_CONNECTION, - (void *)(long)accept_fd, NULL, 0)) { - debug("Callback denied network connection\n"); -#ifdef WIN32 - closesocket(accept_fd); -#else - close(accept_fd); -#endif - break; - } - - /* accepting connection to main listener */ - - new_wsi = libwebsocket_create_new_server_wsi(context); - if (new_wsi == NULL) - break; - - new_wsi->sock = accept_fd; - - -#ifdef LWS_OPENSSL_SUPPORT - new_wsi->ssl = NULL; - - if (context->use_ssl) { - - new_wsi->ssl = SSL_new(context->ssl_ctx); - if (new_wsi->ssl == NULL) { - fprintf(stderr, "SSL_new failed: %s\n", - ERR_error_string(SSL_get_error( - new_wsi->ssl, 0), NULL)); - libwebsockets_decode_ssl_error(); - free(new_wsi); - break; - } - - SSL_set_fd(new_wsi->ssl, accept_fd); - - n = SSL_accept(new_wsi->ssl); - if (n != 1) { - /* - * browsers seem to probe with various - * ssl params which fail then retry - * and succeed - */ - debug("SSL_accept failed skt %u: %s\n", - pollfd->fd, - ERR_error_string(SSL_get_error( - new_wsi->ssl, n), NULL)); - SSL_free( - new_wsi->ssl); - free(new_wsi); - break; - } - - debug("accepted new SSL conn " - "port %u on fd=%d SSL ver %s\n", - ntohs(cli_addr.sin_port), accept_fd, - SSL_get_version(new_wsi->ssl)); - - } else -#endif - debug("accepted new conn port %u on fd=%d\n", - ntohs(cli_addr.sin_port), accept_fd); - - insert_wsi(context, new_wsi); - - /* - * make sure NO events are seen yet on this new socket - * (otherwise we inherit old fds[client].revents from - * previous socket there and die mysteriously! ) - */ - context->fds[context->fds_count].revents = 0; - - context->fds[context->fds_count].events = POLLIN; - context->fds[context->fds_count++].fd = accept_fd; - - /* external POLL support via protocol 0 */ - context->protocols[0].callback(context, new_wsi, - LWS_CALLBACK_ADD_POLL_FD, - (void *)(long)accept_fd, NULL, POLLIN); - - break; - - case LWS_CONNMODE_BROADCAST_PROXY_LISTENER: - - /* as we are listening, POLLIN means accept() is needed */ - - if (!pollfd->revents & POLLIN) - break; - - /* listen socket got an unencrypted connection... */ - - clilen = sizeof(cli_addr); - accept_fd = accept(pollfd->fd, (struct sockaddr *)&cli_addr, - &clilen); - if (accept_fd < 0) { - debug("ERROR on accept\n"); - return -1; - } - - if (context->fds_count >= MAX_CLIENTS) { - fprintf(stderr, "too busy to accept new broadcast " - "proxy client\n"); -#ifdef WIN32 - closesocket(accept_fd); -#else - close(accept_fd); -#endif - break; - } - - /* create a dummy wsi for the connection and add it */ - - new_wsi = malloc(sizeof(struct libwebsocket)); - memset(new_wsi, 0, sizeof(struct libwebsocket)); - new_wsi->sock = accept_fd; - new_wsi->mode = LWS_CONNMODE_BROADCAST_PROXY; - new_wsi->state = WSI_STATE_ESTABLISHED; - new_wsi->count_active_extensions = 0; - /* note which protocol we are proxying */ - new_wsi->protocol_index_for_broadcast_proxy = - wsi->protocol_index_for_broadcast_proxy; - insert_wsi(context, new_wsi); - - /* add connected socket to internal poll array */ - - context->fds[context->fds_count].revents = 0; - context->fds[context->fds_count].events = POLLIN; - context->fds[context->fds_count++].fd = accept_fd; - - /* external POLL support via protocol 0 */ - context->protocols[0].callback(context, new_wsi, - LWS_CALLBACK_ADD_POLL_FD, - (void *)(long)accept_fd, NULL, POLLIN); - - break; - - case LWS_CONNMODE_BROADCAST_PROXY: - - /* handle session socket closed */ - - if (pollfd->revents & (POLLERR | POLLHUP)) { - - debug("Session Socket %p (fd=%d) dead\n", - (void *)wsi, pollfd->fd); - - libwebsocket_close_and_free_session(context, wsi, - LWS_CLOSE_STATUS_NORMAL); - return 1; - } - - /* - * either extension code with stuff to spill, or the user code, - * requested a callback when it was OK to write - */ - - if (pollfd->revents & POLLOUT) - if (lws_handle_POLLOUT_event(context, wsi, - pollfd) < 0) { - libwebsocket_close_and_free_session( - context, wsi, LWS_CLOSE_STATUS_NORMAL); - return 1; - } - - /* any incoming data ready? */ - - if (!(pollfd->revents & POLLIN)) - break; - - /* get the issued broadcast payload from the socket */ - - len = read(pollfd->fd, buf + LWS_SEND_BUFFER_PRE_PADDING, - MAX_BROADCAST_PAYLOAD); - if (len < 0) { - fprintf(stderr, "Error reading broadcast payload\n"); - break; - } - - /* broadcast it to all guys with this protocol index */ - - for (n = 0; n < FD_HASHTABLE_MODULUS; n++) { - - for (m = 0; m < context->fd_hashtable[n].length; m++) { - - new_wsi = context->fd_hashtable[n].wsi[m]; - - /* only to clients we are serving to */ - - if (new_wsi->mode != LWS_CONNMODE_WS_SERVING) - continue; - - /* - * never broadcast to non-established - * connection - */ - - if (new_wsi->state != WSI_STATE_ESTABLISHED) - continue; - - /* - * only broadcast to connections using - * the requested protocol - */ - - if (new_wsi->protocol->protocol_index != - wsi->protocol_index_for_broadcast_proxy) - continue; - - /* broadcast it to this connection */ - - new_wsi->protocol->callback(context, new_wsi, - LWS_CALLBACK_BROADCAST, - new_wsi->user_space, - buf + LWS_SEND_BUFFER_PRE_PADDING, len); - } - } - break; - - case LWS_CONNMODE_WS_CLIENT_WAITING_PROXY_REPLY: - - /* handle proxy hung up on us */ - - if (pollfd->revents & (POLLERR | POLLHUP)) { - - fprintf(stderr, "Proxy connection %p (fd=%d) dead\n", - (void *)wsi, pollfd->fd); - - libwebsocket_close_and_free_session(context, wsi, - LWS_CLOSE_STATUS_NOSTATUS); - return 1; - } - - n = recv(wsi->sock, pkt, sizeof pkt, 0); - if (n < 0) { - libwebsocket_close_and_free_session(context, wsi, - LWS_CLOSE_STATUS_NOSTATUS); - fprintf(stderr, "ERROR reading from proxy socket\n"); - return 1; - } - - pkt[13] = '\0'; - if (strcmp(pkt, "HTTP/1.0 200 ") != 0) { - libwebsocket_close_and_free_session(context, wsi, - LWS_CLOSE_STATUS_NOSTATUS); - fprintf(stderr, "ERROR from proxy: %s\n", pkt); - return 1; - } - - /* clear his proxy connection timeout */ - - libwebsocket_set_timeout(wsi, NO_PENDING_TIMEOUT, 0); - - /* fallthru */ - - case LWS_CONNMODE_WS_CLIENT_ISSUE_HANDSHAKE: - - #ifdef LWS_OPENSSL_SUPPORT - if (wsi->use_ssl && !wsi->ssl) { - - wsi->ssl = SSL_new(context->ssl_client_ctx); - wsi->client_bio = BIO_new_socket(wsi->sock, - BIO_NOCLOSE); - SSL_set_bio(wsi->ssl, wsi->client_bio, wsi->client_bio); - - SSL_set_ex_data(wsi->ssl, - openssl_websocket_private_data_index, - context); - } - - if (wsi->use_ssl) { - if (SSL_connect(wsi->ssl) <= 0) { - - /* - * retry if new data comes until we - * run into the connection timeout or win - */ - - fprintf(stderr, "SSL connect error %s\n", - ERR_error_string(ERR_get_error(), - ssl_err_buf)); - return 0; - } - - n = SSL_get_verify_result(wsi->ssl); - if ((n != X509_V_OK) && ( - n != X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT || - wsi->use_ssl != 2)) { - - fprintf(stderr, "server's cert didn't " - "look good %d\n", n); - libwebsocket_close_and_free_session(context, - wsi, LWS_CLOSE_STATUS_NOSTATUS); - return 1; - } - } else - wsi->ssl = NULL; - #endif - - p = libwebsockets_generate_client_handshake(context, wsi, p); - if (p == NULL) - return 1; - - /* send our request to the server */ - - #ifdef LWS_OPENSSL_SUPPORT - if (wsi->use_ssl) - n = SSL_write(wsi->ssl, pkt, p - pkt); - else - #endif - n = send(wsi->sock, pkt, p - pkt, 0); - - if (n < 0) { - fprintf(stderr, "ERROR writing to client socket\n"); - libwebsocket_close_and_free_session(context, wsi, - LWS_CLOSE_STATUS_NOSTATUS); - return 1; - } - - wsi->parser_state = WSI_TOKEN_NAME_PART; - wsi->mode = LWS_CONNMODE_WS_CLIENT_WAITING_SERVER_REPLY; - libwebsocket_set_timeout(wsi, - PENDING_TIMEOUT_AWAITING_SERVER_RESPONSE, 5); - - break; - - case LWS_CONNMODE_WS_CLIENT_WAITING_SERVER_REPLY: - - /* handle server hung up on us */ - - if (pollfd->revents & (POLLERR | POLLHUP)) { - - fprintf(stderr, "Server connection %p (fd=%d) dead\n", - (void *)wsi, pollfd->fd); - - goto bail3; - } - - - /* interpret the server response */ - - /* - * HTTP/1.1 101 Switching Protocols - * Upgrade: websocket - * Connection: Upgrade - * Sec-WebSocket-Accept: me89jWimTRKTWwrS3aRrL53YZSo= - * Sec-WebSocket-Nonce: AQIDBAUGBwgJCgsMDQ4PEC== - * Sec-WebSocket-Protocol: chat - */ - - /* - * we have to take some care here to only take from the - * socket bytewise. The browser may (and has been seen to - * in the case that onopen() performs websocket traffic) - * coalesce both handshake response and websocket traffic - * in one packet, since at that point the connection is - * definitively ready from browser pov. - */ - - len = 1; - while (wsi->parser_state != WSI_PARSING_COMPLETE && len > 0) { -#ifdef LWS_OPENSSL_SUPPORT - if (wsi->use_ssl) - len = SSL_read(wsi->ssl, &c, 1); - else -#endif - len = recv(wsi->sock, &c, 1, 0); - - libwebsocket_parse(wsi, c); - } - - /* - * hs may also be coming in multiple packets, there is a 5-sec - * libwebsocket timeout still active here too, so if parsing did - * not complete just wait for next packet coming in this state - */ - - if (wsi->parser_state != WSI_PARSING_COMPLETE) - break; - - /* - * otherwise deal with the handshake. If there's any - * packet traffic already arrived we'll trigger poll() again - * right away and deal with it that way - */ - - return lws_client_interpret_server_handshake(context, wsi); - -bail3: - if (wsi->c_protocol) - free(wsi->c_protocol); - libwebsocket_close_and_free_session(context, wsi, - LWS_CLOSE_STATUS_NOSTATUS); - return 1; - - case LWS_CONNMODE_WS_CLIENT_WAITING_EXTENSION_CONNECT: - fprintf(stderr, - "LWS_CONNMODE_WS_CLIENT_WAITING_EXTENSION_CONNECT\n"); - break; - - case LWS_CONNMODE_WS_CLIENT_PENDING_CANDIDATE_CHILD: - fprintf(stderr, - "LWS_CONNMODE_WS_CLIENT_PENDING_CANDIDATE_CHILD\n"); - break; - - - case LWS_CONNMODE_WS_SERVING: - case LWS_CONNMODE_WS_CLIENT: - - /* handle session socket closed */ - - if (pollfd->revents & (POLLERR | POLLHUP)) { - - fprintf(stderr, "Session Socket %p (fd=%d) dead\n", - (void *)wsi, pollfd->fd); - - libwebsocket_close_and_free_session(context, wsi, - LWS_CLOSE_STATUS_NOSTATUS); - return 1; - } - - /* the guy requested a callback when it was OK to write */ - - if ((pollfd->revents & POLLOUT) && - wsi->state == WSI_STATE_ESTABLISHED) - if (lws_handle_POLLOUT_event(context, wsi, - pollfd) < 0) { - libwebsocket_close_and_free_session( - context, wsi, LWS_CLOSE_STATUS_NORMAL); - return 1; - } - - - /* any incoming data ready? */ - - if (!(pollfd->revents & POLLIN)) - break; - -#ifdef LWS_OPENSSL_SUPPORT - if (wsi->ssl) - eff_buf.token_len = SSL_read(wsi->ssl, buf, sizeof buf); - else -#endif - eff_buf.token_len = - recv(pollfd->fd, buf, sizeof buf, 0); - - if (eff_buf.token_len < 0) { - fprintf(stderr, "Socket read returned %d\n", - eff_buf.token_len); - if (errno != EINTR) - libwebsocket_close_and_free_session(context, - wsi, LWS_CLOSE_STATUS_NOSTATUS); - return 1; - } - if (!eff_buf.token_len) { - libwebsocket_close_and_free_session(context, wsi, - LWS_CLOSE_STATUS_NOSTATUS); - return 1; - } - - /* - * give any active extensions a chance to munge the buffer - * before parse. We pass in a pointer to an lws_tokens struct - * prepared with the default buffer and content length that's in - * there. Rather than rewrite the default buffer, extensions - * that expect to grow the buffer can adapt .token to - * point to their own per-connection buffer in the extension - * user allocation. By default with no extensions or no - * extension callback handling, just the normal input buffer is - * used then so it is efficient. - */ - - eff_buf.token = (char *)buf; - - more = 1; - while (more) { - - more = 0; - - for (n = 0; n < wsi->count_active_extensions; n++) { - m = wsi->active_extensions[n]->callback(context, - wsi->active_extensions[n], wsi, - LWS_EXT_CALLBACK_PACKET_RX_PREPARSE, - wsi->active_extensions_user[n], - &eff_buf, 0); - if (m < 0) { - fprintf(stderr, - "Extension reports fatal error\n"); - libwebsocket_close_and_free_session( - context, wsi, - LWS_CLOSE_STATUS_NOSTATUS); - return 1; - } - if (m) - more = 1; - } - - /* service incoming data */ - - if (eff_buf.token_len) { - n = libwebsocket_read(context, wsi, - (unsigned char *)eff_buf.token, - eff_buf.token_len); - if (n < 0) - /* we closed wsi */ - return 1; - } - - eff_buf.token = NULL; - eff_buf.token_len = 0; - } - break; - } - - return 0; -} - - -/** - * libwebsocket_context_destroy() - Destroy the websocket context - * @context: Websocket context - * - * This function closes any active connections and then frees the - * context. After calling this, any further use of the context is - * undefined. - */ -void -libwebsocket_context_destroy(struct libwebsocket_context *context) -{ - int n; - int m; - struct libwebsocket *wsi; - struct libwebsocket_extension *ext; - - for (n = 0; n < FD_HASHTABLE_MODULUS; n++) - for (m = 0; m < context->fd_hashtable[n].length; m++) { - wsi = context->fd_hashtable[n].wsi[m]; - libwebsocket_close_and_free_session(context, wsi, - LWS_CLOSE_STATUS_GOINGAWAY); - } - - /* - * give all extensions a chance to clean up any per-context - * allocations they might have made - */ - - ext = context->extensions; - m = LWS_EXT_CALLBACK_CLIENT_CONTEXT_DESTRUCT; - if (context->listen_port) - m = LWS_EXT_CALLBACK_SERVER_CONTEXT_DESTRUCT; - while (ext && ext->callback) { - ext->callback(context, ext, NULL, m, NULL, NULL, 0); - ext++; - } - -#ifdef WIN32 -#else - close(context->fd_random); -#endif - -#ifdef LWS_OPENSSL_SUPPORT - if (context->ssl_ctx) - SSL_CTX_free(context->ssl_ctx); - if (context->ssl_client_ctx) - SSL_CTX_free(context->ssl_client_ctx); -#endif - - free(context); - -#ifdef WIN32 - WSACleanup(); -#endif -} - -/** - * libwebsocket_service() - Service any pending websocket activity - * @context: Websocket context - * @timeout_ms: Timeout for poll; 0 means return immediately if nothing needed - * service otherwise block and service immediately, returning - * after the timeout if nothing needed service. - * - * This function deals with any pending websocket traffic, for three - * kinds of event. It handles these events on both server and client - * types of connection the same. - * - * 1) Accept new connections to our context's server - * - * 2) Perform pending broadcast writes initiated from other forked - * processes (effectively serializing asynchronous broadcasts) - * - * 3) Call the receive callback for incoming frame data received by - * server or client connections. - * - * You need to call this service function periodically to all the above - * functions to happen; if your application is single-threaded you can - * just call it in your main event loop. - * - * Alternatively you can fork a new process that asynchronously handles - * calling this service in a loop. In that case you are happy if this - * call blocks your thread until it needs to take care of something and - * would call it with a large nonzero timeout. Your loop then takes no - * CPU while there is nothing happening. - * - * If you are calling it in a single-threaded app, you don't want it to - * wait around blocking other things in your loop from happening, so you - * would call it with a timeout_ms of 0, so it returns immediately if - * nothing is pending, or as soon as it services whatever was pending. - */ - - -int -libwebsocket_service(struct libwebsocket_context *context, int timeout_ms) -{ - int n; - - /* stay dead once we are dead */ - - if (context == NULL) - return 1; - - /* wait for something to need service */ - - n = poll(context->fds, context->fds_count, timeout_ms); - if (n == 0) /* poll timeout */ - return 0; - - if (n < 0) { - /* - fprintf(stderr, "Listen Socket dead\n"); - */ - return -1; - } - - /* handle accept on listening socket? */ - - for (n = 0; n < context->fds_count; n++) - if (context->fds[n].revents) - if (libwebsocket_service_fd(context, - &context->fds[n]) < 0) - return -1; - return 0; -} - -int -lws_any_extension_handled(struct libwebsocket_context *context, - struct libwebsocket *wsi, - enum libwebsocket_extension_callback_reasons r, - void *v, size_t len) -{ - int n; - int handled = 0; - - /* maybe an extension will take care of it for us */ - - for (n = 0; n < wsi->count_active_extensions && !handled; n++) { - if (!wsi->active_extensions[n]->callback) - continue; - - handled |= wsi->active_extensions[n]->callback(context, - wsi->active_extensions[n], wsi, - r, wsi->active_extensions_user[n], v, len); - } - - return handled; -} - - -void * -lws_get_extension_user_matching_ext(struct libwebsocket *wsi, - struct libwebsocket_extension *ext) -{ - int n = 0; - - if (wsi == NULL) - return NULL; - - while (n < wsi->count_active_extensions) { - if (wsi->active_extensions[n] != ext) { - n++; - continue; - } - return wsi->active_extensions_user[n]; - } - - return NULL; -} - -/** - * libwebsocket_callback_on_writable() - Request a callback when this socket - * becomes able to be written to without - * blocking - * - * @context: libwebsockets context - * @wsi: Websocket connection instance to get callback for - */ - -int -libwebsocket_callback_on_writable(struct libwebsocket_context *context, - struct libwebsocket *wsi) -{ - int n; - int handled = 0; - - /* maybe an extension will take care of it for us */ - - for (n = 0; n < wsi->count_active_extensions; n++) { - if (!wsi->active_extensions[n]->callback) - continue; - - handled |= wsi->active_extensions[n]->callback(context, - wsi->active_extensions[n], wsi, - LWS_EXT_CALLBACK_REQUEST_ON_WRITEABLE, - wsi->active_extensions_user[n], NULL, 0); - } - - if (handled) - return 1; - - for (n = 0; n < context->fds_count; n++) - if (context->fds[n].fd == wsi->sock) { - context->fds[n].events |= POLLOUT; - n = context->fds_count + 1; - } - - if (n == context->fds_count) - fprintf(stderr, "libwebsocket_callback_on_writable: " - "failed to find socket %d\n", wsi->sock); - - /* external POLL support via protocol 0 */ - context->protocols[0].callback(context, wsi, - LWS_CALLBACK_SET_MODE_POLL_FD, - (void *)(long)wsi->sock, NULL, POLLOUT); - - return 1; -} - -/** - * libwebsocket_callback_on_writable_all_protocol() - Request a callback for - * all connections using the given protocol when it - * becomes possible to write to each socket without - * blocking in turn. - * - * @protocol: Protocol whose connections will get callbacks - */ - -int -libwebsocket_callback_on_writable_all_protocol( - const struct libwebsocket_protocols *protocol) -{ - struct libwebsocket_context *context = protocol->owning_server; - int n; - int m; - struct libwebsocket *wsi; - - for (n = 0; n < FD_HASHTABLE_MODULUS; n++) { - - for (m = 0; m < context->fd_hashtable[n].length; m++) { - - wsi = context->fd_hashtable[n].wsi[m]; - - if (wsi->protocol == protocol) - libwebsocket_callback_on_writable(context, wsi); - } - } - - return 0; -} - -/** - * libwebsocket_set_timeout() - marks the wsi as subject to a timeout - * - * You will not need this unless you are doing something special - * - * @wsi: Websocket connection instance - * @reason: timeout reason - * @secs: how many seconds - */ - -void -libwebsocket_set_timeout(struct libwebsocket *wsi, - enum pending_timeout reason, int secs) -{ - struct timeval tv; - - gettimeofday(&tv, NULL); - - wsi->pending_timeout_limit = tv.tv_sec + secs; - wsi->pending_timeout = reason; -} - - -/** - * libwebsocket_get_socket_fd() - returns the socket file descriptor - * - * You will not need this unless you are doing something special - * - * @wsi: Websocket connection instance - */ - -int -libwebsocket_get_socket_fd(struct libwebsocket *wsi) -{ - return wsi->sock; -} - -/** - * libwebsocket_rx_flow_control() - Enable and disable socket servicing for - * receieved packets. - * - * If the output side of a server process becomes choked, this allows flow - * control for the input side. - * - * @wsi: Websocket connection instance to get callback for - * @enable: 0 = disable read servicing for this connection, 1 = enable - */ - -int -libwebsocket_rx_flow_control(struct libwebsocket *wsi, int enable) -{ - struct libwebsocket_context *context = wsi->protocol->owning_server; - int n; - - for (n = 0; n < context->fds_count; n++) - if (context->fds[n].fd == wsi->sock) { - if (enable) - context->fds[n].events |= POLLIN; - else - context->fds[n].events &= ~POLLIN; - - return 0; - } - - if (enable) - /* external POLL support via protocol 0 */ - context->protocols[0].callback(context, wsi, - LWS_CALLBACK_SET_MODE_POLL_FD, - (void *)(long)wsi->sock, NULL, POLLIN); - else - /* external POLL support via protocol 0 */ - context->protocols[0].callback(context, wsi, - LWS_CALLBACK_CLEAR_MODE_POLL_FD, - (void *)(long)wsi->sock, NULL, POLLIN); - -#if 0 - fprintf(stderr, "libwebsocket_rx_flow_control " - "unable to find socket\n"); -#endif - return 1; -} - -/** - * libwebsocket_canonical_hostname() - returns this host's hostname - * - * This is typically used by client code to fill in the host parameter - * when making a client connection. You can only call it after the context - * has been created. - * - * @context: Websocket context - */ - - -extern const char * -libwebsocket_canonical_hostname(struct libwebsocket_context *context) -{ - return (const char *)context->canonical_hostname; -} - - -static void sigpipe_handler(int x) -{ -} - -#ifdef LWS_OPENSSL_SUPPORT -static int -OpenSSL_verify_callback(int preverify_ok, X509_STORE_CTX *x509_ctx) -{ - - SSL *ssl; - int n; - struct libwebsocket_context *context; - - ssl = X509_STORE_CTX_get_ex_data(x509_ctx, - SSL_get_ex_data_X509_STORE_CTX_idx()); - - /* - * !!! nasty openssl requires the index to come as a library-scope - * static - */ - context = SSL_get_ex_data(ssl, openssl_websocket_private_data_index); - - n = context->protocols[0].callback(NULL, NULL, - LWS_CALLBACK_OPENSSL_PERFORM_CLIENT_CERT_VERIFICATION, - x509_ctx, ssl, preverify_ok); - - /* convert return code from 0 = OK to 1 = OK */ - - if (!n) - n = 1; - else - n = 0; - - return n; -} -#endif - - -/** - * libwebsocket_create_context() - Create the websocket handler - * @port: Port to listen on... you can use 0 to suppress listening on - * any port, that's what you want if you are not running a - * websocket server at all but just using it as a client - * @interf: NULL to bind the listen socket to all interfaces, or the - * interface name, eg, "eth2" - * @protocols: Array of structures listing supported protocols and a protocol- - * specific callback for each one. The list is ended with an - * entry that has a NULL callback pointer. - * It's not const because we write the owning_server member - * @extensions: NULL or array of libwebsocket_extension structs listing the - * extensions this context supports - * @ssl_cert_filepath: If libwebsockets was compiled to use ssl, and you want - * to listen using SSL, set to the filepath to fetch the - * server cert from, otherwise NULL for unencrypted - * @ssl_private_key_filepath: filepath to private key if wanting SSL mode, - * else ignored - * @gid: group id to change to after setting listen socket, or -1. - * @uid: user id to change to after setting listen socket, or -1. - * @options: 0, or LWS_SERVER_OPTION_DEFEAT_CLIENT_MASK - * - * This function creates the listening socket and takes care - * of all initialization in one step. - * - * After initialization, it returns a struct libwebsocket_context * that - * represents this server. After calling, user code needs to take care - * of calling libwebsocket_service() with the context pointer to get the - * server's sockets serviced. This can be done in the same process context - * or a forked process, or another thread, - * - * The protocol callback functions are called for a handful of events - * including http requests coming in, websocket connections becoming - * established, and data arriving; it's also called periodically to allow - * async transmission. - * - * HTTP requests are sent always to the FIRST protocol in @protocol, since - * at that time websocket protocol has not been negotiated. Other - * protocols after the first one never see any HTTP callack activity. - * - * The server created is a simple http server by default; part of the - * websocket standard is upgrading this http connection to a websocket one. - * - * This allows the same server to provide files like scripts and favicon / - * images or whatever over http and dynamic data over websockets all in - * one place; they're all handled in the user callback. - */ - -struct libwebsocket_context * -libwebsocket_create_context(int port, const char *interf, - struct libwebsocket_protocols *protocols, - struct libwebsocket_extension *extensions, - const char *ssl_cert_filepath, - const char *ssl_private_key_filepath, - int gid, int uid, unsigned int options) -{ - int n; - int m; - int sockfd = 0; - int fd; - struct sockaddr_in serv_addr, cli_addr; - int opt = 1; - struct libwebsocket_context *context = NULL; - unsigned int slen; - char *p; - char hostname[1024] = ""; -// struct hostent *he; - struct libwebsocket *wsi; - struct sockaddr sa; - -#ifdef LWS_OPENSSL_SUPPORT - SSL_METHOD *method; - char ssl_err_buf[512]; -#endif - -#ifdef _WIN32 - { - WORD wVersionRequested; - WSADATA wsaData; - int err; - HMODULE wsdll; - - /* Use the MAKEWORD(lowbyte, highbyte) macro from Windef.h */ - wVersionRequested = MAKEWORD(2, 2); - - err = WSAStartup(wVersionRequested, &wsaData); - if (err != 0) { - /* Tell the user that we could not find a usable */ - /* Winsock DLL. */ - fprintf(stderr, "WSAStartup failed with error: %d\n", - err); - return NULL; - } - - /* default to a poll() made out of select() */ - poll = emulated_poll; - - /* if windows socket lib available, use his WSAPoll */ - wsdll = GetModuleHandle("Ws2_32.dll"); - if (wsdll) - poll = (PFNWSAPOLL)GetProcAddress(wsdll, "WSAPoll"); - } -#endif - - - context = malloc(sizeof(struct libwebsocket_context)); - if (!context) { - fprintf(stderr, "No memory for websocket context\n"); - return NULL; - } - context->protocols = protocols; - context->listen_port = port; - context->http_proxy_port = 0; - context->http_proxy_address[0] = '\0'; - context->options = options; - context->fds_count = 0; - context->extensions = extensions; - context->last_timeout_check_s = 0; - -#ifdef WIN32 - context->fd_random = 0; -#else - context->fd_random = open(SYSTEM_RANDOM_FILEPATH, O_RDONLY); - if (context->fd_random < 0) { - fprintf(stderr, "Unable to open random device %s %d\n", - SYSTEM_RANDOM_FILEPATH, context->fd_random); - return NULL; - } -#endif - -#ifdef LWS_OPENSSL_SUPPORT - context->use_ssl = 0; - context->ssl_ctx = NULL; - context->ssl_client_ctx = NULL; - openssl_websocket_private_data_index = 0; -#endif - /* find canonical hostname */ - - hostname[(sizeof hostname) - 1] = '\0'; - memset(&sa, 0, sizeof(sa)); - sa.sa_family = AF_INET; - sa.sa_data[(sizeof sa.sa_data) - 1] = '\0'; - gethostname(hostname, (sizeof hostname) - 1); - - n = 0; - - if (strlen(hostname) < sizeof(sa.sa_data) - 1) { - strcpy(sa.sa_data, hostname); -// fprintf(stderr, "my host name is %s\n", sa.sa_data); - n = getnameinfo(&sa, sizeof(sa), hostname, - (sizeof hostname) - 1, NULL, 0, 0); - } - - if (!n) { - strncpy(context->canonical_hostname, hostname, - sizeof context->canonical_hostname - 1); - context->canonical_hostname[ - sizeof context->canonical_hostname - 1] = '\0'; - } else - strncpy(context->canonical_hostname, hostname, - sizeof context->canonical_hostname - 1); - -// fprintf(stderr, "context->canonical_hostname = %s\n", -// context->canonical_hostname); - - /* split the proxy ads:port if given */ - - p = getenv("http_proxy"); - if (p) { - strncpy(context->http_proxy_address, p, - sizeof context->http_proxy_address - 1); - context->http_proxy_address[ - sizeof context->http_proxy_address - 1] = '\0'; - - p = strchr(context->http_proxy_address, ':'); - if (p == NULL) { - fprintf(stderr, "http_proxy needs to be ads:port\n"); - return NULL; - } - *p = '\0'; - context->http_proxy_port = atoi(p + 1); - - fprintf(stderr, "Using proxy %s:%u\n", - context->http_proxy_address, - context->http_proxy_port); - } - - if (port) { - -#ifdef LWS_OPENSSL_SUPPORT - context->use_ssl = ssl_cert_filepath != NULL && - ssl_private_key_filepath != NULL; - if (context->use_ssl) - fprintf(stderr, " Compiled with SSL support, " - "using it\n"); - else - fprintf(stderr, " Compiled with SSL support, " - "not using it\n"); - -#else - if (ssl_cert_filepath != NULL && - ssl_private_key_filepath != NULL) { - fprintf(stderr, " Not compiled for OpenSSl support!\n"); - return NULL; - } - fprintf(stderr, " Compiled without SSL support, " - "serving unencrypted\n"); -#endif - } - - /* ignore SIGPIPE */ -#ifdef WIN32 -#else - signal(SIGPIPE, sigpipe_handler); -#endif - - -#ifdef LWS_OPENSSL_SUPPORT - - /* basic openssl init */ - - SSL_library_init(); - - OpenSSL_add_all_algorithms(); - SSL_load_error_strings(); - - openssl_websocket_private_data_index = - SSL_get_ex_new_index(0, "libwebsockets", NULL, NULL, NULL); - - /* - * Firefox insists on SSLv23 not SSLv3 - * Konq disables SSLv2 by default now, SSLv23 works - */ - - method = (SSL_METHOD *)SSLv23_server_method(); - if (!method) { - fprintf(stderr, "problem creating ssl method: %s\n", - ERR_error_string(ERR_get_error(), ssl_err_buf)); - return NULL; - } - context->ssl_ctx = SSL_CTX_new(method); /* create context */ - if (!context->ssl_ctx) { - fprintf(stderr, "problem creating ssl context: %s\n", - ERR_error_string(ERR_get_error(), ssl_err_buf)); - return NULL; - } - - /* client context */ - - if (port == CONTEXT_PORT_NO_LISTEN) { - method = (SSL_METHOD *)SSLv23_client_method(); - if (!method) { - fprintf(stderr, "problem creating ssl method: %s\n", - ERR_error_string(ERR_get_error(), ssl_err_buf)); - return NULL; - } - /* create context */ - context->ssl_client_ctx = SSL_CTX_new(method); - if (!context->ssl_client_ctx) { - fprintf(stderr, "problem creating ssl context: %s\n", - ERR_error_string(ERR_get_error(), ssl_err_buf)); - return NULL; - } - - /* openssl init for cert verification (for client sockets) */ - - if (!SSL_CTX_load_verify_locations( - context->ssl_client_ctx, NULL, - LWS_OPENSSL_CLIENT_CERTS)) - fprintf(stderr, - "Unable to load SSL Client certs from %s " - "(set by --with-client-cert-dir= in configure) -- " - " client ssl isn't going to work", - LWS_OPENSSL_CLIENT_CERTS); - - /* - * callback allowing user code to load extra verification certs - * helping the client to verify server identity - */ - - context->protocols[0].callback(context, NULL, - LWS_CALLBACK_OPENSSL_LOAD_EXTRA_CLIENT_VERIFY_CERTS, - context->ssl_client_ctx, NULL, 0); - } - - /* as a server, are we requiring clients to identify themselves? */ - - if (options & LWS_SERVER_OPTION_REQUIRE_VALID_OPENSSL_CLIENT_CERT) { - - /* absolutely require the client cert */ - - SSL_CTX_set_verify(context->ssl_ctx, - SSL_VERIFY_PEER | SSL_VERIFY_FAIL_IF_NO_PEER_CERT, - OpenSSL_verify_callback); - - /* - * give user code a chance to load certs into the server - * allowing it to verify incoming client certs - */ - - context->protocols[0].callback(context, NULL, - LWS_CALLBACK_OPENSSL_LOAD_EXTRA_SERVER_VERIFY_CERTS, - context->ssl_ctx, NULL, 0); - } - - if (context->use_ssl) { - - /* openssl init for server sockets */ - - /* set the local certificate from CertFile */ - n = SSL_CTX_use_certificate_file(context->ssl_ctx, - ssl_cert_filepath, SSL_FILETYPE_PEM); - if (n != 1) { - fprintf(stderr, "problem getting cert '%s': %s\n", - ssl_cert_filepath, - ERR_error_string(ERR_get_error(), ssl_err_buf)); - return NULL; - } - /* set the private key from KeyFile */ - if (SSL_CTX_use_PrivateKey_file(context->ssl_ctx, - ssl_private_key_filepath, SSL_FILETYPE_PEM) != 1) { - fprintf(stderr, "ssl problem getting key '%s': %s\n", - ssl_private_key_filepath, - ERR_error_string(ERR_get_error(), ssl_err_buf)); - return NULL; - } - /* verify private key */ - if (!SSL_CTX_check_private_key(context->ssl_ctx)) { - fprintf(stderr, "Private SSL key doesn't match cert\n"); - return NULL; - } - - /* SSL is happy and has a cert it's content with */ - } -#endif - - /* selftest */ - - if (lws_b64_selftest()) - return NULL; - - /* fd hashtable init */ - - for (n = 0; n < FD_HASHTABLE_MODULUS; n++) - context->fd_hashtable[n].length = 0; - - /* set up our external listening socket we serve on */ - - if (port) { - - sockfd = socket(AF_INET, SOCK_STREAM, 0); - if (sockfd < 0) { - fprintf(stderr, "ERROR opening socket"); - return NULL; - } - - /* allow us to restart even if old sockets in TIME_WAIT */ - setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, - (const void *)&opt, sizeof(opt)); - - /* Disable Nagle */ - opt = 1; - setsockopt(sockfd, IPPROTO_TCP, TCP_NODELAY, - (const void *)&opt, sizeof(opt)); - - bzero((char *) &serv_addr, sizeof(serv_addr)); - serv_addr.sin_family = AF_INET; - if (interf == NULL) - serv_addr.sin_addr.s_addr = INADDR_ANY; - else - interface_to_sa(interf, &serv_addr, - sizeof(serv_addr)); - serv_addr.sin_port = htons(port); - - n = bind(sockfd, (struct sockaddr *) &serv_addr, - sizeof(serv_addr)); - if (n < 0) { - fprintf(stderr, "ERROR on binding to port %d (%d %d)\n", - port, n, errno); - return NULL; - } - - wsi = malloc(sizeof(struct libwebsocket)); - memset(wsi, 0, sizeof(struct libwebsocket)); - wsi->sock = sockfd; - wsi->count_active_extensions = 0; - wsi->mode = LWS_CONNMODE_SERVER_LISTENER; - insert_wsi(context, wsi); - - listen(sockfd, 5); - fprintf(stderr, " Listening on port %d\n", port); - - /* list in the internal poll array */ - - context->fds[context->fds_count].fd = sockfd; - context->fds[context->fds_count++].events = POLLIN; - - /* external POLL support via protocol 0 */ - context->protocols[0].callback(context, wsi, - LWS_CALLBACK_ADD_POLL_FD, - (void *)(long)sockfd, NULL, POLLIN); - - } - - /* - * drop any root privs for this process - * to listen on port < 1023 we would have needed root, but now we are - * listening, we don't want the power for anything else - */ -#ifdef WIN32 -#else - if (gid != -1) - if (setgid(gid)) - fprintf(stderr, "setgid: %s\n", strerror(errno)); - if (uid != -1) - if (setuid(uid)) - fprintf(stderr, "setuid: %s\n", strerror(errno)); -#endif - - /* set up our internal broadcast trigger sockets per-protocol */ - - for (context->count_protocols = 0; - protocols[context->count_protocols].callback; - context->count_protocols++) { - - debug(" Protocol: %s\n", protocols[context->count_protocols].name); - - protocols[context->count_protocols].owning_server = context; - protocols[context->count_protocols].protocol_index = - context->count_protocols; - - fd = socket(AF_INET, SOCK_STREAM, 0); - if (fd < 0) { - fprintf(stderr, "ERROR opening socket"); - return NULL; - } - - /* allow us to restart even if old sockets in TIME_WAIT */ - setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (const void *)&opt, - sizeof(opt)); - - bzero((char *) &serv_addr, sizeof(serv_addr)); - serv_addr.sin_family = AF_INET; - serv_addr.sin_addr.s_addr = inet_addr("127.0.0.1"); - serv_addr.sin_port = 0; /* pick the port for us */ - - n = bind(fd, (struct sockaddr *) &serv_addr, sizeof(serv_addr)); - if (n < 0) { - fprintf(stderr, "ERROR on binding to port %d (%d %d)\n", - port, n, errno); - return NULL; - } - - slen = sizeof cli_addr; - n = getsockname(fd, (struct sockaddr *)&cli_addr, &slen); - if (n < 0) { - fprintf(stderr, "getsockname failed\n"); - return NULL; - } - protocols[context->count_protocols].broadcast_socket_port = - ntohs(cli_addr.sin_port); - listen(fd, 5); - - debug(" Protocol %s broadcast socket %d\n", - protocols[context->count_protocols].name, - ntohs(cli_addr.sin_port)); - - /* dummy wsi per broadcast proxy socket */ - - wsi = malloc(sizeof(struct libwebsocket)); - memset(wsi, 0, sizeof(struct libwebsocket)); - wsi->sock = fd; - wsi->mode = LWS_CONNMODE_BROADCAST_PROXY_LISTENER; - wsi->count_active_extensions = 0; - /* note which protocol we are proxying */ - wsi->protocol_index_for_broadcast_proxy = - context->count_protocols; - insert_wsi(context, wsi); - - /* list in internal poll array */ - - context->fds[context->fds_count].fd = fd; - context->fds[context->fds_count].events = POLLIN; - context->fds[context->fds_count].revents = 0; - context->fds_count++; - - /* external POLL support via protocol 0 */ - context->protocols[0].callback(context, wsi, - LWS_CALLBACK_ADD_POLL_FD, - (void *)(long)fd, NULL, POLLIN); - } - - /* - * give all extensions a chance to create any per-context - * allocations they need - */ - - m = LWS_EXT_CALLBACK_CLIENT_CONTEXT_CONSTRUCT; - if (port) - m = LWS_EXT_CALLBACK_SERVER_CONTEXT_CONSTRUCT; - - if (extensions) { - while (extensions->callback) { - debug(" Extension: %s\n", extensions->name); - extensions->callback(context, extensions, - NULL, m, NULL, NULL, 0); - extensions++; - } - } - - return context; -} - - -#ifndef LWS_NO_FORK - -/** - * libwebsockets_fork_service_loop() - Optional helper function forks off - * a process for the websocket server loop. - * You don't have to use this but if not, you - * have to make sure you are calling - * libwebsocket_service periodically to service - * the websocket traffic - * @context: server context returned by creation function - */ - -int -libwebsockets_fork_service_loop(struct libwebsocket_context *context) -{ - int fd; - struct sockaddr_in cli_addr; - int n; - int p; - - n = fork(); - if (n < 0) - return n; - - if (!n) { - - /* main process context */ - - /* - * set up the proxy sockets to allow broadcast from - * service process context - */ - - for (p = 0; p < context->count_protocols; p++) { - fd = socket(AF_INET, SOCK_STREAM, 0); - if (fd < 0) { - fprintf(stderr, "Unable to create socket\n"); - return -1; - } - cli_addr.sin_family = AF_INET; - cli_addr.sin_port = htons( - context->protocols[p].broadcast_socket_port); - cli_addr.sin_addr.s_addr = inet_addr("127.0.0.1"); - n = connect(fd, (struct sockaddr *)&cli_addr, - sizeof cli_addr); - if (n < 0) { - fprintf(stderr, "Unable to connect to " - "broadcast socket %d, %s\n", - n, strerror(errno)); - return -1; - } - - context->protocols[p].broadcast_socket_user_fd = fd; - } - - return 0; - } - -#ifdef HAVE_SYS_PRCTL_H - /* we want a SIGHUP when our parent goes down */ - prctl(PR_SET_PDEATHSIG, SIGHUP); -#endif - - /* in this forked process, sit and service websocket connections */ - - while (1) { - if (libwebsocket_service(context, 1000)) - break; -#ifndef HAVE_SYS_PRCTL_H -/* - * on systems without prctl() (i.e. anything but linux) we can notice that our - * parent is dead if getppid() returns 1. FIXME apparently this is not true for - * solaris, could remember ppid right after fork and wait for it to change. - */ - - if (getppid() == 1) - break; -#endif - } - - - return 1; -} - -#endif - -/** - * libwebsockets_get_protocol() - Returns a protocol pointer from a websocket - * connection. - * @wsi: pointer to struct websocket you want to know the protocol of - * - * - * This is useful to get the protocol to broadcast back to from inside - * the callback. - */ - -const struct libwebsocket_protocols * -libwebsockets_get_protocol(struct libwebsocket *wsi) -{ - return wsi->protocol; -} - -/** - * libwebsockets_broadcast() - Sends a buffer to the callback for all active - * connections of the given protocol. - * @protocol: pointer to the protocol you will broadcast to all members of - * @buf: buffer containing the data to be broadcase. NOTE: this has to be - * allocated with LWS_SEND_BUFFER_PRE_PADDING valid bytes before - * the pointer and LWS_SEND_BUFFER_POST_PADDING afterwards in the - * case you are calling this function from callback context. - * @len: length of payload data in buf, starting from buf. - * - * This function allows bulk sending of a packet to every connection using - * the given protocol. It does not send the data directly; instead it calls - * the callback with a reason type of LWS_CALLBACK_BROADCAST. If the callback - * wants to actually send the data for that connection, the callback itself - * should call libwebsocket_write(). - * - * libwebsockets_broadcast() can be called from another fork context without - * having to take any care about data visibility between the processes, it'll - * "just work". - */ - - -int -libwebsockets_broadcast(const struct libwebsocket_protocols *protocol, - unsigned char *buf, size_t len) -{ - struct libwebsocket_context *context = protocol->owning_server; - int n; - int m; - struct libwebsocket *wsi; - - if (!protocol->broadcast_socket_user_fd) { - /* - * We are either running unforked / flat, or we are being - * called from poll thread context - * eg, from a callback. In that case don't use sockets for - * broadcast IPC (since we can't open a socket connection to - * a socket listening on our own thread) but directly do the - * send action. - * - * Locking is not needed because we are by definition being - * called in the poll thread context and are serialized. - */ - - for (n = 0; n < FD_HASHTABLE_MODULUS; n++) { - - for (m = 0; m < context->fd_hashtable[n].length; m++) { - - wsi = context->fd_hashtable[n].wsi[m]; - - if (wsi->mode != LWS_CONNMODE_WS_SERVING) - continue; - - /* - * never broadcast to - * non-established connections - */ - if (wsi->state != WSI_STATE_ESTABLISHED) - continue; - - /* only broadcast to guys using - * requested protocol - */ - if (wsi->protocol != protocol) - continue; - - wsi->protocol->callback(context, wsi, - LWS_CALLBACK_BROADCAST, - wsi->user_space, - buf, len); - } - } - - return 0; - } - - /* - * We're being called from a different process context than the server - * loop. Instead of broadcasting directly, we send our - * payload on a socket to do the IPC; the server process will serialize - * the broadcast action in its main poll() loop. - * - * There's one broadcast socket listening for each protocol supported - * set up when the websocket server initializes - */ - - n = send(protocol->broadcast_socket_user_fd, buf, len, MSG_NOSIGNAL); - - return n; -} - -int -libwebsocket_is_final_fragment(struct libwebsocket *wsi) -{ - return wsi->final; -} - -void * -libwebsocket_ensure_user_space(struct libwebsocket *wsi) -{ - /* allocate the per-connection user memory (if any) */ - - if (wsi->protocol->per_session_data_size && !wsi->user_space) { - wsi->user_space = malloc( - wsi->protocol->per_session_data_size); - if (wsi->user_space == NULL) { - fprintf(stderr, "Out of memory for " - "conn user space\n"); - return NULL; - } - memset(wsi->user_space, 0, - wsi->protocol->per_session_data_size); - } - return wsi->user_space; -} diff --git a/libs/libwebsockets/lib/libwebsockets.h b/libs/libwebsockets/lib/libwebsockets.h deleted file mode 100644 index 60e7468cdc..0000000000 --- a/libs/libwebsockets/lib/libwebsockets.h +++ /dev/null @@ -1,731 +0,0 @@ -/* - * libwebsockets - small server side websockets and web server implementation - * - * Copyright (C) 2010 Andy Green - * - * This 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: - * version 2.1 of the License. - * - * This 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 this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301 USA - */ - -#ifndef __LIBWEBSOCKET_H__ -#define __LIBWEBSOCKET_H__ - -#ifdef __cplusplus -extern "C" { -#include -#endif - -#ifdef WIN32 - -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN -#endif -#include -#include -#include -#include "../win32port/win32helpers/websock-w32.h" - -#include "../win32port/win32helpers/gettimeofday.h" - -#define strcasecmp stricmp - -typedef int ssize_t; - -#ifdef LWS_DLL -#ifdef LWS_INTERNAL -#define LWS_EXTERN extern __declspec(dllexport) -#else -#define LWS_EXTERN extern __declspec(dllimport) -#endif -#endif - -#else -#include -#endif - -#ifndef LWS_EXTERN -#define LWS_EXTERN extern -#endif - -#define CONTEXT_PORT_NO_LISTEN 0 -#define MAX_MUX_RECURSION 2 - -enum libwebsocket_context_options { - LWS_SERVER_OPTION_DEFEAT_CLIENT_MASK = 1, - LWS_SERVER_OPTION_REQUIRE_VALID_OPENSSL_CLIENT_CERT = 2, -}; - -enum libwebsocket_callback_reasons { - LWS_CALLBACK_ESTABLISHED, - LWS_CALLBACK_CLIENT_CONNECTION_ERROR, - LWS_CALLBACK_CLIENT_ESTABLISHED, - LWS_CALLBACK_CLOSED, - LWS_CALLBACK_RECEIVE, - LWS_CALLBACK_CLIENT_RECEIVE, - LWS_CALLBACK_CLIENT_RECEIVE_PONG, - LWS_CALLBACK_CLIENT_WRITEABLE, - LWS_CALLBACK_SERVER_WRITEABLE, - LWS_CALLBACK_HTTP, - LWS_CALLBACK_BROADCAST, - LWS_CALLBACK_FILTER_NETWORK_CONNECTION, - LWS_CALLBACK_FILTER_PROTOCOL_CONNECTION, - LWS_CALLBACK_OPENSSL_LOAD_EXTRA_CLIENT_VERIFY_CERTS, - LWS_CALLBACK_OPENSSL_LOAD_EXTRA_SERVER_VERIFY_CERTS, - LWS_CALLBACK_OPENSSL_PERFORM_CLIENT_CERT_VERIFICATION, - LWS_CALLBACK_CLIENT_APPEND_HANDSHAKE_HEADER, - LWS_CALLBACK_CONFIRM_EXTENSION_OKAY, - LWS_CALLBACK_CLIENT_CONFIRM_EXTENSION_SUPPORTED, - /* external poll() management support */ - LWS_CALLBACK_ADD_POLL_FD, - LWS_CALLBACK_DEL_POLL_FD, - LWS_CALLBACK_SET_MODE_POLL_FD, - LWS_CALLBACK_CLEAR_MODE_POLL_FD, -}; - -enum libwebsocket_extension_callback_reasons { - LWS_EXT_CALLBACK_SERVER_CONTEXT_CONSTRUCT, - LWS_EXT_CALLBACK_CLIENT_CONTEXT_CONSTRUCT, - LWS_EXT_CALLBACK_SERVER_CONTEXT_DESTRUCT, - LWS_EXT_CALLBACK_CLIENT_CONTEXT_DESTRUCT, - LWS_EXT_CALLBACK_CONSTRUCT, - LWS_EXT_CALLBACK_CLIENT_CONSTRUCT, - LWS_EXT_CALLBACK_CHECK_OK_TO_REALLY_CLOSE, - LWS_EXT_CALLBACK_CHECK_OK_TO_PROPOSE_EXTENSION, - LWS_EXT_CALLBACK_DESTROY, - LWS_EXT_CALLBACK_DESTROY_ANY_WSI_CLOSING, - LWS_EXT_CALLBACK_ANY_WSI_ESTABLISHED, - LWS_EXT_CALLBACK_PACKET_RX_PREPARSE, - LWS_EXT_CALLBACK_PACKET_TX_PRESEND, - LWS_EXT_CALLBACK_PACKET_TX_DO_SEND, - LWS_EXT_CALLBACK_HANDSHAKE_REPLY_TX, - LWS_EXT_CALLBACK_FLUSH_PENDING_TX, - LWS_EXT_CALLBACK_EXTENDED_PAYLOAD_RX, - LWS_EXT_CALLBACK_CAN_PROXY_CLIENT_CONNECTION, - LWS_EXT_CALLBACK_1HZ, - LWS_EXT_CALLBACK_REQUEST_ON_WRITEABLE, - LWS_EXT_CALLBACK_IS_WRITEABLE, -}; - -enum libwebsocket_write_protocol { - LWS_WRITE_TEXT, - LWS_WRITE_BINARY, - LWS_WRITE_CONTINUATION, - LWS_WRITE_HTTP, - - /* special 04+ opcodes */ - - LWS_WRITE_CLOSE, - LWS_WRITE_PING, - LWS_WRITE_PONG, - - /* flags */ - - LWS_WRITE_NO_FIN = 0x40, - /* - * client packet payload goes out on wire unmunged - * only useful for security tests since normal servers cannot - * decode the content if used - */ - LWS_WRITE_CLIENT_IGNORE_XOR_MASK = 0x80 -}; - -/* - * you need these to look at headers that have been parsed if using the - * LWS_CALLBACK_FILTER_CONNECTION callback. If a header from the enum - * list below is absent, .token = NULL and token_len = 0. Otherwise .token - * points to .token_len chars containing that header content. - */ - -struct lws_tokens { - char *token; - int token_len; -}; - -enum lws_token_indexes { - WSI_TOKEN_GET_URI, - WSI_TOKEN_HOST, - WSI_TOKEN_CONNECTION, - WSI_TOKEN_KEY1, - WSI_TOKEN_KEY2, - WSI_TOKEN_PROTOCOL, - WSI_TOKEN_UPGRADE, - WSI_TOKEN_ORIGIN, - WSI_TOKEN_DRAFT, - WSI_TOKEN_CHALLENGE, - - /* new for 04 */ - WSI_TOKEN_KEY, - WSI_TOKEN_VERSION, - WSI_TOKEN_SWORIGIN, - - /* new for 05 */ - WSI_TOKEN_EXTENSIONS, - - /* client receives these */ - WSI_TOKEN_ACCEPT, - WSI_TOKEN_NONCE, - WSI_TOKEN_HTTP, - WSI_TOKEN_MUXURL, - - /* always last real token index*/ - WSI_TOKEN_COUNT, - /* parser state additions */ - WSI_TOKEN_NAME_PART, - WSI_TOKEN_SKIPPING, - WSI_TOKEN_SKIPPING_SAW_CR, - WSI_PARSING_COMPLETE, - WSI_INIT_TOKEN_MUXURL, -}; - -/* - * From 06 spec - 1000 - - 1000 indicates a normal closure, meaning whatever purpose the - connection was established for has been fulfilled. - - 1001 - - 1001 indicates that an endpoint is "going away", such as a server - going down, or a browser having navigated away from a page. - - 1002 - - 1002 indicates that an endpoint is terminating the connection due - to a protocol error. - - 1003 - - 1003 indicates that an endpoint is terminating the connection - because it has received a type of data it cannot accept (e.g. an - endpoint that understands only text data may send this if it - receives a binary message.) - - 1004 - - 1004 indicates that an endpoint is terminating the connection - because it has received a message that is too large. -*/ - -enum lws_close_status { - LWS_CLOSE_STATUS_NOSTATUS = 0, - LWS_CLOSE_STATUS_NORMAL = 1000, - LWS_CLOSE_STATUS_GOINGAWAY = 1001, - LWS_CLOSE_STATUS_PROTOCOL_ERR = 1002, - LWS_CLOSE_STATUS_UNACCEPTABLE_OPCODE = 1003, - LWS_CLOSE_STATUS_PAYLOAD_TOO_LARGE = 1004, -}; - -struct libwebsocket; -struct libwebsocket_context; -struct libwebsocket_extension; - -/** - * callback_function() - User server actions - * @context: Websockets context - * @wsi: Opaque websocket instance pointer - * @reason: The reason for the call - * @user: Pointer to per-session user data allocated by library - * @in: Pointer used for some callback reasons - * @len: Length set for some callback reasons - * - * This callback is the way the user controls what is served. All the - * protocol detail is hidden and handled by the library. - * - * For each connection / session there is user data allocated that is - * pointed to by "user". You set the size of this user data area when - * the library is initialized with libwebsocket_create_server. - * - * You get an opportunity to initialize user data when called back with - * LWS_CALLBACK_ESTABLISHED reason. - * - * LWS_CALLBACK_ESTABLISHED: after the server completes a handshake with - * an incoming client - * - * LWS_CALLBACK_CLIENT_CONNECTION_ERROR: the request client connection has - * been unable to complete a handshake with the remote server - * - * LWS_CALLBACK_CLIENT_ESTABLISHED: after your client connection completed - * a handshake with the remote server - * - * LWS_CALLBACK_CLOSED: when the websocket session ends - * - * LWS_CALLBACK_BROADCAST: signal to send to client (you would use - * libwebsocket_write() taking care about the - * special buffer requirements - * - * LWS_CALLBACK_RECEIVE: data has appeared for this server endpoint from a - * remote client, it can be found at *in and is - * len bytes long - * - * LWS_CALLBACK_CLIENT_RECEIVE_PONG: if you elected to see PONG packets, - * they appear with this callback reason. PONG - * packets only exist in 04+ protocol - * - * LWS_CALLBACK_CLIENT_RECEIVE: data has appeared from the server for the - * client connection, it can be found at *in and - * is len bytes long - * - * LWS_CALLBACK_HTTP: an http request has come from a client that is not - * asking to upgrade the connection to a websocket - * one. This is a chance to serve http content, - * for example, to send a script to the client - * which will then open the websockets connection. - * @in points to the URI path requested and - * libwebsockets_serve_http_file() makes it very - * simple to send back a file to the client. - * - * LWS_CALLBACK_CLIENT_WRITEABLE: - * LWS_CALLBACK_SERVER_WRITEABLE: If you call - * libwebsocket_callback_on_writable() on a connection, you will - * get one of these callbacks coming when the connection socket - * is able to accept another write packet without blocking. - * If it already was able to take another packet without blocking, - * you'll get this callback at the next call to the service loop - * function. Notice that CLIENTs get LWS_CALLBACK_CLIENT_WRITEABLE - * and servers get LWS_CALLBACK_SERVER_WRITEABLE. - * - * LWS_CALLBACK_FILTER_NETWORK_CONNECTION: called when a client connects to - * the server at network level; the connection is accepted but then - * passed to this callback to decide whether to hang up immediately - * or not, based on the client IP. @user contains the connection - * socket's descriptor. Return non-zero to terminate - * the connection before sending or receiving anything. - * Because this happens immediately after the network connection - * from the client, there's no websocket protocol selected yet so - * this callback is issued only to protocol 0. - * - * LWS_CALLBACK_FILTER_PROTOCOL_CONNECTION: called when the handshake has - * been received and parsed from the client, but the response is - * not sent yet. Return non-zero to disallow the connection. - * @user is a pointer to an array of struct lws_tokens, you can - * use the header enums lws_token_indexes from libwebsockets.h - * to check for and read the supported header presence and - * content before deciding to allow the handshake to proceed or - * to kill the connection. - * - * LWS_CALLBACK_OPENSSL_LOAD_EXTRA_CLIENT_VERIFY_CERTS: if configured for - * including OpenSSL support, this callback allows your user code - * to perform extra SSL_CTX_load_verify_locations() or similar - * calls to direct OpenSSL where to find certificates the client - * can use to confirm the remote server identity. @user is the - * OpenSSL SSL_CTX* - * - * LWS_CALLBACK_OPENSSL_LOAD_EXTRA_SERVER_VERIFY_CERTS: if configured for - * including OpenSSL support, this callback allows your user code - * to load extra certifcates into the server which allow it to - * verify the validity of certificates returned by clients. @user - * is the server's OpenSSL SSL_CTX* - * - * LWS_CALLBACK_OPENSSL_PERFORM_CLIENT_CERT_VERIFICATION: if the - * libwebsockets context was created with the option - * LWS_SERVER_OPTION_REQUIRE_VALID_OPENSSL_CLIENT_CERT, then this - * callback is generated during OpenSSL verification of the cert - * sent from the client. It is sent to protocol[0] callback as - * no protocol has been negotiated on the connection yet. - * Notice that the libwebsockets context and wsi are both NULL - * during this callback. See - * http://www.openssl.org/docs/ssl/SSL_CTX_set_verify.html - * to understand more detail about the OpenSSL callback that - * generates this libwebsockets callback and the meanings of the - * arguments passed. In this callback, @user is the x509_ctx, - * @in is the ssl pointer and @len is preverify_ok - * Notice that this callback maintains libwebsocket return - * conventions, return 0 to mean the cert is OK or 1 to fail it. - * This also means that if you don't handle this callback then - * the default callback action of returning 0 allows the client - * certificates. - * - * LWS_CALLBACK_CLIENT_APPEND_HANDSHAKE_HEADER: this callback happens - * when a client handshake is being compiled. @user is NULL, - * @in is a char **, it's pointing to a char * which holds the - * next location in the header buffer where you can add - * headers, and @len is the remaining space in the header buffer, - * which is typically some hundreds of bytes. So, to add a canned - * cookie, your handler code might look similar to: - * - * char **p = (char **)in; - * - * if (len < 100) - * return 1; - * - * *p += sprintf(*p, "Cookie: a=b\x0d\x0a"); - * - * return 0; - * - * Notice if you add anything, you just have to take care about - * the CRLF on the line you added. Obviously this callback is - * optional, if you don't handle it everything is fine. - * - * Notice the callback is coming to protocols[0] all the time, - * because there is no specific protocol handshook yet. - * - * LWS_CALLBACK_CONFIRM_EXTENSION_OKAY: When the server handshake code - * sees that it does support a requested extension, before - * accepting the extension by additing to the list sent back to - * the client it gives this callback just to check that it's okay - * to use that extension. It calls back to the requested protocol - * and with @in being the extension name, @len is 0 and @user is - * valid. Note though at this time the ESTABLISHED callback hasn't - * happened yet so if you initialize @user content there, @user - * content during this callback might not be useful for anything. - * Notice this callback comes to protocols[0]. - * - * LWS_CALLBACK_CLIENT_CONFIRM_EXTENSION_SUPPORTED: When a client - * connection is being prepared to start a handshake to a server, - * each supported extension is checked with protocols[0] callback - * with this reason, giving the user code a chance to suppress the - * claim to support that extension by returning non-zero. If - * unhandled, by default 0 will be returned and the extension - * support included in the header to the server. Notice this - * callback comes to protocols[0]. - * - * The next four reasons are optional and only need taking care of if you - * will be integrating libwebsockets sockets into an external polling - * array. - * - * LWS_CALLBACK_ADD_POLL_FD: libwebsocket deals with its poll() loop - * internally, but in the case you are integrating with another - * server you will need to have libwebsocket sockets share a - * polling array with the other server. This and the other - * POLL_FD related callbacks let you put your specialized - * poll array interface code in the callback for protocol 0, the - * first protocol you support, usually the HTTP protocol in the - * serving case. This callback happens when a socket needs to be - * added to the polling loop: @user contains the fd, and - * @len is the events bitmap (like, POLLIN). If you are using the - * internal polling loop (the "service" callback), you can just - * ignore these callbacks. - * - * LWS_CALLBACK_DEL_POLL_FD: This callback happens when a socket descriptor - * needs to be removed from an external polling array. @user is - * the socket desricptor. If you are using the internal polling - * loop, you can just ignore it. - * - * LWS_CALLBACK_SET_MODE_POLL_FD: This callback happens when libwebsockets - * wants to modify the events for the socket descriptor in @user. - * The handler should OR @len on to the events member of the pollfd - * struct for this socket descriptor. If you are using the - * internal polling loop, you can just ignore it. - * - * LWS_CALLBACK_CLEAR_MODE_POLL_FD: This callback occurs when libwebsockets - * wants to modify the events for the socket descriptor in @user. - * The handler should AND ~@len on to the events member of the - * pollfd struct for this socket descriptor. If you are using the - * internal polling loop, you can just ignore it. - */ -LWS_EXTERN int callback(struct libwebsocket_context * context, - struct libwebsocket *wsi, - enum libwebsocket_callback_reasons reason, void *user, - void *in, size_t len); - -typedef int (callback_function)(struct libwebsocket_context * context, - struct libwebsocket *wsi, - enum libwebsocket_callback_reasons reason, void *user, - void *in, size_t len); - - -/** - * extension_callback_function() - Hooks to allow extensions to operate - * @context: Websockets context - * @ext: This extension - * @wsi: Opaque websocket instance pointer - * @reason: The reason for the call - * @user: Pointer to per-session user data allocated by library - * @in: Pointer used for some callback reasons - * @len: Length set for some callback reasons - * - * Each extension that is active on a particular connection receives - * callbacks during the connection lifetime to allow the extension to - * operate on websocket data and manage itself. - * - * Libwebsockets takes care of allocating and freeing "user" memory for - * each active extension on each connection. That is what is pointed to - * by the @user parameter. - * - * LWS_EXT_CALLBACK_CONSTRUCT: called when the server has decided to - * select this extension from the list provided by the client, - * just before the server will send back the handshake accepting - * the connection with this extension active. This gives the - * extension a chance to initialize its connection context found - * in @user. - * - * LWS_EXT_CALLBACK_CLIENT_CONSTRUCT: same as LWS_EXT_CALLBACK_CONSTRUCT - * but called when client is instantiating this extension. Some - * extensions will work the same on client and server side and then - * you can just merge handlers for both CONSTRUCTS. - * - * LWS_EXT_CALLBACK_DESTROY: called when the connection the extension was - * being used on is about to be closed and deallocated. It's the - * last chance for the extension to deallocate anything it has - * allocated in the user data (pointed to by @user) before the - * user data is deleted. This same callback is used whether you - * are in client or server instantiation context. - * - * LWS_EXT_CALLBACK_PACKET_RX_PREPARSE: when this extension was active on - * a connection, and a packet of data arrived at the connection, - * it is passed to this callback to give the extension a chance to - * change the data, eg, decompress it. @user is pointing to the - * extension's private connection context data, @in is pointing - * to an lws_tokens struct, it consists of a char * pointer called - * token, and an int called token_len. At entry, these are - * set to point to the received buffer and set to the content - * length. If the extension will grow the content, it should use - * a new buffer allocated in its private user context data and - * set the pointed-to lws_tokens members to point to its buffer. - * - * LWS_EXT_CALLBACK_PACKET_TX_PRESEND: this works the same way as - * LWS_EXT_CALLBACK_PACKET_RX_PREPARSE above, except it gives the - * extension a chance to change websocket data just before it will - * be sent out. Using the same lws_token pointer scheme in @in, - * the extension can change the buffer and the length to be - * transmitted how it likes. Again if it wants to grow the - * buffer safely, it should copy the data into its own buffer and - * set the lws_tokens token pointer to it. - */ -LWS_EXTERN int extension_callback(struct libwebsocket_context * context, - struct libwebsocket_extension *ext, - struct libwebsocket *wsi, - enum libwebsocket_extension_callback_reasons reason, void *user, - void *in, size_t len); - -typedef int (extension_callback_function)(struct libwebsocket_context * context, - struct libwebsocket_extension *ext, - struct libwebsocket *wsi, - enum libwebsocket_extension_callback_reasons reason, void *user, - void *in, size_t len); - -/** - * struct libwebsocket_protocols - List of protocols and handlers server - * supports. - * @name: Protocol name that must match the one given in the client - * Javascript new WebSocket(url, 'protocol') name - * @callback: The service callback used for this protocol. It allows the - * service action for an entire protocol to be encapsulated in - * the protocol-specific callback - * @per_session_data_size: Each new connection using this protocol gets - * this much memory allocated on connection establishment and - * freed on connection takedown. A pointer to this per-connection - * allocation is passed into the callback in the 'user' parameter - * @owning_server: the server init call fills in this opaque pointer when - * registering this protocol with the server. - * @broadcast_socket_port: the server init call fills this in with the - * localhost port number used to forward broadcasts for this - * protocol - * @broadcast_socket_user_fd: the server init call fills this in ... the main() - * process context can write to this socket to perform broadcasts - * (use the libwebsockets_broadcast() api to do this instead, - * it works from any process context) - * @protocol_index: which protocol we are starting from zero - * - * This structure represents one protocol supported by the server. An - * array of these structures is passed to libwebsocket_create_server() - * allows as many protocols as you like to be handled by one server. - */ - -struct libwebsocket_protocols { - const char *name; - callback_function *callback; - size_t per_session_data_size; - - /* - * below are filled in on server init and can be left uninitialized, - * no need for user to use them directly either - */ - - struct libwebsocket_context *owning_server; - int broadcast_socket_port; - int broadcast_socket_user_fd; - int protocol_index; -}; - -/** - * struct libwebsocket_extension - An extension we know how to cope with - * - * @name: Formal extension name, eg, "deflate-stream" - * @callback: Service callback - * @per_session_data_size: Libwebsockets will auto-malloc this much - * memory for the use of the extension, a pointer - * to it comes in the @user callback parameter - * @per_context_private_data: Optional storage for this externsion that - * is per-context, so it can track stuff across - * all sessions, etc, if it wants - */ - -struct libwebsocket_extension { - const char *name; - extension_callback_function *callback; - size_t per_session_data_size; - void * per_context_private_data; -}; - - - -LWS_EXTERN struct libwebsocket_context * -libwebsocket_create_context(int port, const char * interf, - struct libwebsocket_protocols *protocols, - struct libwebsocket_extension *extensions, - const char *ssl_cert_filepath, - const char *ssl_private_key_filepath, int gid, int uid, - unsigned int options); - -LWS_EXTERN void -libwebsocket_context_destroy(struct libwebsocket_context *context); - -LWS_EXTERN int -libwebsockets_fork_service_loop(struct libwebsocket_context *context); - -LWS_EXTERN int -libwebsocket_service(struct libwebsocket_context *context, int timeout_ms); - -LWS_EXTERN int -libwebsocket_service_fd(struct libwebsocket_context *context, - struct pollfd *pollfd); - -/* - * IMPORTANT NOTICE! - * - * When sending with websocket protocol (LWS_WRITE_TEXT or LWS_WRITE_BINARY) - * the send buffer has to have LWS_SEND_BUFFER_PRE_PADDING bytes valid BEFORE - * buf, and LWS_SEND_BUFFER_POST_PADDING bytes valid AFTER (buf + len). - * - * This allows us to add protocol info before and after the data, and send as - * one packet on the network without payload copying, for maximum efficiency. - * - * So for example you need this kind of code to use libwebsocket_write with a - * 128-byte payload - * - * char buf[LWS_SEND_BUFFER_PRE_PADDING + 128 + LWS_SEND_BUFFER_POST_PADDING]; - * - * // fill your part of the buffer... for example here it's all zeros - * memset(&buf[LWS_SEND_BUFFER_PRE_PADDING], 0, 128); - * - * libwebsocket_write(wsi, &buf[LWS_SEND_BUFFER_PRE_PADDING], 128); - * - * When sending LWS_WRITE_HTTP, there is no protocol addition and you can just - * use the whole buffer without taking care of the above. - */ - -/* - * this is the frame nonce plus two header plus 8 length - * there's an additional two for mux extension per mux nesting level - * 2 byte prepend on close will already fit because control frames cannot use - * the big length style - */ - -#define LWS_SEND_BUFFER_PRE_PADDING (4 + 10 + (2 * MAX_MUX_RECURSION)) -#define LWS_SEND_BUFFER_POST_PADDING 1 - -LWS_EXTERN int -libwebsocket_write(struct libwebsocket *wsi, unsigned char *buf, size_t len, - enum libwebsocket_write_protocol protocol); - -LWS_EXTERN int -libwebsockets_serve_http_file(struct libwebsocket *wsi, const char *file, - const char *content_type); - -/* notice - you need the pre- and post- padding allocation for buf below */ - -LWS_EXTERN int -libwebsockets_broadcast(const struct libwebsocket_protocols *protocol, - unsigned char *buf, size_t len); - -LWS_EXTERN const struct libwebsocket_protocols * -libwebsockets_get_protocol(struct libwebsocket *wsi); - -LWS_EXTERN int -libwebsocket_callback_on_writable(struct libwebsocket_context *context, - struct libwebsocket *wsi); - -LWS_EXTERN int -libwebsocket_callback_on_writable_all_protocol( - const struct libwebsocket_protocols *protocol); - -LWS_EXTERN int -libwebsocket_get_socket_fd(struct libwebsocket *wsi); - -LWS_EXTERN int -libwebsocket_is_final_fragment(struct libwebsocket *wsi); - -LWS_EXTERN void * -libwebsocket_ensure_user_space(struct libwebsocket *wsi); - -LWS_EXTERN int -libwebsocket_rx_flow_control(struct libwebsocket *wsi, int enable); - -LWS_EXTERN size_t -libwebsockets_remaining_packet_payload(struct libwebsocket *wsi); - -LWS_EXTERN struct libwebsocket * -libwebsocket_client_connect(struct libwebsocket_context *clients, - const char *address, - int port, - int ssl_connection, - const char *path, - const char *host, - const char *origin, - const char *protocol, - int ietf_version_or_minus_one); - -LWS_EXTERN struct libwebsocket * -libwebsocket_client_connect_extended(struct libwebsocket_context *clients, - const char *address, - int port, - int ssl_connection, - const char *path, - const char *host, - const char *origin, - const char *protocol, - int ietf_version_or_minus_one, - void *userdata); - -LWS_EXTERN const char * -libwebsocket_canonical_hostname(struct libwebsocket_context *context); - - -LWS_EXTERN void -libwebsockets_get_peer_addresses(int fd, char *name, int name_len, - char *rip, int rip_len); - -LWS_EXTERN void -libwebsockets_hangup_on_client(struct libwebsocket_context *context, int fd); - -LWS_EXTERN void -libwebsocket_close_and_free_session(struct libwebsocket_context *context, - struct libwebsocket *wsi, enum lws_close_status); - -LWS_EXTERN int -libwebsockets_get_random(struct libwebsocket_context *context, - void *buf, int len); - -LWS_EXTERN int -lws_send_pipe_choked(struct libwebsocket *wsi); - -LWS_EXTERN unsigned char * -libwebsockets_SHA1(const unsigned char *d, size_t n, unsigned char *md); - -LWS_EXTERN int -lws_b64_encode_string(const char *in, int in_len, char *out, int out_size); - -LWS_EXTERN int -lws_b64_decode_string(const char *in, char *out, int out_size); - -LWS_EXTERN struct libwebsocket_extension libwebsocket_internal_extensions[]; - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/libs/libwebsockets/lib/md5.c b/libs/libwebsockets/lib/md5.c deleted file mode 100644 index 042db3b8e4..0000000000 --- a/libs/libwebsockets/lib/md5.c +++ /dev/null @@ -1,217 +0,0 @@ -/* - * Modified from Polarssl here - * http://polarssl.org/show_source?file=md5 - * under GPL2 or later - */ - -#include -#include - - -#define GET_ULONG_LE(n, b, i) \ -{ \ - (n) = ((unsigned long)(b)[i]) \ - | ((unsigned long)(b)[(i) + 1] << 8) \ - | ((unsigned long)(b)[(i) + 2] << 16) \ - | ((unsigned long)(b)[(i) + 3] << 24); \ -} - -#define PUT_ULONG_LE(n, b, i) \ -{ \ - (b)[i] = (unsigned char)(n); \ - (b)[(i) + 1] = (unsigned char)((n) >> 8); \ - (b)[(i) + 2] = (unsigned char)((n) >> 16); \ - (b)[(i) + 3] = (unsigned char)((n) >> 24); \ -} - -static const unsigned char md5_padding[64] = { - 0x80, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, -}; - -static const unsigned long state_init[] = { - 0, 0, 0x67452301, 0xEFCDAB89, 0x98BADCFE, 0x10325476 -}; - -static void -md5_process(unsigned long *state, const unsigned char *data) -{ - unsigned long X[16], A, B, C, D; - int v; - - for (v = 0; v < 16; v++) - GET_ULONG_LE(X[v], data, v << 2); - -#define S(x, n) ((x << n) | ((x & 0xFFFFFFFF) >> (32 - n))) - -#define P(a, b, c, d, k, s, t) { a += F(b, c, d) + X[k] + t; a = S(a, s) + b; } - - A = state[0]; - B = state[1]; - C = state[2]; - D = state[3]; - -#define F(x, y, z) (z ^ (x & (y ^ z))) - - P(A, B, C, D, 0, 7, 0xD76AA478); - P(D, A, B, C, 1, 12, 0xE8C7B756); - P(C, D, A, B, 2, 17, 0x242070DB); - P(B, C, D, A, 3, 22, 0xC1BDCEEE); - P(A, B, C, D, 4, 7, 0xF57C0FAF); - P(D, A, B, C, 5, 12, 0x4787C62A); - P(C, D, A, B, 6, 17, 0xA8304613); - P(B, C, D, A, 7, 22, 0xFD469501); - P(A, B, C, D, 8, 7, 0x698098D8); - P(D, A, B, C, 9, 12, 0x8B44F7AF); - P(C, D, A, B, 10, 17, 0xFFFF5BB1); - P(B, C, D, A, 11, 22, 0x895CD7BE); - P(A, B, C, D, 12, 7, 0x6B901122); - P(D, A, B, C, 13, 12, 0xFD987193); - P(C, D, A, B, 14, 17, 0xA679438E); - P(B, C, D, A, 15, 22, 0x49B40821); - -#undef F - -#define F(x, y, z) (y ^ (z & (x ^ y))) - - P(A, B, C, D, 1, 5, 0xF61E2562); - P(D, A, B, C, 6, 9, 0xC040B340); - P(C, D, A, B, 11, 14, 0x265E5A51); - P(B, C, D, A, 0, 20, 0xE9B6C7AA); - P(A, B, C, D, 5, 5, 0xD62F105D); - P(D, A, B, C, 10, 9, 0x02441453); - P(C, D, A, B, 15, 14, 0xD8A1E681); - P(B, C, D, A, 4, 20, 0xE7D3FBC8); - P(A, B, C, D, 9, 5, 0x21E1CDE6); - P(D, A, B, C, 14, 9, 0xC33707D6); - P(C, D, A, B, 3, 14, 0xF4D50D87); - P(B, C, D, A, 8, 20, 0x455A14ED); - P(A, B, C, D, 13, 5, 0xA9E3E905); - P(D, A, B, C, 2, 9, 0xFCEFA3F8); - P(C, D, A, B, 7, 14, 0x676F02D9); - P(B, C, D, A, 12, 20, 0x8D2A4C8A); - -#undef F - -#define F(x, y, z) (x ^ y ^ z) - - P(A, B, C, D, 5, 4, 0xFFFA3942); - P(D, A, B, C, 8, 11, 0x8771F681); - P(C, D, A, B, 11, 16, 0x6D9D6122); - P(B, C, D, A, 14, 23, 0xFDE5380C); - P(A, B, C, D, 1, 4, 0xA4BEEA44); - P(D, A, B, C, 4, 11, 0x4BDECFA9); - P(C, D, A, B, 7, 16, 0xF6BB4B60); - P(B, C, D, A, 10, 23, 0xBEBFBC70); - P(A, B, C, D, 13, 4, 0x289B7EC6); - P(D, A, B, C, 0, 11, 0xEAA127FA); - P(C, D, A, B, 3, 16, 0xD4EF3085); - P(B, C, D, A, 6, 23, 0x04881D05); - P(A, B, C, D, 9, 4, 0xD9D4D039); - P(D, A, B, C, 12, 11, 0xE6DB99E5); - P(C, D, A, B, 15, 16, 0x1FA27CF8); - P(B, C, D, A, 2, 23, 0xC4AC5665); - -#undef F - -#define F(x, y, z) (y ^ (x | ~z)) - - P(A, B, C, D, 0, 6, 0xF4292244); - P(D, A, B, C, 7, 10, 0x432AFF97); - P(C, D, A, B, 14, 15, 0xAB9423A7); - P(B, C, D, A, 5, 21, 0xFC93A039); - P(A, B, C, D, 12, 6, 0x655B59C3); - P(D, A, B, C, 3, 10, 0x8F0CCC92); - P(C, D, A, B, 10, 15, 0xFFEFF47D); - P(B, C, D, A, 1, 21, 0x85845DD1); - P(A, B, C, D, 8, 6, 0x6FA87E4F); - P(D, A, B, C, 15, 10, 0xFE2CE6E0); - P(C, D, A, B, 6, 15, 0xA3014314); - P(B, C, D, A, 13, 21, 0x4E0811A1); - P(A, B, C, D, 4, 6, 0xF7537E82); - P(D, A, B, C, 11, 10, 0xBD3AF235); - P(C, D, A, B, 2, 15, 0x2AD7D2BB); - P(B, C, D, A, 9, 21, 0xEB86D391); - -#undef F - - state[0] += A; - state[1] += B; - state[2] += C; - state[3] += D; -} - -static -void md5_update(unsigned long *state, unsigned char *buffer, - const unsigned char *input, int ilen) -{ - int fill; - unsigned long left; - - if (ilen <= 0) - return; - - left = state[0] & 0x3F; - fill = 64 - left; - - state[0] += ilen; - state[0] &= 0xFFFFFFFF; - - if (state[0] < (unsigned long)ilen) - state[1]++; - - if (left && ilen >= fill) { - memcpy(buffer + left, input, fill); - md5_process(&state[2], buffer); - input += fill; - ilen -= fill; - left = 0; - } - - while (ilen >= 64) { - md5_process(&state[2], input); - input += 64; - ilen -= 64; - } - - if (ilen > 0) - memcpy(buffer + left, input, ilen); -} - -void -MD5(const unsigned char *input, int ilen, unsigned char *output) -{ - unsigned long last, padn; - unsigned long high, low; - unsigned char msglen[8]; - unsigned long state[6]; - unsigned char buffer[64]; - - memcpy(&state[0], &state_init[0], sizeof(state_init)); - - md5_update(state, buffer, input, ilen); - - high = (state[0] >> 29) | (state[1] << 3); - low = state[0] << 3; - - PUT_ULONG_LE(low, msglen, 0); - PUT_ULONG_LE(high, msglen, 4); - - last = state[0] & 0x3F; - padn = (last < 56) ? (56 - last) : (120 - last); - - md5_update(state, buffer, md5_padding, padn); - md5_update(state, buffer, msglen, 8); - - PUT_ULONG_LE(state[2], output, 0); - PUT_ULONG_LE(state[3], output, 4); - PUT_ULONG_LE(state[4], output, 8); - PUT_ULONG_LE(state[5], output, 12); -} - diff --git a/libs/libwebsockets/lib/parsers.c b/libs/libwebsockets/lib/parsers.c deleted file mode 100644 index a185971610..0000000000 --- a/libs/libwebsockets/lib/parsers.c +++ /dev/null @@ -1,1967 +0,0 @@ -/* - * libwebsockets - small server side websockets and web server implementation - * - * Copyright (C) 2010 Andy Green - * - * This 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: - * version 2.1 of the License. - * - * This 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 this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301 USA - */ - -#include "private-libwebsockets.h" - -const struct lws_tokens lws_tokens[WSI_TOKEN_COUNT] = { - - /* win32 can't do C99 */ - -/* [WSI_TOKEN_GET_URI] = */{ "GET ", 4 }, -/* [WSI_TOKEN_HOST] = */{ "Host:", 5 }, -/* [WSI_TOKEN_CONNECTION] = */{ "Connection:", 11 }, -/* [WSI_TOKEN_KEY1] = */{ "Sec-WebSocket-Key1:", 19 }, -/* [WSI_TOKEN_KEY2] = */{ "Sec-WebSocket-Key2:", 19 }, -/* [WSI_TOKEN_PROTOCOL] = */{ "Sec-WebSocket-Protocol:", 23 }, -/* [WSI_TOKEN_UPGRADE] = */{ "Upgrade:", 8 }, -/* [WSI_TOKEN_ORIGIN] = */{ "Origin:", 7 }, -/* [WSI_TOKEN_DRAFT] = */{ "Sec-WebSocket-Draft:", 20 }, -/* [WSI_TOKEN_CHALLENGE] = */{ "\x0d\x0a", 2 }, - -/* [WSI_TOKEN_KEY] = */{ "Sec-WebSocket-Key:", 18 }, -/* [WSI_TOKEN_VERSION] = */{ "Sec-WebSocket-Version:", 22 }, -/* [WSI_TOKEN_SWORIGIN]= */{ "Sec-WebSocket-Origin:", 21 }, - -/* [WSI_TOKEN_EXTENSIONS] = */{ "Sec-WebSocket-Extensions:", 25 }, - -/* [WSI_TOKEN_ACCEPT] = */{ "Sec-WebSocket-Accept:", 21 }, -/* [WSI_TOKEN_NONCE] = */{ "Sec-WebSocket-Nonce:", 20 }, -/* [WSI_TOKEN_HTTP] = */{ "HTTP/1.1 ", 9 }, -/* [WSI_TOKEN_MUXURL] = */{ "", -1 }, - -}; - -int libwebsocket_parse(struct libwebsocket *wsi, unsigned char c) -{ - int n; - - switch (wsi->parser_state) { - case WSI_TOKEN_GET_URI: - case WSI_TOKEN_HOST: - case WSI_TOKEN_CONNECTION: - case WSI_TOKEN_KEY1: - case WSI_TOKEN_KEY2: - case WSI_TOKEN_PROTOCOL: - case WSI_TOKEN_UPGRADE: - case WSI_TOKEN_ORIGIN: - case WSI_TOKEN_SWORIGIN: - case WSI_TOKEN_DRAFT: - case WSI_TOKEN_CHALLENGE: - case WSI_TOKEN_KEY: - case WSI_TOKEN_VERSION: - case WSI_TOKEN_ACCEPT: - case WSI_TOKEN_NONCE: - case WSI_TOKEN_EXTENSIONS: - case WSI_TOKEN_HTTP: - case WSI_TOKEN_MUXURL: - - debug("WSI_TOKEN_(%d) '%c'\n", wsi->parser_state, c); - - /* collect into malloc'd buffers */ - /* optional space swallow */ - if (!wsi->utf8_token[wsi->parser_state].token_len && c == ' ') - break; - - /* special case space terminator for get-uri */ - if (wsi->parser_state == WSI_TOKEN_GET_URI && c == ' ') { - wsi->utf8_token[wsi->parser_state].token[ - wsi->utf8_token[wsi->parser_state].token_len] = '\0'; - wsi->parser_state = WSI_TOKEN_SKIPPING; - break; - } - - /* allocate appropriate memory */ - if (wsi->utf8_token[wsi->parser_state].token_len == - wsi->current_alloc_len - 1) { - /* need to extend */ - wsi->current_alloc_len += LWS_ADDITIONAL_HDR_ALLOC; - if (wsi->current_alloc_len >= LWS_MAX_HEADER_LEN) { - /* it's waaay to much payload, fail it */ - strcpy(wsi->utf8_token[wsi->parser_state].token, - "!!! Length exceeded maximum supported !!!"); - wsi->parser_state = WSI_TOKEN_SKIPPING; - break; - } - wsi->utf8_token[wsi->parser_state].token = - realloc(wsi->utf8_token[wsi->parser_state].token, - wsi->current_alloc_len); - } - - /* bail at EOL */ - if (wsi->parser_state != WSI_TOKEN_CHALLENGE && c == '\x0d') { - wsi->utf8_token[wsi->parser_state].token[ - wsi->utf8_token[wsi->parser_state].token_len] = '\0'; - wsi->parser_state = WSI_TOKEN_SKIPPING_SAW_CR; - debug("*\n"); - break; - } - - wsi->utf8_token[wsi->parser_state].token[ - wsi->utf8_token[wsi->parser_state].token_len++] = c; - - /* per-protocol end of headers management */ - - if (wsi->parser_state != WSI_TOKEN_CHALLENGE) - break; - - /* -76 has no version header ... server */ - if (!wsi->utf8_token[WSI_TOKEN_VERSION].token_len && - wsi->mode != LWS_CONNMODE_WS_CLIENT_WAITING_SERVER_REPLY && - wsi->utf8_token[wsi->parser_state].token_len != 8) - break; - - /* -76 has no version header ... client */ - if (!wsi->utf8_token[WSI_TOKEN_VERSION].token_len && - wsi->mode == LWS_CONNMODE_WS_CLIENT_WAITING_SERVER_REPLY && - wsi->utf8_token[wsi->parser_state].token_len != 16) - break; - - /* <= 03 has old handshake with version header needs 8 bytes */ - if (wsi->utf8_token[WSI_TOKEN_VERSION].token_len && - atoi(wsi->utf8_token[WSI_TOKEN_VERSION].token) < 4 && - wsi->utf8_token[wsi->parser_state].token_len != 8) - break; - - /* no payload challenge in 01 + */ - - if (wsi->utf8_token[WSI_TOKEN_VERSION].token_len && - atoi(wsi->utf8_token[WSI_TOKEN_VERSION].token) > 0) { - wsi->utf8_token[WSI_TOKEN_CHALLENGE].token_len = 0; - free(wsi->utf8_token[WSI_TOKEN_CHALLENGE].token); - wsi->utf8_token[WSI_TOKEN_CHALLENGE].token = NULL; - } - - /* For any supported protocol we have enough payload */ - - debug("Setting WSI_PARSING_COMPLETE\n"); - wsi->parser_state = WSI_PARSING_COMPLETE; - break; - - case WSI_INIT_TOKEN_MUXURL: - wsi->parser_state = WSI_TOKEN_MUXURL; - wsi->current_alloc_len = LWS_INITIAL_HDR_ALLOC; - - wsi->utf8_token[wsi->parser_state].token = - malloc(wsi->current_alloc_len); - wsi->utf8_token[wsi->parser_state].token_len = 0; - break; - - /* collecting and checking a name part */ - case WSI_TOKEN_NAME_PART: - debug("WSI_TOKEN_NAME_PART '%c'\n", c); - - if (wsi->name_buffer_pos == sizeof(wsi->name_buffer) - 1) { - /* name bigger than we can handle, skip until next */ - wsi->parser_state = WSI_TOKEN_SKIPPING; - break; - } - wsi->name_buffer[wsi->name_buffer_pos++] = c; - wsi->name_buffer[wsi->name_buffer_pos] = '\0'; - - for (n = 0; n < WSI_TOKEN_COUNT; n++) { - if (wsi->name_buffer_pos != lws_tokens[n].token_len) - continue; - if (strcasecmp(lws_tokens[n].token, wsi->name_buffer)) - continue; - debug("known hdr '%s'\n", wsi->name_buffer); - - /* - * WSORIGIN is protocol equiv to ORIGIN, - * JWebSocket likes to send it, map to ORIGIN - */ - if (n == WSI_TOKEN_SWORIGIN) - n = WSI_TOKEN_ORIGIN; - - wsi->parser_state = WSI_TOKEN_GET_URI + n; - - n = WSI_TOKEN_COUNT; - - /* If the header has been seen already, just append */ - if (wsi->utf8_token[wsi->parser_state].token) - continue; - - wsi->current_alloc_len = LWS_INITIAL_HDR_ALLOC; - wsi->utf8_token[wsi->parser_state].token = - malloc(wsi->current_alloc_len); - wsi->utf8_token[wsi->parser_state].token_len = 0; - } - - /* colon delimiter means we just don't know this name */ - - if (wsi->parser_state == WSI_TOKEN_NAME_PART && c == ':') { - debug("skipping unknown header '%s'\n", - wsi->name_buffer); - wsi->parser_state = WSI_TOKEN_SKIPPING; - break; - } - - if (wsi->parser_state != WSI_TOKEN_CHALLENGE) - break; - - /* don't look for payload when it can just be http headers */ - - if (!wsi->utf8_token[WSI_TOKEN_UPGRADE].token_len) { - /* they're HTTP headers, not websocket upgrade! */ - debug("Setting WSI_PARSING_COMPLETE " - "from http headers\n"); - wsi->parser_state = WSI_PARSING_COMPLETE; - } - - /* 04 version has no packet content after end of hdrs */ - - if (wsi->utf8_token[WSI_TOKEN_VERSION].token_len && - atoi(wsi->utf8_token[WSI_TOKEN_VERSION].token) >= 4) { - debug("04 header completed\n"); - wsi->parser_state = WSI_PARSING_COMPLETE; - wsi->utf8_token[WSI_TOKEN_CHALLENGE].token_len = 0; - free(wsi->utf8_token[WSI_TOKEN_CHALLENGE].token); - wsi->utf8_token[WSI_TOKEN_CHALLENGE].token = NULL; - } - - /* client parser? */ - - if (wsi->ietf_spec_revision >= 4) { - debug("04 header completed\n"); - wsi->parser_state = WSI_PARSING_COMPLETE; - } - - break; - - /* skipping arg part of a name we didn't recognize */ - case WSI_TOKEN_SKIPPING: - debug("WSI_TOKEN_SKIPPING '%c'\n", c); - if (c == '\x0d') - wsi->parser_state = WSI_TOKEN_SKIPPING_SAW_CR; - break; - case WSI_TOKEN_SKIPPING_SAW_CR: - debug("WSI_TOKEN_SKIPPING_SAW_CR '%c'\n", c); - if (c == '\x0a') - wsi->parser_state = WSI_TOKEN_NAME_PART; - else - wsi->parser_state = WSI_TOKEN_SKIPPING; - wsi->name_buffer_pos = 0; - break; - /* we're done, ignore anything else */ - case WSI_PARSING_COMPLETE: - debug("WSI_PARSING_COMPLETE '%c'\n", c); - break; - - default: /* keep gcc happy */ - break; - } - - return 0; -} - -unsigned char -xor_no_mask(struct libwebsocket *wsi, unsigned char c) -{ - return c; -} - -unsigned char -xor_mask_04(struct libwebsocket *wsi, unsigned char c) -{ - c ^= wsi->masking_key_04[wsi->frame_mask_index++]; - if (wsi->frame_mask_index == 20) - wsi->frame_mask_index = 0; - - return c; -} - -unsigned char -xor_mask_05(struct libwebsocket *wsi, unsigned char c) -{ - return c ^ wsi->frame_masking_nonce_04[(wsi->frame_mask_index++) & 3]; -} - - - -int -libwebsocket_rx_sm(struct libwebsocket *wsi, unsigned char c) -{ - int n; - unsigned char buf[20 + 4]; - struct lws_tokens eff_buf; - int handled; - int m; - -#if 0 - fprintf(stderr, "RX: %02X ", c); -#endif - - switch (wsi->lws_rx_parse_state) { - case LWS_RXPS_NEW: - - switch (wsi->ietf_spec_revision) { - /* Firefox 4.0b6 likes this as of 30 Oct 2010 */ - case 0: - if (c == 0xff) - wsi->lws_rx_parse_state = LWS_RXPS_SEEN_76_FF; - if (c == 0) { - wsi->lws_rx_parse_state = - LWS_RXPS_EAT_UNTIL_76_FF; - wsi->rx_user_buffer_head = 0; - } - break; - case 4: - case 5: - case 6: - wsi->all_zero_nonce = 1; - wsi->frame_masking_nonce_04[0] = c; - if (c) - wsi->all_zero_nonce = 0; - wsi->lws_rx_parse_state = LWS_RXPS_04_MASK_NONCE_1; - break; - case 7: - case 8: - case 13: - /* - * no prepended frame key any more - */ - wsi->all_zero_nonce = 1; - goto handle_first; - - default: - fprintf(stderr, "libwebsocket_rx_sm doesn't know " - "about spec version %d\n", wsi->ietf_spec_revision); - break; - } - break; - case LWS_RXPS_04_MASK_NONCE_1: - wsi->frame_masking_nonce_04[1] = c; - if (c) - wsi->all_zero_nonce = 0; - wsi->lws_rx_parse_state = LWS_RXPS_04_MASK_NONCE_2; - break; - case LWS_RXPS_04_MASK_NONCE_2: - wsi->frame_masking_nonce_04[2] = c; - if (c) - wsi->all_zero_nonce = 0; - wsi->lws_rx_parse_state = LWS_RXPS_04_MASK_NONCE_3; - break; - case LWS_RXPS_04_MASK_NONCE_3: - wsi->frame_masking_nonce_04[3] = c; - if (c) - wsi->all_zero_nonce = 0; - - if (wsi->protocol->owning_server->options & - LWS_SERVER_OPTION_DEFEAT_CLIENT_MASK) - goto post_mask; - - if (wsi->ietf_spec_revision > 4) - goto post_sha1; - - /* - * we are able to compute the frame key now - * it's a SHA1 of ( frame nonce we were just sent, concatenated - * with the connection masking key we computed at handshake - * time ) -- yeah every frame from the client invokes a SHA1 - * for no real reason so much for lightweight. - */ - - buf[0] = wsi->frame_masking_nonce_04[0]; - buf[1] = wsi->frame_masking_nonce_04[1]; - buf[2] = wsi->frame_masking_nonce_04[2]; - buf[3] = wsi->frame_masking_nonce_04[3]; - - memcpy(buf + 4, wsi->masking_key_04, 20); - - /* - * wsi->frame_mask_04 will be our recirculating 20-byte XOR key - * for this frame - */ - - SHA1((unsigned char *)buf, 4 + 20, wsi->frame_mask_04); - -post_sha1: - - /* - * start from the zero'th byte in the XOR key buffer since - * this is the start of a frame with a new key - */ - - wsi->frame_mask_index = 0; - -post_mask: - wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_1; - break; - - /* - * 04 logical framing from the spec (all this is masked when incoming - * and has to be unmasked) - * - * We ignore the possibility of extension data because we don't - * negotiate any extensions at the moment. - * - * 0 1 2 3 - * 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 - * +-+-+-+-+-------+-+-------------+-------------------------------+ - * |F|R|R|R| opcode|R| Payload len | Extended payload length | - * |I|S|S|S| (4) |S| (7) | (16/63) | - * |N|V|V|V| |V| | (if payload len==126/127) | - * | |1|2|3| |4| | | - * +-+-+-+-+-------+-+-------------+ - - - - - - - - - - - - - - - + - * | Extended payload length continued, if payload len == 127 | - * + - - - - - - - - - - - - - - - +-------------------------------+ - * | | Extension data | - * +-------------------------------+ - - - - - - - - - - - - - - - + - * : : - * +---------------------------------------------------------------+ - * : Application data : - * +---------------------------------------------------------------+ - * - * We pass payload through to userland as soon as we get it, ignoring - * FIN. It's up to userland to buffer it up if it wants to see a - * whole unfragmented block of the original size (which may be up to - * 2^63 long!) - */ - - case LWS_RXPS_04_FRAME_HDR_1: -handle_first: - - /* - * 04 spec defines the opcode like this: (1, 2, and 3 are - * "control frame" opcodes which may not be fragmented or - * have size larger than 126) - * - * frame-opcode = - * %x0 ; continuation frame - * / %x1 ; connection close - * / %x2 ; ping - * / %x3 ; pong - * / %x4 ; text frame - * / %x5 ; binary frame - * / %x6-F ; reserved - * - * FIN (b7) - */ - - if (wsi->ietf_spec_revision < 7) - c = wsi->xor_mask(wsi, c); - - if (c & 0x70) - fprintf(stderr, - "Frame has unknown extension bits set 1 %02X\n", c); - - /* translate all incoming opcodes into v7+ map */ - if (wsi->ietf_spec_revision < 7) - switch (c & 0xf) { - case LWS_WS_OPCODE_04__CONTINUATION: - wsi->opcode = LWS_WS_OPCODE_07__CONTINUATION; - break; - case LWS_WS_OPCODE_04__CLOSE: - wsi->opcode = LWS_WS_OPCODE_07__CLOSE; - break; - case LWS_WS_OPCODE_04__PING: - wsi->opcode = LWS_WS_OPCODE_07__PING; - break; - case LWS_WS_OPCODE_04__PONG: - wsi->opcode = LWS_WS_OPCODE_07__PONG; - break; - case LWS_WS_OPCODE_04__TEXT_FRAME: - wsi->opcode = LWS_WS_OPCODE_07__TEXT_FRAME; - break; - case LWS_WS_OPCODE_04__BINARY_FRAME: - wsi->opcode = LWS_WS_OPCODE_07__BINARY_FRAME; - break; - default: - fprintf(stderr, "reserved opcodes not " - "usable pre v7 protocol\n"); - return -1; - } - else - wsi->opcode = c & 0xf; - - wsi->final = !!((c >> 7) & 1); - - wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN; - break; - - case LWS_RXPS_04_FRAME_HDR_LEN: - - if (wsi->ietf_spec_revision < 7) - c = wsi->xor_mask(wsi, c); - - if ((c & 0x80) && wsi->ietf_spec_revision < 7) { - fprintf(stderr, "Frame has extensions " - "set illegally 2\n"); - /* kill the connection */ - return -1; - } - - wsi->this_frame_masked = !!(c & 0x80); - - switch (c & 0x7f) { - case 126: - /* control frames are not allowed to have big lengths */ - if (wsi->opcode & 8) - goto illegal_ctl_length; - - wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN16_2; - break; - case 127: - /* control frames are not allowed to have big lengths */ - if (wsi->opcode & 8) - goto illegal_ctl_length; - - wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN64_8; - break; - default: - wsi->rx_packet_length = c & 0x7f; - if (wsi->this_frame_masked) - wsi->lws_rx_parse_state = - LWS_RXPS_07_COLLECT_FRAME_KEY_1; - else - wsi->lws_rx_parse_state = - LWS_RXPS_PAYLOAD_UNTIL_LENGTH_EXHAUSTED; - break; - } - break; - - case LWS_RXPS_04_FRAME_HDR_LEN16_2: - if (wsi->ietf_spec_revision < 7) - c = wsi->xor_mask(wsi, c); - - wsi->rx_packet_length = c << 8; - wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN16_1; - break; - - case LWS_RXPS_04_FRAME_HDR_LEN16_1: - if (wsi->ietf_spec_revision < 7) - c = wsi->xor_mask(wsi, c); - - wsi->rx_packet_length |= c; - if (wsi->this_frame_masked) - wsi->lws_rx_parse_state = - LWS_RXPS_07_COLLECT_FRAME_KEY_1; - else - wsi->lws_rx_parse_state = - LWS_RXPS_PAYLOAD_UNTIL_LENGTH_EXHAUSTED; - break; - - case LWS_RXPS_04_FRAME_HDR_LEN64_8: - if (wsi->ietf_spec_revision < 7) - c = wsi->xor_mask(wsi, c); - if (c & 0x80) { - fprintf(stderr, "b63 of length must be zero\n"); - /* kill the connection */ - return -1; - } -#if defined __LP64__ - wsi->rx_packet_length = ((size_t)c) << 56; -#else - wsi->rx_packet_length = 0; -#endif - wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN64_7; - break; - - case LWS_RXPS_04_FRAME_HDR_LEN64_7: - if (wsi->ietf_spec_revision < 7) - c = wsi->xor_mask(wsi, c); -#if defined __LP64__ - wsi->rx_packet_length |= ((size_t)c) << 48; -#endif - wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN64_6; - break; - - case LWS_RXPS_04_FRAME_HDR_LEN64_6: - if (wsi->ietf_spec_revision < 7) - c = wsi->xor_mask(wsi, c); -#if defined __LP64__ - wsi->rx_packet_length |= ((size_t)c) << 40; -#endif - wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN64_5; - break; - - case LWS_RXPS_04_FRAME_HDR_LEN64_5: - if (wsi->ietf_spec_revision < 7) - c = wsi->xor_mask(wsi, c); -#if defined __LP64__ - wsi->rx_packet_length |= ((size_t)c) << 32; -#endif - wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN64_4; - break; - - case LWS_RXPS_04_FRAME_HDR_LEN64_4: - if (wsi->ietf_spec_revision < 7) - c = wsi->xor_mask(wsi, c); - wsi->rx_packet_length |= ((size_t)c) << 24; - wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN64_3; - break; - - case LWS_RXPS_04_FRAME_HDR_LEN64_3: - if (wsi->ietf_spec_revision < 7) - c = wsi->xor_mask(wsi, c); - wsi->rx_packet_length |= ((size_t)c) << 16; - wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN64_2; - break; - - case LWS_RXPS_04_FRAME_HDR_LEN64_2: - if (wsi->ietf_spec_revision < 7) - c = wsi->xor_mask(wsi, c); - wsi->rx_packet_length |= ((size_t)c) << 8; - wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN64_1; - break; - - case LWS_RXPS_04_FRAME_HDR_LEN64_1: - if (wsi->ietf_spec_revision < 7) - c = wsi->xor_mask(wsi, c); - wsi->rx_packet_length |= ((size_t)c); - if (wsi->this_frame_masked) - wsi->lws_rx_parse_state = - LWS_RXPS_07_COLLECT_FRAME_KEY_1; - else - wsi->lws_rx_parse_state = - LWS_RXPS_PAYLOAD_UNTIL_LENGTH_EXHAUSTED; - break; - - case LWS_RXPS_EAT_UNTIL_76_FF: - if (c == 0xff) { - wsi->lws_rx_parse_state = LWS_RXPS_NEW; - goto issue; - } - wsi->rx_user_buffer[LWS_SEND_BUFFER_PRE_PADDING + - (wsi->rx_user_buffer_head++)] = c; - - if (wsi->rx_user_buffer_head != MAX_USER_RX_BUFFER) - break; -issue: - if (wsi->protocol->callback) - wsi->protocol->callback(wsi->protocol->owning_server, - wsi, LWS_CALLBACK_RECEIVE, - wsi->user_space, - &wsi->rx_user_buffer[LWS_SEND_BUFFER_PRE_PADDING], - wsi->rx_user_buffer_head); - wsi->rx_user_buffer_head = 0; - break; - case LWS_RXPS_SEEN_76_FF: - if (c) - break; - - debug("Seen that client is requesting " - "a v76 close, sending ack\n"); - buf[0] = 0xff; - buf[1] = 0; - n = libwebsocket_write(wsi, buf, 2, LWS_WRITE_HTTP); - if (n < 0) { - fprintf(stderr, "ERROR writing to socket"); - return -1; - } - debug(" v76 close ack sent, server closing skt\n"); - /* returning < 0 will get it closed in parent */ - return -1; - - case LWS_RXPS_PULLING_76_LENGTH: - break; - - - case LWS_RXPS_07_COLLECT_FRAME_KEY_1: - wsi->frame_masking_nonce_04[0] = c; - if (c) - wsi->all_zero_nonce = 0; - wsi->lws_rx_parse_state = LWS_RXPS_07_COLLECT_FRAME_KEY_2; - break; - - case LWS_RXPS_07_COLLECT_FRAME_KEY_2: - wsi->frame_masking_nonce_04[1] = c; - if (c) - wsi->all_zero_nonce = 0; - wsi->lws_rx_parse_state = LWS_RXPS_07_COLLECT_FRAME_KEY_3; - break; - - case LWS_RXPS_07_COLLECT_FRAME_KEY_3: - wsi->frame_masking_nonce_04[2] = c; - if (c) - wsi->all_zero_nonce = 0; - wsi->lws_rx_parse_state = LWS_RXPS_07_COLLECT_FRAME_KEY_4; - break; - - case LWS_RXPS_07_COLLECT_FRAME_KEY_4: - wsi->frame_masking_nonce_04[3] = c; - if (c) - wsi->all_zero_nonce = 0; - wsi->lws_rx_parse_state = - LWS_RXPS_PAYLOAD_UNTIL_LENGTH_EXHAUSTED; - wsi->frame_mask_index = 0; - break; - - - case LWS_RXPS_PAYLOAD_UNTIL_LENGTH_EXHAUSTED: - if (wsi->ietf_spec_revision < 4 || - (wsi->all_zero_nonce && wsi->ietf_spec_revision >= 5)) - wsi->rx_user_buffer[LWS_SEND_BUFFER_PRE_PADDING + - (wsi->rx_user_buffer_head++)] = c; - else - wsi->rx_user_buffer[LWS_SEND_BUFFER_PRE_PADDING + - (wsi->rx_user_buffer_head++)] = - wsi->xor_mask(wsi, c); - - if (--wsi->rx_packet_length == 0) { - wsi->lws_rx_parse_state = LWS_RXPS_NEW; - goto spill; - } - if (wsi->rx_user_buffer_head != MAX_USER_RX_BUFFER) - break; -spill: - /* - * is this frame a control packet we should take care of at this - * layer? If so service it and hide it from the user callback - */ - - debug("spill on %s\n", wsi->protocol->name); - - switch (wsi->opcode) { - case LWS_WS_OPCODE_07__CLOSE: - /* is this an acknowledgement of our close? */ - if (wsi->state == WSI_STATE_AWAITING_CLOSE_ACK) { - /* - * fine he has told us he is closing too, let's - * finish our close - */ - debug("seen client close ack\n"); - return -1; - } - debug("server sees client close packet\n"); - /* parrot the close packet payload back */ - n = libwebsocket_write(wsi, (unsigned char *) - &wsi->rx_user_buffer[LWS_SEND_BUFFER_PRE_PADDING], - wsi->rx_user_buffer_head, LWS_WRITE_CLOSE); - wsi->state = WSI_STATE_RETURNED_CLOSE_ALREADY; - /* close the connection */ - return -1; - - case LWS_WS_OPCODE_07__PING: - /* parrot the ping packet payload back as a pong */ - n = libwebsocket_write(wsi, (unsigned char *) - &wsi->rx_user_buffer[LWS_SEND_BUFFER_PRE_PADDING], - wsi->rx_user_buffer_head, LWS_WRITE_PONG); - /* ... then just drop it */ - wsi->rx_user_buffer_head = 0; - return 0; - - case LWS_WS_OPCODE_07__PONG: - /* keep the statistics... */ - wsi->pings_vs_pongs--; - /* ... then just drop it */ - wsi->rx_user_buffer_head = 0; - return 0; - - case LWS_WS_OPCODE_07__TEXT_FRAME: - case LWS_WS_OPCODE_07__BINARY_FRAME: - break; - - default: - - debug("passing opcode %x up to exts\n", wsi->opcode); - - /* - * It's something special we can't understand here. - * Pass the payload up to the extension's parsing - * state machine. - */ - - eff_buf.token = &wsi->rx_user_buffer[ - LWS_SEND_BUFFER_PRE_PADDING]; - eff_buf.token_len = wsi->rx_user_buffer_head; - - handled = 0; - for (n = 0; n < wsi->count_active_extensions; n++) { - m = wsi->active_extensions[n]->callback( - wsi->protocol->owning_server, - wsi->active_extensions[n], wsi, - LWS_EXT_CALLBACK_EXTENDED_PAYLOAD_RX, - wsi->active_extensions_user[n], - &eff_buf, 0); - if (m) - handled = 1; - } - - if (!handled) - fprintf(stderr, "Unhandled extended opcode " - "0x%x - ignoring frame\n", wsi->opcode); - - wsi->rx_user_buffer_head = 0; - return 0; - } - - /* - * No it's real payload, pass it up to the user callback. - * It's nicely buffered with the pre-padding taken care of - * so it can be sent straight out again using libwebsocket_write - */ - - wsi->rx_user_buffer[LWS_SEND_BUFFER_PRE_PADDING + - wsi->rx_user_buffer_head] = '\0'; - - if (wsi->protocol->callback) - wsi->protocol->callback(wsi->protocol->owning_server, - wsi, LWS_CALLBACK_RECEIVE, - wsi->user_space, - &wsi->rx_user_buffer[LWS_SEND_BUFFER_PRE_PADDING], - wsi->rx_user_buffer_head); - else - fprintf(stderr, "No callback on payload spill!\n"); - - wsi->rx_user_buffer_head = 0; - break; - } - - return 0; - -illegal_ctl_length: - - fprintf(stderr, "Control frame asking for " - "extended length is illegal\n"); - /* kill the connection */ - return -1; -} - - -int libwebsocket_client_rx_sm(struct libwebsocket *wsi, unsigned char c) -{ - int n; - unsigned char buf[20 + 4]; - int callback_action = LWS_CALLBACK_CLIENT_RECEIVE; - int handled; - struct lws_tokens eff_buf; - int m; - - debug(" CRX: %02X %d\n", c, wsi->lws_rx_parse_state); - - switch (wsi->lws_rx_parse_state) { - case LWS_RXPS_NEW: - - switch (wsi->ietf_spec_revision) { - /* Firefox 4.0b6 likes this as of 30 Oct */ - case 0: - if (c == 0xff) - wsi->lws_rx_parse_state = LWS_RXPS_SEEN_76_FF; - if (c == 0) { - wsi->lws_rx_parse_state = - LWS_RXPS_EAT_UNTIL_76_FF; - wsi->rx_user_buffer_head = 0; - } - break; - case 4: - case 5: - case 6: - case 7: - case 8: - case 13: - /* - * 04 logical framing from the spec (all this is masked when - * incoming and has to be unmasked) - * - * We ignore the possibility of extension data because we don't - * negotiate any extensions at the moment. - * - * 0 1 2 3 - * 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 - * +-+-+-+-+-------+-+-------------+-------------------------------+ - * |F|R|R|R| opcode|R| Payload len | Extended payload length | - * |I|S|S|S| (4) |S| (7) | (16/63) | - * |N|V|V|V| |V| | (if payload len==126/127) | - * | |1|2|3| |4| | | - * +-+-+-+-+-------+-+-------------+ - - - - - - - - - - - - - - - + - * | Extended payload length continued, if payload len == 127 | - * + - - - - - - - - - - - - - - - +-------------------------------+ - * | | Extension data | - * +-------------------------------+ - - - - - - - - - - - - - - - + - * : : - * +---------------------------------------------------------------+ - * : Application data : - * +---------------------------------------------------------------+ - * - * We pass payload through to userland as soon as we get it, ignoring - * FIN. It's up to userland to buffer it up if it wants to see a - * whole unfragmented block of the original size (which may be up to - * 2^63 long!) - * - * Notice in v7 RSV4 is set to indicate 32-bit frame key is coming in - * after length, unlike extension data which is now deprecated, this - * does not impact the payload length calculation. - */ - - /* - * 04 spec defines the opcode like this: (1, 2, and 3 are - * "control frame" opcodes which may not be fragmented or - * have size larger than 126) - * - * frame-opcode = - * %x0 ; continuation frame - * / %x1 ; connection close - * / %x2 ; ping - * / %x3 ; pong - * / %x4 ; text frame - * / %x5 ; binary frame - * / %x6-F ; reserved - * - * FIN (b7) - */ - - if (c & 0x70) - fprintf(stderr, "Frame has unknown extension " - "bits set on first framing byte %02X\n", c); - - if (wsi->ietf_spec_revision < 7) - switch (c & 0xf) { - case LWS_WS_OPCODE_04__CONTINUATION: - wsi->opcode = - LWS_WS_OPCODE_07__CONTINUATION; - break; - case LWS_WS_OPCODE_04__CLOSE: - wsi->opcode = LWS_WS_OPCODE_07__CLOSE; - break; - case LWS_WS_OPCODE_04__PING: - wsi->opcode = LWS_WS_OPCODE_07__PING; - break; - case LWS_WS_OPCODE_04__PONG: - wsi->opcode = LWS_WS_OPCODE_07__PONG; - break; - case LWS_WS_OPCODE_04__TEXT_FRAME: - wsi->opcode = - LWS_WS_OPCODE_07__TEXT_FRAME; - break; - case LWS_WS_OPCODE_04__BINARY_FRAME: - wsi->opcode = - LWS_WS_OPCODE_07__BINARY_FRAME; - break; - default: - fprintf(stderr, "reserved opcodes not " - "usable pre v7 protocol\n"); - return -1; - } - else - wsi->opcode = c & 0xf; - - wsi->final = !!((c >> 7) & 1); - - wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN; - break; - - default: - fprintf(stderr, "client_rx_sm doesn't know how " - "to handle spec version %02d\n", - wsi->ietf_spec_revision); - break; - } - break; - - - case LWS_RXPS_04_FRAME_HDR_LEN: - - if ((c & 0x80) && wsi->ietf_spec_revision < 7) { - fprintf(stderr, - "Frame has extensions set illegally 4\n"); - /* kill the connection */ - return -1; - } - - wsi->this_frame_masked = !!(c & 0x80); - - switch (c & 0x7f) { - case 126: - /* control frames are not allowed to have big lengths */ - if (wsi->opcode & 8) - goto illegal_ctl_length; - wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN16_2; - break; - case 127: - /* control frames are not allowed to have big lengths */ - if (wsi->opcode & 8) - goto illegal_ctl_length; - wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN64_8; - break; - default: - wsi->rx_packet_length = c; - if (wsi->this_frame_masked) - wsi->lws_rx_parse_state = - LWS_RXPS_07_COLLECT_FRAME_KEY_1; - else { - if (c) - wsi->lws_rx_parse_state = - LWS_RXPS_PAYLOAD_UNTIL_LENGTH_EXHAUSTED; - else { - wsi->lws_rx_parse_state = LWS_RXPS_NEW; - goto spill; - } - } - break; - } - break; - - case LWS_RXPS_04_FRAME_HDR_LEN16_2: - wsi->rx_packet_length = c << 8; - wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN16_1; - break; - - case LWS_RXPS_04_FRAME_HDR_LEN16_1: - wsi->rx_packet_length |= c; - if (wsi->this_frame_masked) - wsi->lws_rx_parse_state = - LWS_RXPS_07_COLLECT_FRAME_KEY_1; - else { - if (wsi->rx_packet_length) - wsi->lws_rx_parse_state = - LWS_RXPS_PAYLOAD_UNTIL_LENGTH_EXHAUSTED; - else { - wsi->lws_rx_parse_state = LWS_RXPS_NEW; - goto spill; - } - } - break; - - case LWS_RXPS_04_FRAME_HDR_LEN64_8: - if (c & 0x80) { - fprintf(stderr, "b63 of length must be zero\n"); - /* kill the connection */ - return -1; - } -#if defined __LP64__ - wsi->rx_packet_length = ((size_t)c) << 56; -#else - wsi->rx_packet_length = 0; -#endif - wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN64_7; - break; - - case LWS_RXPS_04_FRAME_HDR_LEN64_7: -#if defined __LP64__ - wsi->rx_packet_length |= ((size_t)c) << 48; -#endif - wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN64_6; - break; - - case LWS_RXPS_04_FRAME_HDR_LEN64_6: -#if defined __LP64__ - wsi->rx_packet_length |= ((size_t)c) << 40; -#endif - wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN64_5; - break; - - case LWS_RXPS_04_FRAME_HDR_LEN64_5: -#if defined __LP64__ - wsi->rx_packet_length |= ((size_t)c) << 32; -#endif - wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN64_4; - break; - - case LWS_RXPS_04_FRAME_HDR_LEN64_4: - wsi->rx_packet_length |= ((size_t)c) << 24; - wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN64_3; - break; - - case LWS_RXPS_04_FRAME_HDR_LEN64_3: - wsi->rx_packet_length |= ((size_t)c) << 16; - wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN64_2; - break; - - case LWS_RXPS_04_FRAME_HDR_LEN64_2: - wsi->rx_packet_length |= ((size_t)c) << 8; - wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN64_1; - break; - - case LWS_RXPS_04_FRAME_HDR_LEN64_1: - wsi->rx_packet_length |= (size_t)c; - if (wsi->this_frame_masked) - wsi->lws_rx_parse_state = - LWS_RXPS_07_COLLECT_FRAME_KEY_1; - else { - if (wsi->rx_packet_length) - wsi->lws_rx_parse_state = - LWS_RXPS_PAYLOAD_UNTIL_LENGTH_EXHAUSTED; - else { - wsi->lws_rx_parse_state = LWS_RXPS_NEW; - goto spill; - } - } - break; - - case LWS_RXPS_07_COLLECT_FRAME_KEY_1: - wsi->frame_masking_nonce_04[0] = c; - if (c) - wsi->all_zero_nonce = 0; - wsi->lws_rx_parse_state = LWS_RXPS_07_COLLECT_FRAME_KEY_2; - break; - - case LWS_RXPS_07_COLLECT_FRAME_KEY_2: - wsi->frame_masking_nonce_04[1] = c; - if (c) - wsi->all_zero_nonce = 0; - wsi->lws_rx_parse_state = LWS_RXPS_07_COLLECT_FRAME_KEY_3; - break; - - case LWS_RXPS_07_COLLECT_FRAME_KEY_3: - wsi->frame_masking_nonce_04[2] = c; - if (c) - wsi->all_zero_nonce = 0; - wsi->lws_rx_parse_state = LWS_RXPS_07_COLLECT_FRAME_KEY_4; - break; - - case LWS_RXPS_07_COLLECT_FRAME_KEY_4: - wsi->frame_masking_nonce_04[3] = c; - if (c) - wsi->all_zero_nonce = 0; - - if (wsi->rx_packet_length) - wsi->lws_rx_parse_state = - LWS_RXPS_PAYLOAD_UNTIL_LENGTH_EXHAUSTED; - else { - wsi->lws_rx_parse_state = LWS_RXPS_NEW; - goto spill; - } - break; - - case LWS_RXPS_EAT_UNTIL_76_FF: - if (c == 0xff) { - wsi->lws_rx_parse_state = LWS_RXPS_NEW; - goto issue; - } - wsi->rx_user_buffer[LWS_SEND_BUFFER_PRE_PADDING + - (wsi->rx_user_buffer_head++)] = c; - - if (wsi->rx_user_buffer_head != MAX_USER_RX_BUFFER) - break; -issue: - if (wsi->protocol->callback) - wsi->protocol->callback(wsi->protocol->owning_server, - wsi, - LWS_CALLBACK_CLIENT_RECEIVE, - wsi->user_space, - &wsi->rx_user_buffer[LWS_SEND_BUFFER_PRE_PADDING], - wsi->rx_user_buffer_head); - wsi->rx_user_buffer_head = 0; - break; - case LWS_RXPS_SEEN_76_FF: - if (c) - break; - - debug("Seen that client is requesting " - "a v76 close, sending ack\n"); - buf[0] = 0xff; - buf[1] = 0; - n = libwebsocket_write(wsi, buf, 2, LWS_WRITE_HTTP); - if (n < 0) { - fprintf(stderr, "ERROR writing to socket"); - return -1; - } - debug(" v76 close ack sent, server closing skt\n"); - /* returning < 0 will get it closed in parent */ - return -1; - - case LWS_RXPS_PULLING_76_LENGTH: - break; - - case LWS_RXPS_PAYLOAD_UNTIL_LENGTH_EXHAUSTED: - if ((!wsi->this_frame_masked) || wsi->all_zero_nonce) - wsi->rx_user_buffer[LWS_SEND_BUFFER_PRE_PADDING + - (wsi->rx_user_buffer_head++)] = c; - else - wsi->rx_user_buffer[LWS_SEND_BUFFER_PRE_PADDING + - (wsi->rx_user_buffer_head++)] = - wsi->xor_mask(wsi, c); - - if (--wsi->rx_packet_length == 0) { - wsi->lws_rx_parse_state = LWS_RXPS_NEW; - goto spill; - } - if (wsi->rx_user_buffer_head != MAX_USER_RX_BUFFER) - break; -spill: - - handled = 0; - - /* - * is this frame a control packet we should take care of at this - * layer? If so service it and hide it from the user callback - */ - - switch (wsi->opcode) { - case LWS_WS_OPCODE_07__CLOSE: - /* is this an acknowledgement of our close? */ - if (wsi->state == WSI_STATE_AWAITING_CLOSE_ACK) { - /* - * fine he has told us he is closing too, let's - * finish our close - */ - debug("seen server's close ack\n"); - return -1; - } - debug("client sees server close packet len = %d\n", wsi->rx_user_buffer_head); - /* parrot the close packet payload back */ - n = libwebsocket_write(wsi, (unsigned char *) - &wsi->rx_user_buffer[LWS_SEND_BUFFER_PRE_PADDING], - wsi->rx_user_buffer_head, LWS_WRITE_CLOSE); - debug("client writing close ack returned %d\n", n); - wsi->state = WSI_STATE_RETURNED_CLOSE_ALREADY; - /* close the connection */ - return -1; - - case LWS_WS_OPCODE_07__PING: - /* parrot the ping packet payload back as a pong*/ - n = libwebsocket_write(wsi, (unsigned char *) - &wsi->rx_user_buffer[LWS_SEND_BUFFER_PRE_PADDING], - wsi->rx_user_buffer_head, LWS_WRITE_PONG); - handled = 1; - break; - - case LWS_WS_OPCODE_07__PONG: - /* keep the statistics... */ - wsi->pings_vs_pongs--; - - /* issue it */ - callback_action = LWS_CALLBACK_CLIENT_RECEIVE_PONG; - break; - - case LWS_WS_OPCODE_07__CONTINUATION: - case LWS_WS_OPCODE_07__TEXT_FRAME: - case LWS_WS_OPCODE_07__BINARY_FRAME: - break; - - default: - - debug("Reserved opcode 0x%2X\n", wsi->opcode); - /* - * It's something special we can't understand here. - * Pass the payload up to the extension's parsing - * state machine. - */ - - eff_buf.token = &wsi->rx_user_buffer[ - LWS_SEND_BUFFER_PRE_PADDING]; - eff_buf.token_len = wsi->rx_user_buffer_head; - - for (n = 0; n < wsi->count_active_extensions; n++) { - m = wsi->active_extensions[n]->callback( - wsi->protocol->owning_server, - wsi->active_extensions[n], wsi, - LWS_EXT_CALLBACK_EXTENDED_PAYLOAD_RX, - wsi->active_extensions_user[n], - &eff_buf, 0); - if (m) - handled = 1; - } - - if (!handled) { - fprintf(stderr, "Unhandled extended opcode " - "0x%x - ignoring frame\n", wsi->opcode); - wsi->rx_user_buffer_head = 0; - - return 0; - } - - break; - } - - /* - * No it's real payload, pass it up to the user callback. - * It's nicely buffered with the pre-padding taken care of - * so it can be sent straight out again using libwebsocket_write - */ - - if (!handled && wsi->protocol->callback) - wsi->protocol->callback(wsi->protocol->owning_server, - wsi, callback_action, - wsi->user_space, - &wsi->rx_user_buffer[LWS_SEND_BUFFER_PRE_PADDING], - wsi->rx_user_buffer_head); - wsi->rx_user_buffer_head = 0; - break; - default: - fprintf(stderr, "client rx illegal state\n"); - return 1; - } - - return 0; - -illegal_ctl_length: - - fprintf(stderr, "Control frame asking for " - "extended length is illegal\n"); - /* kill the connection */ - return -1; - -} - - - -int libwebsocket_interpret_incoming_packet(struct libwebsocket *wsi, - unsigned char *buf, size_t len) -{ - int n; - -#ifdef DEBUG - fprintf(stderr, "received %d byte packet\n", (int)len); - for (n = 0; n < len; n++) - fprintf(stderr, "%02X ", buf[n]); - fprintf(stderr, "\n"); -#endif - - /* let the rx protocol state machine have as much as it needs */ - - n = 0; - while (n < len) - if (libwebsocket_rx_sm(wsi, buf[n++]) < 0) - return -1; - - return 0; -} - - -static int -libwebsocket_0405_frame_mask_generate(struct libwebsocket *wsi) -{ - char buf[4 + 20]; - int n; - - /* fetch the per-frame nonce */ - - n = libwebsockets_get_random(wsi->protocol->owning_server, - wsi->frame_masking_nonce_04, 4); - if (n != 4) { - fprintf(stderr, "Unable to read from random device %s %d\n", - SYSTEM_RANDOM_FILEPATH, n); - return 1; - } - - /* start masking from first byte of masking key buffer */ - wsi->frame_mask_index = 0; - - if (wsi->ietf_spec_revision != 4) - return 0; - - /* 04 only does SHA-1 more complex key */ - - /* - * the frame key is the frame nonce (4 bytes) followed by the - * connection masking key, hashed by SHA1 - */ - - memcpy(buf, wsi->frame_masking_nonce_04, 4); - - memcpy(buf + 4, wsi->masking_key_04, 20); - - /* concatenate the nonce with the connection key then hash it */ - - SHA1((unsigned char *)buf, 4 + 20, wsi->frame_mask_04); - - return 0; -} - -void lws_stderr_hexdump(unsigned char *buf, size_t len) -{ - int n; - int m; - int start; - - fprintf(stderr, "\n"); - - for (n = 0; n < len;) { - start = n; - - fprintf(stderr, "%04X: ", start); - - for (m = 0; m < 16 && n < len; m++) - fprintf(stderr, "%02X ", buf[n++]); - while (m++ < 16) - fprintf(stderr, " "); - - fprintf(stderr, " "); - - for (m = 0; m < 16 && (start + m) < len; m++) { - if (buf[start + m] >= ' ' && buf[start + m] <= 127) - fprintf(stderr, "%c", buf[start + m]); - else - fprintf(stderr, "."); - } - while (m++ < 16) - fprintf(stderr, " "); - - fprintf(stderr, "\n"); - } - fprintf(stderr, "\n"); -} - -int lws_issue_raw(struct libwebsocket *wsi, unsigned char *buf, size_t len) -{ - int n; - int m; - - /* - * one of the extensions is carrying our data itself? Like mux? - */ - - for (n = 0; n < wsi->count_active_extensions; n++) { - /* - * there can only be active extensions after handshake completed - * so we can rely on protocol being set already in here - */ - m = wsi->active_extensions[n]->callback( - wsi->protocol->owning_server, - wsi->active_extensions[n], wsi, - LWS_EXT_CALLBACK_PACKET_TX_DO_SEND, - wsi->active_extensions_user[n], &buf, len); - if (m < 0) { - fprintf(stderr, "Extension reports fatal error\n"); - return -1; - } - if (m) /* handled */ { -/* fprintf(stderr, "ext sent it\n"); */ - return 0; - } - } - - if (!wsi->sock) - fprintf(stderr, "** error 0 sock but expected to send\n"); - - /* - * nope, send it on the socket directly - */ - -#if 0 - fprintf(stderr, " TX: "); - lws_stderr_hexdump(buf, len); -#endif - -#ifdef LWS_OPENSSL_SUPPORT - if (wsi->ssl) { - n = SSL_write(wsi->ssl, buf, len); - if (n < 0) { - fprintf(stderr, - "ERROR writing to socket\n"); - return -1; - } - } else { -#endif - n = send(wsi->sock, buf, len, MSG_NOSIGNAL); - if (n < 0) { - fprintf(stderr, - "ERROR writing to socket\n"); - return -1; - } -#ifdef LWS_OPENSSL_SUPPORT - } -#endif - return 0; -} - -int -lws_issue_raw_ext_access(struct libwebsocket *wsi, - unsigned char *buf, size_t len) -{ - int ret; - struct lws_tokens eff_buf; - int m; - int n; - - eff_buf.token = (char *)buf; - eff_buf.token_len = len; - - /* - * while we have original buf to spill ourselves, or extensions report - * more in their pipeline - */ - - ret = 1; - while (ret == 1) { - - /* default to nobody has more to spill */ - - ret = 0; - - /* show every extension the new incoming data */ - - for (n = 0; n < wsi->count_active_extensions; n++) { - m = wsi->active_extensions[n]->callback( - wsi->protocol->owning_server, - wsi->active_extensions[n], wsi, - LWS_EXT_CALLBACK_PACKET_TX_PRESEND, - wsi->active_extensions_user[n], &eff_buf, 0); - if (m < 0) { - fprintf(stderr, "Extension: fatal error\n"); - return -1; - } - if (m) - /* - * at least one extension told us he has more - * to spill, so we will go around again after - */ - ret = 1; - } - - /* assuming they left us something to send, send it */ - - if (eff_buf.token_len) - if (lws_issue_raw(wsi, (unsigned char *)eff_buf.token, - eff_buf.token_len)) - return -1; - - /* we used up what we had */ - - eff_buf.token = NULL; - eff_buf.token_len = 0; - - /* - * Did that leave the pipe choked? - */ - - if (!lws_send_pipe_choked(wsi)) - /* no we could add more */ - continue; - - debug("choked\n"); - - /* - * Yes, he's choked. Don't spill the rest now get a callback - * when he is ready to send and take care of it there - */ - libwebsocket_callback_on_writable( - wsi->protocol->owning_server, wsi); - wsi->extension_data_pending = 1; - ret = 0; - } - - debug("written %d bytes to client\n", eff_buf.token_len); - - return 0; -} - -/** - * libwebsocket_write() - Apply protocol then write data to client - * @wsi: Websocket instance (available from user callback) - * @buf: The data to send. For data being sent on a websocket - * connection (ie, not default http), this buffer MUST have - * LWS_SEND_BUFFER_PRE_PADDING bytes valid BEFORE the pointer - * and an additional LWS_SEND_BUFFER_POST_PADDING bytes valid - * in the buffer after (buf + len). This is so the protocol - * header and trailer data can be added in-situ. - * @len: Count of the data bytes in the payload starting from buf - * @protocol: Use LWS_WRITE_HTTP to reply to an http connection, and one - * of LWS_WRITE_BINARY or LWS_WRITE_TEXT to send appropriate - * data on a websockets connection. Remember to allow the extra - * bytes before and after buf if LWS_WRITE_BINARY or LWS_WRITE_TEXT - * are used. - * - * This function provides the way to issue data back to the client - * for both http and websocket protocols. - * - * In the case of sending using websocket protocol, be sure to allocate - * valid storage before and after buf as explained above. This scheme - * allows maximum efficiency of sending data and protocol in a single - * packet while not burdening the user code with any protocol knowledge. - */ - -int libwebsocket_write(struct libwebsocket *wsi, unsigned char *buf, - size_t len, enum libwebsocket_write_protocol protocol) -{ - int n; - int pre = 0; - int post = 0; - int shift = 7; - int masked7 = wsi->mode == LWS_CONNMODE_WS_CLIENT && - wsi->xor_mask != xor_no_mask; - unsigned char *dropmask = NULL; - unsigned char is_masked_bit = 0; - - if (len == 0 && protocol != LWS_WRITE_CLOSE) { - fprintf(stderr, "zero length libwebsocket_write attempt\n"); - return 0; - } - - if (protocol == LWS_WRITE_HTTP) - goto send_raw; - - /* websocket protocol, either binary or text */ - - if (wsi->state != WSI_STATE_ESTABLISHED) - return -1; - - switch (wsi->ietf_spec_revision) { - /* chrome likes this as of 30 Oct 2010 */ - /* Firefox 4.0b6 likes this as of 30 Oct 2010 */ - case 0: - if ((protocol & 0xf) == LWS_WRITE_BINARY) { - /* in binary mode we send 7-bit used length blocks */ - pre = 1; - while (len & (127 << shift)) { - pre++; - shift += 7; - } - n = 0; - shift -= 7; - while (shift >= 0) { - if (shift) - buf[0 - pre + n] = - ((len >> shift) & 127) | 0x80; - else - buf[0 - pre + n] = - ((len >> shift) & 127); - n++; - shift -= 7; - } - break; - } - - /* frame type = text, length-free spam mode */ - - pre = 1; - buf[-pre] = 0; - buf[len] = 0xff; /* EOT marker */ - post = 1; - break; - - case 7: - case 8: - case 13: - if (masked7) { - pre += 4; - dropmask = &buf[0 - pre]; - is_masked_bit = 0x80; - } - /* fallthru */ - case 4: - case 5: - case 6: - switch (protocol & 0xf) { - case LWS_WRITE_TEXT: - if (wsi->ietf_spec_revision < 7) - n = LWS_WS_OPCODE_04__TEXT_FRAME; - else - n = LWS_WS_OPCODE_07__TEXT_FRAME; - break; - case LWS_WRITE_BINARY: - if (wsi->ietf_spec_revision < 7) - n = LWS_WS_OPCODE_04__BINARY_FRAME; - else - n = LWS_WS_OPCODE_07__BINARY_FRAME; - break; - case LWS_WRITE_CONTINUATION: - if (wsi->ietf_spec_revision < 7) - n = LWS_WS_OPCODE_04__CONTINUATION; - else - n = LWS_WS_OPCODE_07__CONTINUATION; - break; - - case LWS_WRITE_CLOSE: - if (wsi->ietf_spec_revision < 7) - n = LWS_WS_OPCODE_04__CLOSE; - else - n = LWS_WS_OPCODE_07__CLOSE; - - /* - * v5 mandates the first byte of close packet - * in both client and server directions - */ - - switch (wsi->ietf_spec_revision) { - case 0: - case 4: - break; - case 5: - /* we can do this because we demand post-buf */ - - if (len < 1) - len = 1; - - switch (wsi->mode) { - case LWS_CONNMODE_WS_SERVING: - /* - fprintf(stderr, "LWS_WRITE_CLOSE S\n"); - */ - buf[0] = 'S'; - break; - case LWS_CONNMODE_WS_CLIENT: - /* - fprintf(stderr, "LWS_WRITE_CLOSE C\n"); - */ - buf[0] = 'C'; - break; - default: - break; - } - break; - default: - /* - * 06 has a 2-byte status code in network order - * we can do this because we demand post-buf - */ - - if (wsi->close_reason) { - /* reason codes count as data bytes */ - buf -= 2; - buf[0] = wsi->close_reason >> 8; - buf[1] = wsi->close_reason; - len += 2; - } - break; - } - break; - case LWS_WRITE_PING: - if (wsi->ietf_spec_revision < 7) - n = LWS_WS_OPCODE_04__PING; - else - n = LWS_WS_OPCODE_07__PING; - - wsi->pings_vs_pongs++; - break; - case LWS_WRITE_PONG: - if (wsi->ietf_spec_revision < 7) - n = LWS_WS_OPCODE_04__PONG; - else - n = LWS_WS_OPCODE_07__PONG; - break; - default: - fprintf(stderr, "libwebsocket_write: unknown write " - "opcode / protocol\n"); - return -1; - } - - if (!(protocol & LWS_WRITE_NO_FIN)) - n |= 1 << 7; - - if (len < 126) { - pre += 2; - buf[-pre] = n; - buf[-pre + 1] = len | is_masked_bit; - } else { - if (len < 65536) { - pre += 4; - buf[-pre] = n; - buf[-pre + 1] = 126 | is_masked_bit; - buf[-pre + 2] = len >> 8; - buf[-pre + 3] = len; - } else { - pre += 10; - buf[-pre] = n; - buf[-pre + 1] = 127 | is_masked_bit; -#if defined __LP64__ - buf[-pre + 2] = (len >> 56) & 0x7f; - buf[-pre + 3] = len >> 48; - buf[-pre + 4] = len >> 40; - buf[-pre + 5] = len >> 32; -#else - buf[-pre + 2] = 0; - buf[-pre + 3] = 0; - buf[-pre + 4] = 0; - buf[-pre + 5] = 0; -#endif - buf[-pre + 6] = len >> 24; - buf[-pre + 7] = len >> 16; - buf[-pre + 8] = len >> 8; - buf[-pre + 9] = len; - } - } - break; - } - - /* - * Deal with masking if we are in client -> server direction and - * the protocol demands it - */ - - if (wsi->mode == LWS_CONNMODE_WS_CLIENT && - wsi->ietf_spec_revision >= 4) { - - /* - * this is only useful for security tests where it's required - * to control the raw packet payload content - */ - - if (!(protocol & LWS_WRITE_CLIENT_IGNORE_XOR_MASK) && - wsi->xor_mask != xor_no_mask) { - - if (libwebsocket_0405_frame_mask_generate(wsi)) { - fprintf(stderr, "libwebsocket_write: " - "frame mask generation failed\n"); - return 1; - } - - - if (wsi->ietf_spec_revision < 7) - /* - * use the XOR masking against everything we - * send past the frame key - */ - for (n = -pre; n < ((int)len + post); n++) - buf[n] = wsi->xor_mask(wsi, buf[n]); - else - /* - * in v7, just mask the payload - */ - for (n = 0; n < (int)len; n++) - dropmask[n + 4] = - wsi->xor_mask(wsi, dropmask[n + 4]); - - - if (wsi->ietf_spec_revision < 7) { - /* make space for the frame nonce in clear */ - pre += 4; - - dropmask = &buf[0 - pre]; - } - - if (dropmask) - /* copy the frame nonce into place */ - memcpy(dropmask, - wsi->frame_masking_nonce_04, 4); - - } else { - if (wsi->ietf_spec_revision < 7) { - - /* make space for the frame nonce in clear */ - pre += 4; - - buf[0 - pre] = 0; - buf[1 - pre] = 0; - buf[2 - pre] = 0; - buf[3 - pre] = 0; - } else { - if (dropmask && wsi->xor_mask != xor_no_mask) { - dropmask[0] = 0; - dropmask[1] = 0; - dropmask[2] = 0; - dropmask[3] = 0; - } - } - } - - } - -send_raw: - -#if 0 - fprintf(stderr, "send %ld: ", len + post); - for (n = -pre; n < ((int)len + post); n++) - fprintf(stderr, "%02X ", buf[n]); - - fprintf(stderr, "\n"); -#endif - - if (protocol == LWS_WRITE_HTTP) { - if (lws_issue_raw(wsi, (unsigned char *)buf - pre, - len + pre + post)) - return -1; - - return 0; - } - - /* - * give any active extensions a chance to munge the buffer - * before send. We pass in a pointer to an lws_tokens struct - * prepared with the default buffer and content length that's in - * there. Rather than rewrite the default buffer, extensions - * that expect to grow the buffer can adapt .token to - * point to their own per-connection buffer in the extension - * user allocation. By default with no extensions or no - * extension callback handling, just the normal input buffer is - * used then so it is efficient. - * - * callback returns 1 in case it wants to spill more buffers - */ - - return lws_issue_raw_ext_access(wsi, buf - pre, len + pre + post); -} - - -/** - * libwebsockets_serve_http_file() - Send a file back to the client using http - * @wsi: Websocket instance (available from user callback) - * @file: The file to issue over http - * @content_type: The http content type, eg, text/html - * - * This function is intended to be called from the callback in response - * to http requests from the client. It allows the callback to issue - * local files down the http link in a single step. - */ - -int libwebsockets_serve_http_file(struct libwebsocket *wsi, const char *file, - const char *content_type) -{ - int fd; - struct stat stat_buf; - char buf[512]; - char *p = buf; - int n; - -#ifdef WIN32 - fd = open(file, O_RDONLY | _O_BINARY); -#else - fd = open(file, O_RDONLY); -#endif - if (fd < 1) { - p += sprintf(p, "HTTP/1.0 400 Bad\x0d\x0a" - "Server: libwebsockets\x0d\x0a" - "\x0d\x0a" - ); - libwebsocket_write(wsi, (unsigned char *)buf, p - buf, - LWS_WRITE_HTTP); - - return -1; - } - - fstat(fd, &stat_buf); - p += sprintf(p, "HTTP/1.0 200 OK\x0d\x0a" - "Server: libwebsockets\x0d\x0a" - "Content-Type: %s\x0d\x0a" - "Content-Length: %u\x0d\x0a" - "\x0d\x0a", content_type, - (unsigned int)stat_buf.st_size); - - libwebsocket_write(wsi, (unsigned char *)buf, p - buf, LWS_WRITE_HTTP); - - n = 1; - while (n > 0) { - n = read(fd, buf, 512); - if (n <= 0) - continue; - libwebsocket_write(wsi, (unsigned char *)buf, n, - LWS_WRITE_HTTP); - } - - close(fd); - - return 0; -} - - -/** - * libwebsockets_remaining_packet_payload() - Bytes to come before "overall" - * rx packet is complete - * @wsi: Websocket instance (available from user callback) - * - * This function is intended to be called from the callback if the - * user code is interested in "complete packets" from the client. - * libwebsockets just passes through payload as it comes and issues a buffer - * additionally when it hits a built-in limit. The LWS_CALLBACK_RECEIVE - * callback handler can use this API to find out if the buffer it has just - * been given is the last piece of a "complete packet" from the client -- - * when that is the case libwebsockets_remaining_packet_payload() will return - * 0. - * - * Many protocols won't care becuse their packets are always small. - */ - -size_t -libwebsockets_remaining_packet_payload(struct libwebsocket *wsi) -{ - return wsi->rx_packet_length; -} diff --git a/libs/libwebsockets/lib/private-libwebsockets.h b/libs/libwebsockets/lib/private-libwebsockets.h deleted file mode 100644 index 3c9776fd86..0000000000 --- a/libs/libwebsockets/lib/private-libwebsockets.h +++ /dev/null @@ -1,445 +0,0 @@ -/* - * libwebsockets - small server side websockets and web server implementation - * - * Copyright (C) 2010 Andy Green - * - * This 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: - * version 2.1 of the License. - * - * This 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 this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301 USA - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#ifdef __MINGW64__ -#else -#ifdef __MINGW32__ -#else -#include -#endif -#endif -#include - -#include - -#ifdef WIN32 -#ifdef __MINGW64__ -#else -#ifdef __MINGW32__ -#else -#include -#endif -#endif -#include -#include -#include - -#else - -#include -#include -#ifndef LWS_NO_FORK -#ifdef HAVE_SYS_PRCTL_H -#include -#endif -#endif -#include -#include -#include - -#include -#include -#include - -#endif - -#ifdef LWS_OPENSSL_SUPPORT -#include -#include -#include -#include -#include -#endif - - -#include "libwebsockets.h" - -#if 0 -#define DEBUG -#endif - -#ifdef DEBUG -#ifdef WIN32 -static -#else -static inline -#endif -void debug(const char *format, ...) -{ - va_list ap; - va_start(ap, format); vfprintf(stderr, format, ap); va_end(ap); -} -#else -#ifdef WIN32 -static -#else -static inline -#endif -void debug(const char *format, ...) -{ -} -#endif - - -/* - * Mac OSX as well as iOS do not define the MSG_NOSIGNAL flag, - * but happily have something equivalent in the SO_NOSIGPIPE flag. - */ -#ifdef __APPLE__ -#define MSG_NOSIGNAL SO_NOSIGPIPE -#endif - - -#define FD_HASHTABLE_MODULUS 32 -#define MAX_CLIENTS 100 -#define LWS_MAX_HEADER_NAME_LENGTH 64 -#define LWS_MAX_HEADER_LEN 4096 -#define LWS_INITIAL_HDR_ALLOC 256 -#define LWS_ADDITIONAL_HDR_ALLOC 64 -#define MAX_USER_RX_BUFFER 4096 -#define MAX_BROADCAST_PAYLOAD 2048 -#define LWS_MAX_PROTOCOLS 10 -#define LWS_MAX_EXTENSIONS_ACTIVE 10 -#define SPEC_LATEST_SUPPORTED 13 - -#define MAX_WEBSOCKET_04_KEY_LEN 128 -#define SYSTEM_RANDOM_FILEPATH "/dev/urandom" - -enum lws_websocket_opcodes_04 { - LWS_WS_OPCODE_04__CONTINUATION = 0, - LWS_WS_OPCODE_04__CLOSE = 1, - LWS_WS_OPCODE_04__PING = 2, - LWS_WS_OPCODE_04__PONG = 3, - LWS_WS_OPCODE_04__TEXT_FRAME = 4, - LWS_WS_OPCODE_04__BINARY_FRAME = 5, - - LWS_WS_OPCODE_04__RESERVED_6 = 6, - LWS_WS_OPCODE_04__RESERVED_7 = 7, - LWS_WS_OPCODE_04__RESERVED_8 = 8, - LWS_WS_OPCODE_04__RESERVED_9 = 9, - LWS_WS_OPCODE_04__RESERVED_A = 0xa, - LWS_WS_OPCODE_04__RESERVED_B = 0xb, - LWS_WS_OPCODE_04__RESERVED_C = 0xc, - LWS_WS_OPCODE_04__RESERVED_D = 0xd, - LWS_WS_OPCODE_04__RESERVED_E = 0xe, - LWS_WS_OPCODE_04__RESERVED_F = 0xf, -}; - -enum lws_websocket_opcodes_07 { - LWS_WS_OPCODE_07__CONTINUATION = 0, - LWS_WS_OPCODE_07__TEXT_FRAME = 1, - LWS_WS_OPCODE_07__BINARY_FRAME = 2, - - LWS_WS_OPCODE_07__NOSPEC__MUX = 7, - - /* control extensions 8+ */ - - LWS_WS_OPCODE_07__CLOSE = 8, - LWS_WS_OPCODE_07__PING = 9, - LWS_WS_OPCODE_07__PONG = 0xa, -}; - - -enum lws_connection_states { - WSI_STATE_HTTP, - WSI_STATE_HTTP_HEADERS, - WSI_STATE_DEAD_SOCKET, - WSI_STATE_ESTABLISHED, - WSI_STATE_CLIENT_UNCONNECTED, - WSI_STATE_RETURNED_CLOSE_ALREADY, - WSI_STATE_AWAITING_CLOSE_ACK, -}; - -enum lws_rx_parse_state { - LWS_RXPS_NEW, - - LWS_RXPS_SEEN_76_FF, - LWS_RXPS_PULLING_76_LENGTH, - LWS_RXPS_EAT_UNTIL_76_FF, - - LWS_RXPS_04_MASK_NONCE_1, - LWS_RXPS_04_MASK_NONCE_2, - LWS_RXPS_04_MASK_NONCE_3, - - LWS_RXPS_04_FRAME_HDR_1, - LWS_RXPS_04_FRAME_HDR_LEN, - LWS_RXPS_04_FRAME_HDR_LEN16_2, - LWS_RXPS_04_FRAME_HDR_LEN16_1, - LWS_RXPS_04_FRAME_HDR_LEN64_8, - LWS_RXPS_04_FRAME_HDR_LEN64_7, - LWS_RXPS_04_FRAME_HDR_LEN64_6, - LWS_RXPS_04_FRAME_HDR_LEN64_5, - LWS_RXPS_04_FRAME_HDR_LEN64_4, - LWS_RXPS_04_FRAME_HDR_LEN64_3, - LWS_RXPS_04_FRAME_HDR_LEN64_2, - LWS_RXPS_04_FRAME_HDR_LEN64_1, - - LWS_RXPS_07_COLLECT_FRAME_KEY_1, - LWS_RXPS_07_COLLECT_FRAME_KEY_2, - LWS_RXPS_07_COLLECT_FRAME_KEY_3, - LWS_RXPS_07_COLLECT_FRAME_KEY_4, - - LWS_RXPS_PAYLOAD_UNTIL_LENGTH_EXHAUSTED -}; - - -enum connection_mode { - LWS_CONNMODE_WS_SERVING, - LWS_CONNMODE_WS_CLIENT, - - /* transient modes */ - LWS_CONNMODE_WS_CLIENT_WAITING_PROXY_REPLY, - LWS_CONNMODE_WS_CLIENT_ISSUE_HANDSHAKE, - LWS_CONNMODE_WS_CLIENT_WAITING_SERVER_REPLY, - LWS_CONNMODE_WS_CLIENT_WAITING_EXTENSION_CONNECT, - LWS_CONNMODE_WS_CLIENT_PENDING_CANDIDATE_CHILD, - - /* special internal types */ - LWS_CONNMODE_SERVER_LISTENER, - LWS_CONNMODE_BROADCAST_PROXY_LISTENER, - LWS_CONNMODE_BROADCAST_PROXY -}; - - -#define LWS_FD_HASH(fd) ((fd ^ (fd >> 8) ^ (fd >> 16)) % FD_HASHTABLE_MODULUS) - -struct libwebsocket_fd_hashtable { - struct libwebsocket *wsi[MAX_CLIENTS + 1]; - int length; -}; - -struct libwebsocket_protocols; - -struct libwebsocket_context { - struct libwebsocket_fd_hashtable fd_hashtable[FD_HASHTABLE_MODULUS]; - struct pollfd fds[MAX_CLIENTS * FD_HASHTABLE_MODULUS + 1]; - int fds_count; - int listen_port; - char http_proxy_address[256]; - char canonical_hostname[1024]; - unsigned int http_proxy_port; - unsigned int options; - unsigned long last_timeout_check_s; - - int fd_random; - -#ifdef LWS_OPENSSL_SUPPORT - int use_ssl; - SSL_CTX *ssl_ctx; - SSL_CTX *ssl_client_ctx; -#endif - struct libwebsocket_protocols *protocols; - int count_protocols; - struct libwebsocket_extension *extensions; -}; - - -enum pending_timeout { - NO_PENDING_TIMEOUT = 0, - PENDING_TIMEOUT_AWAITING_PROXY_RESPONSE, - PENDING_TIMEOUT_ESTABLISH_WITH_SERVER, - PENDING_TIMEOUT_AWAITING_SERVER_RESPONSE, - PENDING_TIMEOUT_AWAITING_PING, - PENDING_TIMEOUT_CLOSE_ACK, - PENDING_TIMEOUT_AWAITING_EXTENSION_CONNECT_RESPONSE, -}; - - -/* - * This is totally opaque to code using the library. It's exported as a - * forward-reference pointer-only declaration; the user can use the pointer with - * other APIs to get information out of it. - */ - -struct libwebsocket { - const struct libwebsocket_protocols *protocol; - struct libwebsocket_extension * - active_extensions[LWS_MAX_EXTENSIONS_ACTIVE]; - void *active_extensions_user[LWS_MAX_EXTENSIONS_ACTIVE]; - int count_active_extensions; - - enum lws_connection_states state; - - char name_buffer[LWS_MAX_HEADER_NAME_LENGTH]; - int name_buffer_pos; - int current_alloc_len; - enum lws_token_indexes parser_state; - struct lws_tokens utf8_token[WSI_TOKEN_COUNT]; - int ietf_spec_revision; - char rx_user_buffer[LWS_SEND_BUFFER_PRE_PADDING + MAX_USER_RX_BUFFER + - LWS_SEND_BUFFER_POST_PADDING]; - int rx_user_buffer_head; - enum libwebsocket_write_protocol rx_frame_type; - int protocol_index_for_broadcast_proxy; - enum pending_timeout pending_timeout; - unsigned long pending_timeout_limit; - - int sock; - - enum lws_rx_parse_state lws_rx_parse_state; - char extension_data_pending; - struct libwebsocket *candidate_children_list; - struct libwebsocket *extension_handles; - - /* 04 protocol specific */ - - char key_b64[150]; - unsigned char masking_key_04[20]; - unsigned char frame_masking_nonce_04[4]; - unsigned char frame_mask_04[20]; - unsigned char frame_mask_index; - size_t rx_packet_length; - unsigned char opcode; - unsigned char final; - - int pings_vs_pongs; - unsigned char (*xor_mask)(struct libwebsocket *, unsigned char); - char all_zero_nonce; - - enum lws_close_status close_reason; - - /* 07 specific */ - char this_frame_masked; - - /* client support */ - char initial_handshake_hash_base64[30]; - enum connection_mode mode; - char *c_path; - char *c_host; - char *c_origin; - char *c_protocol; - callback_function *c_callback; - - char *c_address; - int c_port; - - -#ifdef LWS_OPENSSL_SUPPORT - SSL *ssl; - BIO *client_bio; - int use_ssl; -#endif - - void *user_space; -}; - -extern int -libwebsocket_client_rx_sm(struct libwebsocket *wsi, unsigned char c); - -extern int -libwebsocket_parse(struct libwebsocket *wsi, unsigned char c); - -extern int -libwebsocket_interpret_incoming_packet(struct libwebsocket *wsi, - unsigned char *buf, size_t len); - -extern int -libwebsocket_read(struct libwebsocket_context *context, - struct libwebsocket *wsi, - unsigned char *buf, size_t len); - -extern int -lws_b64_selftest(void); - -extern unsigned char -xor_no_mask(struct libwebsocket *wsi, unsigned char c); - -extern unsigned char -xor_mask_04(struct libwebsocket *wsi, unsigned char c); - -extern unsigned char -xor_mask_05(struct libwebsocket *wsi, unsigned char c); - -extern struct libwebsocket * -wsi_from_fd(struct libwebsocket_context *context, int fd); - -extern int -insert_wsi(struct libwebsocket_context *context, struct libwebsocket *wsi); - -extern int -delete_from_fd(struct libwebsocket_context *context, int fd); - -extern void -libwebsocket_set_timeout(struct libwebsocket *wsi, - enum pending_timeout reason, int secs); - -extern int -lws_issue_raw(struct libwebsocket *wsi, unsigned char *buf, size_t len); - - -extern void -libwebsocket_service_timeout_check(struct libwebsocket_context *context, - struct libwebsocket *wsi, unsigned int sec); - -extern struct libwebsocket * -__libwebsocket_client_connect_2(struct libwebsocket_context *context, - struct libwebsocket *wsi); - -extern struct libwebsocket * -libwebsocket_create_new_server_wsi(struct libwebsocket_context *context); - -extern char * -libwebsockets_generate_client_handshake(struct libwebsocket_context *context, - struct libwebsocket *wsi, char *pkt); - -extern int -lws_handle_POLLOUT_event(struct libwebsocket_context *context, - struct libwebsocket *wsi, struct pollfd *pollfd); - -extern int -lws_any_extension_handled(struct libwebsocket_context *context, - struct libwebsocket *wsi, - enum libwebsocket_extension_callback_reasons r, - void *v, size_t len); - -extern void * -lws_get_extension_user_matching_ext(struct libwebsocket *wsi, - struct libwebsocket_extension *ext); - -extern int -lws_client_interpret_server_handshake(struct libwebsocket_context *context, - struct libwebsocket *wsi); - -extern int -libwebsocket_rx_sm(struct libwebsocket *wsi, unsigned char c); - -extern int -lws_issue_raw_ext_access(struct libwebsocket *wsi, - unsigned char *buf, size_t len); - -#ifndef LWS_OPENSSL_SUPPORT - -unsigned char * -SHA1(const unsigned char *d, size_t n, unsigned char *md); - -void -MD5(const unsigned char *input, int ilen, unsigned char *output); - -#endif diff --git a/libs/libwebsockets/lib/sha-1.c b/libs/libwebsockets/lib/sha-1.c deleted file mode 100644 index f30f3ed63b..0000000000 --- a/libs/libwebsockets/lib/sha-1.c +++ /dev/null @@ -1,326 +0,0 @@ -/* - * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the project nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -/* - * FIPS pub 180-1: Secure Hash Algorithm (SHA-1) - * based on: http://csrc.nist.gov/fips/fip180-1.txt - * implemented by Jun-ichiro itojun Itoh - */ - -#include -#ifdef WIN32 - -#ifndef BIG_ENDIAN -#define BIG_ENDIAN 4321 /* to show byte order (taken from gcc) */ -#endif -#ifndef LITTLE_ENDIAN -#define LITTLE_ENDIAN 1234 -#endif -#ifndef BYTE_ORDER -#define BYTE_ORDER LITTLE_ENDIAN -#endif - -typedef unsigned __int64 u_int64_t; - -#undef __P -#ifndef __P -#if __STDC__ -#define __P(protos) protos -#else -#define __P(protos) () -#endif -#endif - -#define bzero(b, len) (memset((b), '\0', (len)), (void) 0) - -#else -#include -#include -#include -#endif - -#include - -struct sha1_ctxt { - union { - unsigned char b8[20]; - unsigned int b32[5]; - } h; - union { - unsigned char b8[8]; - u_int64_t b64[1]; - } c; - union { - unsigned char b8[64]; - unsigned int b32[16]; - } m; - unsigned char count; -}; - -/* sanity check */ -#if BYTE_ORDER != BIG_ENDIAN -# if BYTE_ORDER != LITTLE_ENDIAN -# define unsupported 1 -# endif -#endif - -#ifndef unsupported - -/* constant table */ -static unsigned int _K[] = { 0x5a827999, 0x6ed9eba1, 0x8f1bbcdc, 0xca62c1d6 }; -#define K(t) _K[(t) / 20] - -#define F0(b, c, d) (((b) & (c)) | ((~(b)) & (d))) -#define F1(b, c, d) (((b) ^ (c)) ^ (d)) -#define F2(b, c, d) (((b) & (c)) | ((b) & (d)) | ((c) & (d))) -#define F3(b, c, d) (((b) ^ (c)) ^ (d)) - -#define S(n, x) (((x) << (n)) | ((x) >> (32 - n))) - -#define H(n) (ctxt->h.b32[(n)]) -#define COUNT (ctxt->count) -#define BCOUNT (ctxt->c.b64[0] / 8) -#define W(n) (ctxt->m.b32[(n)]) - -#define PUTBYTE(x) { \ - ctxt->m.b8[(COUNT % 64)] = (x); \ - COUNT++; \ - COUNT %= 64; \ - ctxt->c.b64[0] += 8; \ - if (COUNT % 64 == 0) \ - sha1_step(ctxt); \ - } - -#define PUTPAD(x) { \ - ctxt->m.b8[(COUNT % 64)] = (x); \ - COUNT++; \ - COUNT %= 64; \ - if (COUNT % 64 == 0) \ - sha1_step(ctxt); \ - } - -static void sha1_step __P((struct sha1_ctxt *)); - -static void -sha1_step(struct sha1_ctxt *ctxt) -{ - unsigned int a, b, c, d, e, tmp; - size_t t, s; - -#if BYTE_ORDER == LITTLE_ENDIAN - struct sha1_ctxt tctxt; - - memcpy(&tctxt.m.b8[0], &ctxt->m.b8[0], 64); - ctxt->m.b8[0] = tctxt.m.b8[3]; ctxt->m.b8[1] = tctxt.m.b8[2]; - ctxt->m.b8[2] = tctxt.m.b8[1]; ctxt->m.b8[3] = tctxt.m.b8[0]; - ctxt->m.b8[4] = tctxt.m.b8[7]; ctxt->m.b8[5] = tctxt.m.b8[6]; - ctxt->m.b8[6] = tctxt.m.b8[5]; ctxt->m.b8[7] = tctxt.m.b8[4]; - ctxt->m.b8[8] = tctxt.m.b8[11]; ctxt->m.b8[9] = tctxt.m.b8[10]; - ctxt->m.b8[10] = tctxt.m.b8[9]; ctxt->m.b8[11] = tctxt.m.b8[8]; - ctxt->m.b8[12] = tctxt.m.b8[15]; ctxt->m.b8[13] = tctxt.m.b8[14]; - ctxt->m.b8[14] = tctxt.m.b8[13]; ctxt->m.b8[15] = tctxt.m.b8[12]; - ctxt->m.b8[16] = tctxt.m.b8[19]; ctxt->m.b8[17] = tctxt.m.b8[18]; - ctxt->m.b8[18] = tctxt.m.b8[17]; ctxt->m.b8[19] = tctxt.m.b8[16]; - ctxt->m.b8[20] = tctxt.m.b8[23]; ctxt->m.b8[21] = tctxt.m.b8[22]; - ctxt->m.b8[22] = tctxt.m.b8[21]; ctxt->m.b8[23] = tctxt.m.b8[20]; - ctxt->m.b8[24] = tctxt.m.b8[27]; ctxt->m.b8[25] = tctxt.m.b8[26]; - ctxt->m.b8[26] = tctxt.m.b8[25]; ctxt->m.b8[27] = tctxt.m.b8[24]; - ctxt->m.b8[28] = tctxt.m.b8[31]; ctxt->m.b8[29] = tctxt.m.b8[30]; - ctxt->m.b8[30] = tctxt.m.b8[29]; ctxt->m.b8[31] = tctxt.m.b8[28]; - ctxt->m.b8[32] = tctxt.m.b8[35]; ctxt->m.b8[33] = tctxt.m.b8[34]; - ctxt->m.b8[34] = tctxt.m.b8[33]; ctxt->m.b8[35] = tctxt.m.b8[32]; - ctxt->m.b8[36] = tctxt.m.b8[39]; ctxt->m.b8[37] = tctxt.m.b8[38]; - ctxt->m.b8[38] = tctxt.m.b8[37]; ctxt->m.b8[39] = tctxt.m.b8[36]; - ctxt->m.b8[40] = tctxt.m.b8[43]; ctxt->m.b8[41] = tctxt.m.b8[42]; - ctxt->m.b8[42] = tctxt.m.b8[41]; ctxt->m.b8[43] = tctxt.m.b8[40]; - ctxt->m.b8[44] = tctxt.m.b8[47]; ctxt->m.b8[45] = tctxt.m.b8[46]; - ctxt->m.b8[46] = tctxt.m.b8[45]; ctxt->m.b8[47] = tctxt.m.b8[44]; - ctxt->m.b8[48] = tctxt.m.b8[51]; ctxt->m.b8[49] = tctxt.m.b8[50]; - ctxt->m.b8[50] = tctxt.m.b8[49]; ctxt->m.b8[51] = tctxt.m.b8[48]; - ctxt->m.b8[52] = tctxt.m.b8[55]; ctxt->m.b8[53] = tctxt.m.b8[54]; - ctxt->m.b8[54] = tctxt.m.b8[53]; ctxt->m.b8[55] = tctxt.m.b8[52]; - ctxt->m.b8[56] = tctxt.m.b8[59]; ctxt->m.b8[57] = tctxt.m.b8[58]; - ctxt->m.b8[58] = tctxt.m.b8[57]; ctxt->m.b8[59] = tctxt.m.b8[56]; - ctxt->m.b8[60] = tctxt.m.b8[63]; ctxt->m.b8[61] = tctxt.m.b8[62]; - ctxt->m.b8[62] = tctxt.m.b8[61]; ctxt->m.b8[63] = tctxt.m.b8[60]; -#endif - - a = H(0); b = H(1); c = H(2); d = H(3); e = H(4); - - for (t = 0; t < 20; t++) { - s = t & 0x0f; - if (t >= 16) - W(s) = S(1, W((s+13) & 0x0f) ^ W((s+8) & 0x0f) ^ - W((s+2) & 0x0f) ^ W(s)); - - tmp = S(5, a) + F0(b, c, d) + e + W(s) + K(t); - e = d; d = c; c = S(30, b); b = a; a = tmp; - } - for (t = 20; t < 40; t++) { - s = t & 0x0f; - W(s) = S(1, W((s+13) & 0x0f) ^ W((s+8) & 0x0f) ^ - W((s+2) & 0x0f) ^ W(s)); - tmp = S(5, a) + F1(b, c, d) + e + W(s) + K(t); - e = d; d = c; c = S(30, b); b = a; a = tmp; - } - for (t = 40; t < 60; t++) { - s = t & 0x0f; - W(s) = S(1, W((s+13) & 0x0f) ^ W((s+8) & 0x0f) ^ - W((s+2) & 0x0f) ^ W(s)); - tmp = S(5, a) + F2(b, c, d) + e + W(s) + K(t); - e = d; d = c; c = S(30, b); b = a; a = tmp; - } - for (t = 60; t < 80; t++) { - s = t & 0x0f; - W(s) = S(1, W((s+13) & 0x0f) ^ W((s+8) & 0x0f) ^ - W((s+2) & 0x0f) ^ W(s)); - tmp = S(5, a) + F3(b, c, d) + e + W(s) + K(t); - e = d; d = c; c = S(30, b); b = a; a = tmp; - } - - H(0) = H(0) + a; - H(1) = H(1) + b; - H(2) = H(2) + c; - H(3) = H(3) + d; - H(4) = H(4) + e; - - bzero(&ctxt->m.b8[0], 64); -} - -/*------------------------------------------------------------*/ - -void -sha1_init(struct sha1_ctxt *ctxt) -{ - bzero(ctxt, sizeof(struct sha1_ctxt)); - H(0) = 0x67452301; - H(1) = 0xefcdab89; - H(2) = 0x98badcfe; - H(3) = 0x10325476; - H(4) = 0xc3d2e1f0; -} - -void -sha1_pad(struct sha1_ctxt *ctxt) -{ - size_t padlen; /*pad length in bytes*/ - size_t padstart; - - PUTPAD(0x80); - - padstart = COUNT % 64; - padlen = 64 - padstart; - if (padlen < 8) { - bzero(&ctxt->m.b8[padstart], padlen); - COUNT += padlen; - COUNT %= 64; - sha1_step(ctxt); - padstart = COUNT % 64; /* should be 0 */ - padlen = 64 - padstart; /* should be 64 */ - } - bzero(&ctxt->m.b8[padstart], padlen - 8); - COUNT += (padlen - 8); - COUNT %= 64; -#if BYTE_ORDER == BIG_ENDIAN - PUTPAD(ctxt->c.b8[0]); PUTPAD(ctxt->c.b8[1]); - PUTPAD(ctxt->c.b8[2]); PUTPAD(ctxt->c.b8[3]); - PUTPAD(ctxt->c.b8[4]); PUTPAD(ctxt->c.b8[5]); - PUTPAD(ctxt->c.b8[6]); PUTPAD(ctxt->c.b8[7]); -#else - PUTPAD(ctxt->c.b8[7]); PUTPAD(ctxt->c.b8[6]); - PUTPAD(ctxt->c.b8[5]); PUTPAD(ctxt->c.b8[4]); - PUTPAD(ctxt->c.b8[3]); PUTPAD(ctxt->c.b8[2]); - PUTPAD(ctxt->c.b8[1]); PUTPAD(ctxt->c.b8[0]); -#endif -} - -void -sha1_loop(struct sha1_ctxt *ctxt, const unsigned char *input, size_t len) -{ - size_t gaplen; - size_t gapstart; - size_t off; - size_t copysiz; - - off = 0; - - while (off < len) { - gapstart = COUNT % 64; - gaplen = 64 - gapstart; - - copysiz = (gaplen < len - off) ? gaplen : len - off; - memcpy(&ctxt->m.b8[gapstart], &input[off], copysiz); - COUNT += copysiz; - COUNT %= 64; - ctxt->c.b64[0] += copysiz * 8; - if (COUNT % 64 == 0) - sha1_step(ctxt); - off += copysiz; - } -} - -void -sha1_result(struct sha1_ctxt *ctxt, void *digest0) -{ - unsigned char *digest; - - digest = (unsigned char *)digest0; - sha1_pad(ctxt); -#if BYTE_ORDER == BIG_ENDIAN - memcpy(digest, &ctxt->h.b8[0], 20); -#else - digest[0] = ctxt->h.b8[3]; digest[1] = ctxt->h.b8[2]; - digest[2] = ctxt->h.b8[1]; digest[3] = ctxt->h.b8[0]; - digest[4] = ctxt->h.b8[7]; digest[5] = ctxt->h.b8[6]; - digest[6] = ctxt->h.b8[5]; digest[7] = ctxt->h.b8[4]; - digest[8] = ctxt->h.b8[11]; digest[9] = ctxt->h.b8[10]; - digest[10] = ctxt->h.b8[9]; digest[11] = ctxt->h.b8[8]; - digest[12] = ctxt->h.b8[15]; digest[13] = ctxt->h.b8[14]; - digest[14] = ctxt->h.b8[13]; digest[15] = ctxt->h.b8[12]; - digest[16] = ctxt->h.b8[19]; digest[17] = ctxt->h.b8[18]; - digest[18] = ctxt->h.b8[17]; digest[19] = ctxt->h.b8[16]; -#endif -} - -/* - * This should look and work like the libcrypto implementation - */ - -unsigned char * -SHA1(const unsigned char *d, size_t n, unsigned char *md) -{ - struct sha1_ctxt ctx; - - sha1_init(&ctx); - sha1_loop(&ctx, d, n); - sha1_result(&ctx, (void *)md); - - return md; -} - -#endif /*unsupported*/ diff --git a/libs/libwebsockets/libwebsockets-api-doc.html b/libs/libwebsockets/libwebsockets-api-doc.html deleted file mode 100644 index 18b1620e50..0000000000 --- a/libs/libwebsockets/libwebsockets-api-doc.html +++ /dev/null @@ -1,933 +0,0 @@ -

libwebsockets_hangup_on_client - Server calls to terminate client connection

-void -libwebsockets_hangup_on_client -(struct libwebsocket_context * context, -int fd) -

Arguments

-
-
context -
libwebsockets context -
fd -
Connection socket descriptor -
-
-

libwebsockets_get_peer_addresses - Get client address information

-void -libwebsockets_get_peer_addresses -(int fd, -char * name, -int name_len, -char * rip, -int rip_len) -

Arguments

-
-
fd -
Connection socket descriptor -
name -
Buffer to take client address name -
name_len -
Length of client address name buffer -
rip -
Buffer to take client address IP qotted quad -
rip_len -
Length of client address IP buffer -
-

Description

-
-This function fills in name and rip with the name and IP of -the client connected with socket descriptor fd. Names may be -truncated if there is not enough room. If either cannot be -determined, they will be returned as valid zero-length strings. -
-
-

libwebsocket_service_fd - Service polled socket with something waiting

-int -libwebsocket_service_fd -(struct libwebsocket_context * context, -struct pollfd * pollfd) -

Arguments

-
-
context -
Websocket context -
pollfd -
The pollfd entry describing the socket fd and which events -happened. -
-

Description

-
-This function closes any active connections and then frees the -context. After calling this, any further use of the context is -undefined. -
-
-

libwebsocket_context_destroy - Destroy the websocket context

-void -libwebsocket_context_destroy -(struct libwebsocket_context * context) -

Arguments

-
-
context -
Websocket context -
-

Description

-
-This function closes any active connections and then frees the -context. After calling this, any further use of the context is -undefined. -
-
-

libwebsocket_service - Service any pending websocket activity

-int -libwebsocket_service -(struct libwebsocket_context * context, -int timeout_ms) -

Arguments

-
-
context -
Websocket context -
timeout_ms -
Timeout for poll; 0 means return immediately if nothing needed -service otherwise block and service immediately, returning -after the timeout if nothing needed service. -
-

Description

-
-This function deals with any pending websocket traffic, for three -kinds of event. It handles these events on both server and client -types of connection the same. -

-1) Accept new connections to our context's server -

-2) Perform pending broadcast writes initiated from other forked -processes (effectively serializing asynchronous broadcasts) -

-3) Call the receive callback for incoming frame data received by -server or client connections. -

-You need to call this service function periodically to all the above -functions to happen; if your application is single-threaded you can -just call it in your main event loop. -

-Alternatively you can fork a new process that asynchronously handles -calling this service in a loop. In that case you are happy if this -call blocks your thread until it needs to take care of something and -would call it with a large nonzero timeout. Your loop then takes no -CPU while there is nothing happening. -

-If you are calling it in a single-threaded app, you don't want it to -wait around blocking other things in your loop from happening, so you -would call it with a timeout_ms of 0, so it returns immediately if -nothing is pending, or as soon as it services whatever was pending. -

-
-

libwebsocket_callback_on_writable - Request a callback when this socket becomes able to be written to without blocking

-int -libwebsocket_callback_on_writable -(struct libwebsocket_context * context, -struct libwebsocket * wsi) -

Arguments

-
-
context -
libwebsockets context -
wsi -
Websocket connection instance to get callback for -
-
-

libwebsocket_callback_on_writable_all_protocol - Request a callback for all connections using the given protocol when it becomes possible to write to each socket without blocking in turn.

-int -libwebsocket_callback_on_writable_all_protocol -(const struct libwebsocket_protocols * protocol) -

Arguments

-
-
protocol -
Protocol whose connections will get callbacks -
-
-

libwebsocket_set_timeout - marks the wsi as subject to a timeout

-void -libwebsocket_set_timeout -(struct libwebsocket * wsi, -enum pending_timeout reason, -int secs) -

Arguments

-
-
wsi -
Websocket connection instance -
reason -
timeout reason -
secs -
how many seconds -
-

Description

-
-

-You will not need this unless you are doing something special -

-
-

libwebsocket_get_socket_fd - returns the socket file descriptor

-int -libwebsocket_get_socket_fd -(struct libwebsocket * wsi) -

Arguments

-
-
wsi -
Websocket connection instance -
-

Description

-
-

-You will not need this unless you are doing something special -

-
-

libwebsocket_rx_flow_control - Enable and disable socket servicing for receieved packets.

-int -libwebsocket_rx_flow_control -(struct libwebsocket * wsi, -int enable) -

Arguments

-
-
wsi -
Websocket connection instance to get callback for -
enable -
0 = disable read servicing for this connection, 1 = enable -
-

Description

-
-

-If the output side of a server process becomes choked, this allows flow -control for the input side. -

-
-

libwebsocket_canonical_hostname - returns this host's hostname

-const char * -libwebsocket_canonical_hostname -(struct libwebsocket_context * context) -

Arguments

-
-
context -
Websocket context -
-

Description

-
-

-This is typically used by client code to fill in the host parameter -when making a client connection. You can only call it after the context -has been created. -

-
-

libwebsocket_create_context - Create the websocket handler

-struct libwebsocket_context * -libwebsocket_create_context -(int port, -const char * interf, -struct libwebsocket_protocols * protocols, -struct libwebsocket_extension * extensions, -const char * ssl_cert_filepath, -const char * ssl_private_key_filepath, -int gid, -int uid, -unsigned int options) -

Arguments

-
-
port -
Port to listen on... you can use 0 to suppress listening on -any port, that's what you want if you are not running a -websocket server at all but just using it as a client -
interf -
NULL to bind the listen socket to all interfaces, or the -interface name, eg, "eth2" -
protocols -
Array of structures listing supported protocols and a protocol- -specific callback for each one. The list is ended with an -entry that has a NULL callback pointer. -It's not const because we write the owning_server member -
extensions -
NULL or array of libwebsocket_extension structs listing the -extensions this context supports -
ssl_cert_filepath -
If libwebsockets was compiled to use ssl, and you want -to listen using SSL, set to the filepath to fetch the -server cert from, otherwise NULL for unencrypted -
ssl_private_key_filepath -
filepath to private key if wanting SSL mode, -else ignored -
gid -
group id to change to after setting listen socket, or -1. -
uid -
user id to change to after setting listen socket, or -1. -
options -
0, or LWS_SERVER_OPTION_DEFEAT_CLIENT_MASK -
-

Description

-
-This function creates the listening socket and takes care -of all initialization in one step. -

-After initialization, it returns a struct libwebsocket_context * that -represents this server. After calling, user code needs to take care -of calling libwebsocket_service with the context pointer to get the -server's sockets serviced. This can be done in the same process context -or a forked process, or another thread, -

-The protocol callback functions are called for a handful of events -including http requests coming in, websocket connections becoming -established, and data arriving; it's also called periodically to allow -async transmission. -

-HTTP requests are sent always to the FIRST protocol in protocol, since -at that time websocket protocol has not been negotiated. Other -protocols after the first one never see any HTTP callack activity. -

-The server created is a simple http server by default; part of the -websocket standard is upgrading this http connection to a websocket one. -

-This allows the same server to provide files like scripts and favicon / -images or whatever over http and dynamic data over websockets all in -one place; they're all handled in the user callback. -

-
-

libwebsockets_fork_service_loop - Optional helper function forks off a process for the websocket server loop. You don't have to use this but if not, you have to make sure you are calling libwebsocket_service periodically to service the websocket traffic

-int -libwebsockets_fork_service_loop -(struct libwebsocket_context * context) -

Arguments

-
-
context -
server context returned by creation function -
-
-

libwebsockets_get_protocol - Returns a protocol pointer from a websocket connection.

-const struct libwebsocket_protocols * -libwebsockets_get_protocol -(struct libwebsocket * wsi) -

Arguments

-
-
wsi -
pointer to struct websocket you want to know the protocol of -
-

Description

-
-

-This is useful to get the protocol to broadcast back to from inside -the callback. -

-
-

libwebsockets_broadcast - Sends a buffer to the callback for all active connections of the given protocol.

-int -libwebsockets_broadcast -(const struct libwebsocket_protocols * protocol, -unsigned char * buf, -size_t len) -

Arguments

-
-
protocol -
pointer to the protocol you will broadcast to all members of -
buf -
buffer containing the data to be broadcase. NOTE: this has to be -allocated with LWS_SEND_BUFFER_PRE_PADDING valid bytes before -the pointer and LWS_SEND_BUFFER_POST_PADDING afterwards in the -case you are calling this function from callback context. -
len -
length of payload data in buf, starting from buf. -
-

Description

-
-This function allows bulk sending of a packet to every connection using -the given protocol. It does not send the data directly; instead it calls -the callback with a reason type of LWS_CALLBACK_BROADCAST. If the callback -wants to actually send the data for that connection, the callback itself -should call libwebsocket_write. -

-libwebsockets_broadcast can be called from another fork context without -having to take any care about data visibility between the processes, it'll -"just work". -

-
-

libwebsocket_write - Apply protocol then write data to client

-int -libwebsocket_write -(struct libwebsocket * wsi, -unsigned char * buf, -size_t len, -enum libwebsocket_write_protocol protocol) -

Arguments

-
-
wsi -
Websocket instance (available from user callback) -
buf -
The data to send. For data being sent on a websocket -connection (ie, not default http), this buffer MUST have -LWS_SEND_BUFFER_PRE_PADDING bytes valid BEFORE the pointer -and an additional LWS_SEND_BUFFER_POST_PADDING bytes valid -in the buffer after (buf + len). This is so the protocol -header and trailer data can be added in-situ. -
len -
Count of the data bytes in the payload starting from buf -
protocol -
Use LWS_WRITE_HTTP to reply to an http connection, and one -of LWS_WRITE_BINARY or LWS_WRITE_TEXT to send appropriate -data on a websockets connection. Remember to allow the extra -bytes before and after buf if LWS_WRITE_BINARY or LWS_WRITE_TEXT -are used. -
-

Description

-
-This function provides the way to issue data back to the client -for both http and websocket protocols. -

-In the case of sending using websocket protocol, be sure to allocate -valid storage before and after buf as explained above. This scheme -allows maximum efficiency of sending data and protocol in a single -packet while not burdening the user code with any protocol knowledge. -

-
-

libwebsockets_serve_http_file - Send a file back to the client using http

-int -libwebsockets_serve_http_file -(struct libwebsocket * wsi, -const char * file, -const char * content_type) -

Arguments

-
-
wsi -
Websocket instance (available from user callback) -
file -
The file to issue over http -
content_type -
The http content type, eg, text/html -
-

Description

-
-This function is intended to be called from the callback in response -to http requests from the client. It allows the callback to issue -local files down the http link in a single step. -
-
-

libwebsockets_remaining_packet_payload - Bytes to come before "overall" rx packet is complete

-size_t -libwebsockets_remaining_packet_payload -(struct libwebsocket * wsi) -

Arguments

-
-
wsi -
Websocket instance (available from user callback) -
-

Description

-
-This function is intended to be called from the callback if the -user code is interested in "complete packets" from the client. -libwebsockets just passes through payload as it comes and issues a buffer -additionally when it hits a built-in limit. The LWS_CALLBACK_RECEIVE -callback handler can use this API to find out if the buffer it has just -been given is the last piece of a "complete packet" from the client -- -when that is the case libwebsockets_remaining_packet_payload will return -0. -

-Many protocols won't care becuse their packets are always small. -

-
-

libwebsocket_client_connect - Connect to another websocket server

-struct libwebsocket * -libwebsocket_client_connect -(struct libwebsocket_context * context, -const char * address, -int port, -int ssl_connection, -const char * path, -const char * host, -const char * origin, -const char * protocol, -int ietf_version_or_minus_one) -

Arguments

-
-
context -
Websocket context -
address -
Remote server address, eg, "myserver.com" -
port -
Port to connect to on the remote server, eg, 80 -
ssl_connection -
0 = ws://, 1 = wss:// encrypted, 2 = wss:// allow self -signed certs -
path -
Websocket path on server -
host -
Hostname on server -
origin -
Socket origin name -
protocol -
Comma-separated list of protocols being asked for from -the server, or just one. The server will pick the one it -likes best. -
ietf_version_or_minus_one -
-1 to ask to connect using the default, latest -protocol supported, or the specific protocol ordinal -
-

Description

-
-This function creates a connection to a remote server -
-
-

libwebsocket_client_connect_extended - Connect to another websocket server

-struct libwebsocket * -libwebsocket_client_connect_extended -(struct libwebsocket_context * context, -const char * address, -int port, -int ssl_connection, -const char * path, -const char * host, -const char * origin, -const char * protocol, -int ietf_version_or_minus_one, -void * userdata) -

Arguments

-
-
context -
Websocket context -
address -
Remote server address, eg, "myserver.com" -
port -
Port to connect to on the remote server, eg, 80 -
ssl_connection -
0 = ws://, 1 = wss:// encrypted, 2 = wss:// allow self -signed certs -
path -
Websocket path on server -
host -
Hostname on server -
origin -
Socket origin name -
protocol -
Comma-separated list of protocols being asked for from -the server, or just one. The server will pick the one it -likes best. -
ietf_version_or_minus_one -
-1 to ask to connect using the default, latest -protocol supported, or the specific protocol ordinal -
userdata -
Pre-allocated user data -
-

Description

-
-This function creates a connection to a remote server -
-
-

callback - User server actions

-LWS_EXTERN int -callback -(struct libwebsocket_context * context, -struct libwebsocket * wsi, -enum libwebsocket_callback_reasons reason, -void * user, -void * in, -size_t len) -

Arguments

-
-
context -
Websockets context -
wsi -
Opaque websocket instance pointer -
reason -
The reason for the call -
user -
Pointer to per-session user data allocated by library -
in -
Pointer used for some callback reasons -
len -
Length set for some callback reasons -
-

Description

-
-This callback is the way the user controls what is served. All the -protocol detail is hidden and handled by the library. -

-For each connection / session there is user data allocated that is -pointed to by "user". You set the size of this user data area when -the library is initialized with libwebsocket_create_server. -

-You get an opportunity to initialize user data when called back with -LWS_CALLBACK_ESTABLISHED reason. -

-

LWS_CALLBACK_ESTABLISHED

-
-after the server completes a handshake with -an incoming client -
-

LWS_CALLBACK_CLIENT_CONNECTION_ERROR

-
-the request client connection has -been unable to complete a handshake with the remote server -
-

LWS_CALLBACK_CLIENT_ESTABLISHED

-
-after your client connection completed -a handshake with the remote server -
-

LWS_CALLBACK_CLOSED

-
-when the websocket session ends -
-

LWS_CALLBACK_BROADCAST

-
-signal to send to client (you would use -libwebsocket_write taking care about the -special buffer requirements -
-

LWS_CALLBACK_RECEIVE

-
-data has appeared for this server endpoint from a -remote client, it can be found at *in and is -len bytes long -
-

LWS_CALLBACK_CLIENT_RECEIVE_PONG

-
-if you elected to see PONG packets, -they appear with this callback reason. PONG -packets only exist in 04+ protocol -
-

LWS_CALLBACK_CLIENT_RECEIVE

-
-data has appeared from the server for the -client connection, it can be found at *in and -is len bytes long -
-

LWS_CALLBACK_HTTP

-
-an http request has come from a client that is not -asking to upgrade the connection to a websocket -one. This is a chance to serve http content, -for example, to send a script to the client -which will then open the websockets connection. -in points to the URI path requested and -libwebsockets_serve_http_file makes it very -simple to send back a file to the client. -
-

LWS_CALLBACK_SERVER_WRITEABLE

-
-If you call -libwebsocket_callback_on_writable on a connection, you will -get one of these callbacks coming when the connection socket -is able to accept another write packet without blocking. -If it already was able to take another packet without blocking, -you'll get this callback at the next call to the service loop -function. Notice that CLIENTs get LWS_CALLBACK_CLIENT_WRITEABLE -and servers get LWS_CALLBACK_SERVER_WRITEABLE. -
-

LWS_CALLBACK_FILTER_NETWORK_CONNECTION

-
-called when a client connects to -the server at network level; the connection is accepted but then -passed to this callback to decide whether to hang up immediately -or not, based on the client IP. user contains the connection -socket's descriptor. Return non-zero to terminate -the connection before sending or receiving anything. -Because this happens immediately after the network connection -from the client, there's no websocket protocol selected yet so -this callback is issued only to protocol 0. -
-

LWS_CALLBACK_FILTER_PROTOCOL_CONNECTION

-
-called when the handshake has -been received and parsed from the client, but the response is -not sent yet. Return non-zero to disallow the connection. -user is a pointer to an array of struct lws_tokens, you can -use the header enums lws_token_indexes from libwebsockets.h -to check for and read the supported header presence and -content before deciding to allow the handshake to proceed or -to kill the connection. -
-

LWS_CALLBACK_OPENSSL_LOAD_EXTRA_CLIENT_VERIFY_CERTS

-
-if configured for -including OpenSSL support, this callback allows your user code -to perform extra SSL_CTX_load_verify_locations or similar -calls to direct OpenSSL where to find certificates the client -can use to confirm the remote server identity. user is the -OpenSSL SSL_CTX* -
-

LWS_CALLBACK_OPENSSL_LOAD_EXTRA_SERVER_VERIFY_CERTS

-
-if configured for -including OpenSSL support, this callback allows your user code -to load extra certifcates into the server which allow it to -verify the validity of certificates returned by clients. user -is the server's OpenSSL SSL_CTX* -
-

LWS_CALLBACK_OPENSSL_PERFORM_CLIENT_CERT_VERIFICATION

-
-if the -libwebsockets context was created with the option -LWS_SERVER_OPTION_REQUIRE_VALID_OPENSSL_CLIENT_CERT, then this -callback is generated during OpenSSL verification of the cert -sent from the client. It is sent to protocol[0] callback as -no protocol has been negotiated on the connection yet. -Notice that the libwebsockets context and wsi are both NULL -during this callback. See -
-

http

-
-//www.openssl.org/docs/ssl/SSL_CTX_set_verify.html -to understand more detail about the OpenSSL callback that -generates this libwebsockets callback and the meanings of the -arguments passed. In this callback, user is the x509_ctx, -in is the ssl pointer and len is preverify_ok -Notice that this callback maintains libwebsocket return -conventions, return 0 to mean the cert is OK or 1 to fail it. -This also means that if you don't handle this callback then -the default callback action of returning 0 allows the client -certificates. -
-

LWS_CALLBACK_CLIENT_APPEND_HANDSHAKE_HEADER

-
-this callback happens -when a client handshake is being compiled. user is NULL, -in is a char **, it's pointing to a char * which holds the -next location in the header buffer where you can add -headers, and len is the remaining space in the header buffer, -which is typically some hundreds of bytes. So, to add a canned -cookie, your handler code might look similar to: -

-char **p = (char **)in; -

-if (len < 100) -return 1; -

-*p += sprintf(*p, "Cookie: a=b\x0d\x0a"); -

-return 0; -

-Notice if you add anything, you just have to take care about -the CRLF on the line you added. Obviously this callback is -optional, if you don't handle it everything is fine. -

-Notice the callback is coming to protocols[0] all the time, -because there is no specific protocol handshook yet. -

-

LWS_CALLBACK_CONFIRM_EXTENSION_OKAY

-
-When the server handshake code -sees that it does support a requested extension, before -accepting the extension by additing to the list sent back to -the client it gives this callback just to check that it's okay -to use that extension. It calls back to the requested protocol -and with in being the extension name, len is 0 and user is -valid. Note though at this time the ESTABLISHED callback hasn't -happened yet so if you initialize user content there, user -content during this callback might not be useful for anything. -Notice this callback comes to protocols[0]. -
-

LWS_CALLBACK_CLIENT_CONFIRM_EXTENSION_SUPPORTED

-
-When a client -connection is being prepared to start a handshake to a server, -each supported extension is checked with protocols[0] callback -with this reason, giving the user code a chance to suppress the -claim to support that extension by returning non-zero. If -unhandled, by default 0 will be returned and the extension -support included in the header to the server. Notice this -callback comes to protocols[0]. -

-The next four reasons are optional and only need taking care of if you -will be integrating libwebsockets sockets into an external polling -array. -

-

LWS_CALLBACK_ADD_POLL_FD

-
-libwebsocket deals with its poll loop -internally, but in the case you are integrating with another -server you will need to have libwebsocket sockets share a -polling array with the other server. This and the other -POLL_FD related callbacks let you put your specialized -poll array interface code in the callback for protocol 0, the -first protocol you support, usually the HTTP protocol in the -serving case. This callback happens when a socket needs to be -
-

added to the polling loop

-
-user contains the fd, and -len is the events bitmap (like, POLLIN). If you are using the -internal polling loop (the "service" callback), you can just -ignore these callbacks. -
-

LWS_CALLBACK_DEL_POLL_FD

-
-This callback happens when a socket descriptor -needs to be removed from an external polling array. user is -the socket desricptor. If you are using the internal polling -loop, you can just ignore it. -
-

LWS_CALLBACK_SET_MODE_POLL_FD

-
-This callback happens when libwebsockets -wants to modify the events for the socket descriptor in user. -The handler should OR len on to the events member of the pollfd -struct for this socket descriptor. If you are using the -internal polling loop, you can just ignore it. -
-

LWS_CALLBACK_CLEAR_MODE_POLL_FD

-
-This callback occurs when libwebsockets -wants to modify the events for the socket descriptor in user. -The handler should AND ~len on to the events member of the -pollfd struct for this socket descriptor. If you are using the -internal polling loop, you can just ignore it. -
-
-

extension_callback - Hooks to allow extensions to operate

-LWS_EXTERN int -extension_callback -(struct libwebsocket_context * context, -struct libwebsocket_extension * ext, -struct libwebsocket * wsi, -enum libwebsocket_extension_callback_reasons reason, -void * user, -void * in, -size_t len) -

Arguments

-
-
context -
Websockets context -
ext -
This extension -
wsi -
Opaque websocket instance pointer -
reason -
The reason for the call -
user -
Pointer to per-session user data allocated by library -
in -
Pointer used for some callback reasons -
len -
Length set for some callback reasons -
-

Description

-
-Each extension that is active on a particular connection receives -callbacks during the connection lifetime to allow the extension to -operate on websocket data and manage itself. -

-Libwebsockets takes care of allocating and freeing "user" memory for -each active extension on each connection. That is what is pointed to -by the user parameter. -

-

LWS_EXT_CALLBACK_CONSTRUCT

-
-called when the server has decided to -select this extension from the list provided by the client, -just before the server will send back the handshake accepting -the connection with this extension active. This gives the -extension a chance to initialize its connection context found -in user. -
-

LWS_EXT_CALLBACK_CLIENT_CONSTRUCT

-
-same as LWS_EXT_CALLBACK_CONSTRUCT -but called when client is instantiating this extension. Some -extensions will work the same on client and server side and then -you can just merge handlers for both CONSTRUCTS. -
-

LWS_EXT_CALLBACK_DESTROY

-
-called when the connection the extension was -being used on is about to be closed and deallocated. It's the -last chance for the extension to deallocate anything it has -allocated in the user data (pointed to by user) before the -user data is deleted. This same callback is used whether you -are in client or server instantiation context. -
-

LWS_EXT_CALLBACK_PACKET_RX_PREPARSE

-
-when this extension was active on -a connection, and a packet of data arrived at the connection, -it is passed to this callback to give the extension a chance to -change the data, eg, decompress it. user is pointing to the -extension's private connection context data, in is pointing -to an lws_tokens struct, it consists of a char * pointer called -token, and an int called token_len. At entry, these are -set to point to the received buffer and set to the content -length. If the extension will grow the content, it should use -a new buffer allocated in its private user context data and -set the pointed-to lws_tokens members to point to its buffer. -
-

LWS_EXT_CALLBACK_PACKET_TX_PRESEND

-
-this works the same way as -LWS_EXT_CALLBACK_PACKET_RX_PREPARSE above, except it gives the -extension a chance to change websocket data just before it will -be sent out. Using the same lws_token pointer scheme in in, -the extension can change the buffer and the length to be -transmitted how it likes. Again if it wants to grow the -buffer safely, it should copy the data into its own buffer and -set the lws_tokens token pointer to it. -
-
-

struct libwebsocket_protocols - List of protocols and handlers server supports.

-struct libwebsocket_protocols {
-    const char * name;
-    callback_function * callback;
-    size_t per_session_data_size;
-    struct libwebsocket_context * owning_server;
-    int broadcast_socket_port;
-    int broadcast_socket_user_fd;
-    int protocol_index;
-};
-

Members

-
-
name -
Protocol name that must match the one given in the client -Javascript new WebSocket(url, 'protocol') name -
callback -
The service callback used for this protocol. It allows the -service action for an entire protocol to be encapsulated in -the protocol-specific callback -
per_session_data_size -
Each new connection using this protocol gets -this much memory allocated on connection establishment and -freed on connection takedown. A pointer to this per-connection -allocation is passed into the callback in the 'user' parameter -
owning_server -
the server init call fills in this opaque pointer when -registering this protocol with the server. -
broadcast_socket_port -
the server init call fills this in with the -localhost port number used to forward broadcasts for this -protocol -
broadcast_socket_user_fd -
the server init call fills this in ... the main -process context can write to this socket to perform broadcasts -(use the libwebsockets_broadcast api to do this instead, -it works from any process context) -
protocol_index -
which protocol we are starting from zero -
-

Description

-
-This structure represents one protocol supported by the server. An -array of these structures is passed to libwebsocket_create_server -allows as many protocols as you like to be handled by one server. -
-
-

struct libwebsocket_extension - An extension we know how to cope with

-struct libwebsocket_extension {
-    const char * name;
-    extension_callback_function * callback;
-    size_t per_session_data_size;
-    void * per_context_private_data;
-};
-

Members

-
-
name -
Formal extension name, eg, "deflate-stream" -
callback -
Service callback -
per_session_data_size -
Libwebsockets will auto-malloc this much -memory for the use of the extension, a pointer -to it comes in the user callback parameter -
per_context_private_data -
Optional storage for this externsion that -is per-context, so it can track stuff across -all sessions, etc, if it wants -
-
diff --git a/libs/libwebsockets/libwebsockets.spec b/libs/libwebsockets/libwebsockets.spec deleted file mode 100644 index 18e4b82f14..0000000000 --- a/libs/libwebsockets/libwebsockets.spec +++ /dev/null @@ -1,63 +0,0 @@ -Name: libwebsockets -Version: 0.1 -Release: 45.gmaster_f1d2113d%{?dist} -Summary: Websocket Server Library - -Group: System -License: GPL -URL: http://warmcat.com -Source0: %{name}-%{version}.tar.gz -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) - -BuildRequires: openssl-devel -Requires: openssl-devel - -%description -Webserver server library - -%package devel -Summary: Development files for libwebsockets -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: openssl-devel - -%description devel -Development files for libwebsockets - -%prep -%setup -q - -%build -./configure --prefix=/usr --libdir=%{_libdir} --enable-openssl -make - - -%install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT - - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -%defattr(-,root,root,-) -%attr(755,root,root) /usr/bin/libwebsockets-test-server -%attr(755,root,root) -/%{_libdir}/libwebsockets.so.0.0.3 -/%{_libdir}/libwebsockets.so.0 -/%{_libdir}/libwebsockets.so -/%{_libdir}/libwebsockets.la -%attr(755,root,root) /usr/share/libwebsockets-test-server -%attr(755,root,root) /usr/share/libwebsockets-test-server-extpoll -%attr(755,root,root) /usr/share/libwebsockets-test-client -%attr(755,root,root) /usr/share/libwebsockets-test-ping -%doc -%files devel -%defattr(-,root,root,-) -/usr/include/* -%attr(755,root,root) -/%{_libdir}/libwebsockets.a - -%changelog - diff --git a/libs/libwebsockets/m4/.empty b/libs/libwebsockets/m4/.empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/libs/libwebsockets/scripts/kernel-doc b/libs/libwebsockets/scripts/kernel-doc deleted file mode 100755 index 241310e59c..0000000000 --- a/libs/libwebsockets/scripts/kernel-doc +++ /dev/null @@ -1,2238 +0,0 @@ -#!/usr/bin/perl -w - -use strict; - -## Copyright (c) 1998 Michael Zucchi, All Rights Reserved ## -## Copyright (C) 2000, 1 Tim Waugh ## -## Copyright (C) 2001 Simon Huggins ## -## Copyright (C) 2005-2009 Randy Dunlap ## -## ## -## #define enhancements by Armin Kuster ## -## Copyright (c) 2000 MontaVista Software, Inc. ## -## ## -## This software falls under the GNU General Public License. ## -## Please read the COPYING file for more information ## - -# w.o. 03-11-2000: added the '-filelist' option. - -# 18/01/2001 - Cleanups -# Functions prototyped as foo(void) same as foo() -# Stop eval'ing where we don't need to. -# -- huggie@earth.li - -# 27/06/2001 - Allowed whitespace after initial "/**" and -# allowed comments before function declarations. -# -- Christian Kreibich - -# Still to do: -# - add perldoc documentation -# - Look more closely at some of the scarier bits :) - -# 26/05/2001 - Support for separate source and object trees. -# Return error code. -# Keith Owens - -# 23/09/2001 - Added support for typedefs, structs, enums and unions -# Support for Context section; can be terminated using empty line -# Small fixes (like spaces vs. \s in regex) -# -- Tim Jansen - - -# -# This will read a 'c' file and scan for embedded comments in the -# style of gnome comments (+minor extensions - see below). -# - -# Note: This only supports 'c'. - -# usage: -# kernel-doc [ -docbook | -html | -text | -man ] [ -no-doc-sections ] -# [ -function funcname [ -function funcname ...] ] c file(s)s > outputfile -# or -# [ -nofunction funcname [ -function funcname ...] ] c file(s)s > outputfile -# -# Set output format using one of -docbook -html -text or -man. Default is man. -# -# -no-doc-sections -# Do not output DOC: sections -# -# -function funcname -# If set, then only generate documentation for the given function(s) or -# DOC: section titles. All other functions and DOC: sections are ignored. -# -# -nofunction funcname -# If set, then only generate documentation for the other function(s)/DOC: -# sections. Cannot be used together with -function (yes, that's a bug -- -# perl hackers can fix it 8)) -# -# c files - list of 'c' files to process -# -# All output goes to stdout, with errors to stderr. - -# -# format of comments. -# In the following table, (...)? signifies optional structure. -# (...)* signifies 0 or more structure elements -# /** -# * function_name(:)? (- short description)? -# (* @parameterx: (description of parameter x)?)* -# (* a blank line)? -# * (Description:)? (Description of function)? -# * (section header: (section description)? )* -# (*)?*/ -# -# So .. the trivial example would be: -# -# /** -# * my_function -# */ -# -# If the Description: header tag is omitted, then there must be a blank line -# after the last parameter specification. -# e.g. -# /** -# * my_function - does my stuff -# * @my_arg: its mine damnit -# * -# * Does my stuff explained. -# */ -# -# or, could also use: -# /** -# * my_function - does my stuff -# * @my_arg: its mine damnit -# * Description: Does my stuff explained. -# */ -# etc. -# -# Besides functions you can also write documentation for structs, unions, -# enums and typedefs. Instead of the function name you must write the name -# of the declaration; the struct/union/enum/typedef must always precede -# the name. Nesting of declarations is not supported. -# Use the argument mechanism to document members or constants. -# e.g. -# /** -# * struct my_struct - short description -# * @a: first member -# * @b: second member -# * -# * Longer description -# */ -# struct my_struct { -# int a; -# int b; -# /* private: */ -# int c; -# }; -# -# All descriptions can be multiline, except the short function description. -# -# You can also add additional sections. When documenting kernel functions you -# should document the "Context:" of the function, e.g. whether the functions -# can be called form interrupts. Unlike other sections you can end it with an -# empty line. -# Example-sections should contain the string EXAMPLE so that they are marked -# appropriately in DocBook. -# -# Example: -# /** -# * user_function - function that can only be called in user context -# * @a: some argument -# * Context: !in_interrupt() -# * -# * Some description -# * Example: -# * user_function(22); -# */ -# ... -# -# -# All descriptive text is further processed, scanning for the following special -# patterns, which are highlighted appropriately. -# -# 'funcname()' - function -# '$ENVVAR' - environmental variable -# '&struct_name' - name of a structure (up to two words including 'struct') -# '@parameter' - name of a parameter -# '%CONST' - name of a constant. - -my $errors = 0; -my $warnings = 0; -my $anon_struct_union = 0; - -# match expressions used to find embedded type information -my $type_constant = '\%([-_\w]+)'; -my $type_func = '(\w+)\(\)'; -my $type_param = '\@(\w+)'; -my $type_struct = '\&((struct\s*)*[_\w]+)'; -my $type_struct_xml = '\\&((struct\s*)*[_\w]+)'; -my $type_env = '(\$\w+)'; - -# Output conversion substitutions. -# One for each output format - -# these work fairly well -my %highlights_html = ( $type_constant, "\$1", - $type_func, "\$1", - $type_struct_xml, "\$1", - $type_env, "\$1", - $type_param, "\$1" ); -my $local_lt = "\\\\\\\\lt:"; -my $local_gt = "\\\\\\\\gt:"; -my $blankline_html = $local_lt . "p" . $local_gt; # was "

" - -# XML, docbook format -my %highlights_xml = ( "([^=])\\\"([^\\\"<]+)\\\"", "\$1\$2", - $type_constant, "\$1", - $type_func, "\$1", - $type_struct_xml, "\$1", - $type_env, "\$1", - $type_param, "\$1" ); -my $blankline_xml = $local_lt . "/para" . $local_gt . $local_lt . "para" . $local_gt . "\n"; - -# gnome, docbook format -my %highlights_gnome = ( $type_constant, "\$1", - $type_func, "\$1", - $type_struct, "\$1", - $type_env, "\$1", - $type_param, "\$1" ); -my $blankline_gnome = "\n"; - -# these are pretty rough -my %highlights_man = ( $type_constant, "\$1", - $type_func, "\\\\fB\$1\\\\fP", - $type_struct, "\\\\fI\$1\\\\fP", - $type_param, "\\\\fI\$1\\\\fP" ); -my $blankline_man = ""; - -# text-mode -my %highlights_text = ( $type_constant, "\$1", - $type_func, "\$1", - $type_struct, "\$1", - $type_param, "\$1" ); -my $blankline_text = ""; - - -sub usage { - print "Usage: $0 [ -v ] [ -docbook | -html | -text | -man ] [ -no-doc-sections ]\n"; - print " [ -function funcname [ -function funcname ...] ]\n"; - print " [ -nofunction funcname [ -nofunction funcname ...] ]\n"; - print " c source file(s) > outputfile\n"; - print " -v : verbose output, more warnings & other info listed\n"; - exit 1; -} - -# read arguments -if ($#ARGV == -1) { - usage(); -} - -my $verbose = 0; -my $output_mode = "man"; -my $no_doc_sections = 0; -my %highlights = %highlights_man; -my $blankline = $blankline_man; -my $modulename = "Kernel API"; -my $function_only = 0; -my $man_date = ('January', 'February', 'March', 'April', 'May', 'June', - 'July', 'August', 'September', 'October', - 'November', 'December')[(localtime)[4]] . - " " . ((localtime)[5]+1900); - -# Essentially these are globals -# They probably want to be tidied up, made more localised or something. -# CAVEAT EMPTOR! Some of the others I localised may not want to be, which -# could cause "use of undefined value" or other bugs. -my ($function, %function_table, %parametertypes, $declaration_purpose); -my ($type, $declaration_name, $return_type); -my ($newsection, $newcontents, $prototype, $filelist, $brcount, %source_map); - -if (defined($ENV{'KBUILD_VERBOSE'})) { - $verbose = "$ENV{'KBUILD_VERBOSE'}"; -} - -# Generated docbook code is inserted in a template at a point where -# docbook v3.1 requires a non-zero sequence of RefEntry's; see: -# http://www.oasis-open.org/docbook/documentation/reference/html/refentry.html -# We keep track of number of generated entries and generate a dummy -# if needs be to ensure the expanded template can be postprocessed -# into html. -my $section_counter = 0; - -my $lineprefix=""; - -# states -# 0 - normal code -# 1 - looking for function name -# 2 - scanning field start. -# 3 - scanning prototype. -# 4 - documentation block -my $state; -my $in_doc_sect; - -#declaration types: can be -# 'function', 'struct', 'union', 'enum', 'typedef' -my $decl_type; - -my $doc_special = "\@\%\$\&"; - -my $doc_start = '^/\*\*\s*$'; # Allow whitespace at end of comment start. -my $doc_end = '\*/'; -my $doc_com = '\s*\*\s*'; -my $doc_decl = $doc_com . '(\w+)'; -my $doc_sect = $doc_com . '([' . $doc_special . ']?[\w\s]+):(.*)'; -my $doc_content = $doc_com . '(.*)'; -my $doc_block = $doc_com . 'DOC:\s*(.*)?'; - -my %constants; -my %parameterdescs; -my @parameterlist; -my %sections; -my @sectionlist; -my $sectcheck; -my $struct_actual; - -my $contents = ""; -my $section_default = "Description"; # default section -my $section_intro = "Introduction"; -my $section = $section_default; -my $section_context = "Context"; - -my $undescribed = "-- undescribed --"; - -reset_state(); - -while ($ARGV[0] =~ m/^-(.*)/) { - my $cmd = shift @ARGV; - if ($cmd eq "-html") { - $output_mode = "html"; - %highlights = %highlights_html; - $blankline = $blankline_html; - } elsif ($cmd eq "-man") { - $output_mode = "man"; - %highlights = %highlights_man; - $blankline = $blankline_man; - } elsif ($cmd eq "-text") { - $output_mode = "text"; - %highlights = %highlights_text; - $blankline = $blankline_text; - } elsif ($cmd eq "-docbook") { - $output_mode = "xml"; - %highlights = %highlights_xml; - $blankline = $blankline_xml; - } elsif ($cmd eq "-gnome") { - $output_mode = "gnome"; - %highlights = %highlights_gnome; - $blankline = $blankline_gnome; - } elsif ($cmd eq "-module") { # not needed for XML, inherits from calling document - $modulename = shift @ARGV; - } elsif ($cmd eq "-function") { # to only output specific functions - $function_only = 1; - $function = shift @ARGV; - $function_table{$function} = 1; - } elsif ($cmd eq "-nofunction") { # to only output specific functions - $function_only = 2; - $function = shift @ARGV; - $function_table{$function} = 1; - } elsif ($cmd eq "-v") { - $verbose = 1; - } elsif (($cmd eq "-h") || ($cmd eq "--help")) { - usage(); - } elsif ($cmd eq '-filelist') { - $filelist = shift @ARGV; - } elsif ($cmd eq '-no-doc-sections') { - $no_doc_sections = 1; - } -} - -# get kernel version from env -sub get_kernel_version() { - my $version = 'unknown kernel version'; - - if (defined($ENV{'KERNELVERSION'})) { - $version = $ENV{'KERNELVERSION'}; - } - return $version; -} -my $kernelversion = get_kernel_version(); - -# generate a sequence of code that will splice in highlighting information -# using the s// operator. -my $dohighlight = ""; -foreach my $pattern (keys %highlights) { -# print STDERR "scanning pattern:$pattern, highlight:($highlights{$pattern})\n"; - $dohighlight .= "\$contents =~ s:$pattern:$highlights{$pattern}:gs;\n"; -} - -## -# dumps section contents to arrays/hashes intended for that purpose. -# -sub dump_section { - my $file = shift; - my $name = shift; - my $contents = join "\n", @_; - - if ($name =~ m/$type_constant/) { - $name = $1; -# print STDERR "constant section '$1' = '$contents'\n"; - $constants{$name} = $contents; - } elsif ($name =~ m/$type_param/) { -# print STDERR "parameter def '$1' = '$contents'\n"; - $name = $1; - $parameterdescs{$name} = $contents; - $sectcheck = $sectcheck . $name . " "; - } elsif ($name eq "@\.\.\.") { -# print STDERR "parameter def '...' = '$contents'\n"; - $name = "..."; - $parameterdescs{$name} = $contents; - $sectcheck = $sectcheck . $name . " "; - } else { -# print STDERR "other section '$name' = '$contents'\n"; - if (defined($sections{$name}) && ($sections{$name} ne "")) { - print STDERR "Error(${file}:$.): duplicate section name '$name'\n"; - ++$errors; - } - $sections{$name} = $contents; - push @sectionlist, $name; - } -} - -## -# dump DOC: section after checking that it should go out -# -sub dump_doc_section { - my $file = shift; - my $name = shift; - my $contents = join "\n", @_; - - if ($no_doc_sections) { - return; - } - - if (($function_only == 0) || - ( $function_only == 1 && defined($function_table{$name})) || - ( $function_only == 2 && !defined($function_table{$name}))) - { - dump_section($file, $name, $contents); - output_blockhead({'sectionlist' => \@sectionlist, - 'sections' => \%sections, - 'module' => $modulename, - 'content-only' => ($function_only != 0), }); - } -} - -## -# output function -# -# parameterdescs, a hash. -# function => "function name" -# parameterlist => @list of parameters -# parameterdescs => %parameter descriptions -# sectionlist => @list of sections -# sections => %section descriptions -# - -sub output_highlight { - my $contents = join "\n",@_; - my $line; - -# DEBUG -# if (!defined $contents) { -# use Carp; -# confess "output_highlight got called with no args?\n"; -# } - - if ($output_mode eq "html" || $output_mode eq "xml") { - $contents = local_unescape($contents); - # convert data read & converted thru xml_escape() into &xyz; format: - $contents =~ s/\\\\\\/&/g; - } -# print STDERR "contents b4:$contents\n"; - eval $dohighlight; - die $@ if $@; -# print STDERR "contents af:$contents\n"; - - foreach $line (split "\n", $contents) { - if ($line eq ""){ - print $lineprefix, local_unescape($blankline); - } else { - $line =~ s/\\\\\\/\&/g; - if ($output_mode eq "man" && substr($line, 0, 1) eq ".") { - print "\\&$line"; - } else { - print $lineprefix, $line; - } - } - print "\n"; - } -} - -#output sections in html -sub output_section_html(%) { - my %args = %{$_[0]}; - my $section; - - foreach $section (@{$args{'sectionlist'}}) { - print "

$section

\n"; - print "
\n"; - output_highlight($args{'sections'}{$section}); - print "
\n"; - } -} - -# output enum in html -sub output_enum_html(%) { - my %args = %{$_[0]}; - my ($parameter); - my $count; - print "

enum " . $args{'enum'} . "

\n"; - - print "enum " . $args{'enum'} . " {
\n"; - $count = 0; - foreach $parameter (@{$args{'parameterlist'}}) { - print " " . $parameter . ""; - if ($count != $#{$args{'parameterlist'}}) { - $count++; - print ",\n"; - } - print "
"; - } - print "};
\n"; - - print "

Constants

\n"; - print "
\n"; - foreach $parameter (@{$args{'parameterlist'}}) { - print "
" . $parameter . "\n"; - print "
"; - output_highlight($args{'parameterdescs'}{$parameter}); - } - print "
\n"; - output_section_html(@_); - print "
\n"; -} - -# output typedef in html -sub output_typedef_html(%) { - my %args = %{$_[0]}; - my ($parameter); - my $count; - print "

typedef " . $args{'typedef'} . "

\n"; - - print "typedef " . $args{'typedef'} . "\n"; - output_section_html(@_); - print "
\n"; -} - -# output struct in html -sub output_struct_html(%) { - my %args = %{$_[0]}; - my ($parameter); - - print "

" . $args{'type'} . " " . $args{'struct'} . " - " . $args{'purpose'} . "

\n"; - print "" . $args{'type'} . " " . $args{'struct'} . " {
\n"; - foreach $parameter (@{$args{'parameterlist'}}) { - if ($parameter =~ /^#/) { - print "$parameter
\n"; - next; - } - my $parameter_name = $parameter; - $parameter_name =~ s/\[.*//; - - ($args{'parameterdescs'}{$parameter_name} ne $undescribed) || next; - $type = $args{'parametertypes'}{$parameter}; - if ($type =~ m/([^\(]*\(\*)\s*\)\s*\(([^\)]*)\)/) { - # pointer-to-function - print "    $1$parameter) ($2);
\n"; - } elsif ($type =~ m/^(.*?)\s*(:.*)/) { - # bitfield - print "    $1 $parameter$2;
\n"; - } else { - print "    $type $parameter;
\n"; - } - } - print "};
\n"; - - print "

Members

\n"; - print "
\n"; - foreach $parameter (@{$args{'parameterlist'}}) { - ($parameter =~ /^#/) && next; - - my $parameter_name = $parameter; - $parameter_name =~ s/\[.*//; - - ($args{'parameterdescs'}{$parameter_name} ne $undescribed) || next; - print "
" . $parameter . "\n"; - print "
"; - output_highlight($args{'parameterdescs'}{$parameter_name}); - } - print "
\n"; - output_section_html(@_); - print "
\n"; -} - -# output function in html -sub output_function_html(%) { - my %args = %{$_[0]}; - my ($parameter, $section); - my $count; - - print "

" . $args{'function'} . " - " . $args{'purpose'} . "

\n"; - print "" . $args{'functiontype'} . "\n"; - print "" . $args{'function'} . "\n"; - print "("; - $count = 0; - foreach $parameter (@{$args{'parameterlist'}}) { - $type = $args{'parametertypes'}{$parameter}; - if ($type =~ m/([^\(]*\(\*)\s*\)\s*\(([^\)]*)\)/) { - # pointer-to-function - print "$1$parameter) ($2)"; - } else { - print "" . $type . " " . $parameter . ""; - } - if ($count != $#{$args{'parameterlist'}}) { - $count++; - print ",\n"; - } - } - print ")\n"; - - print "

Arguments

\n"; - print "
\n"; - foreach $parameter (@{$args{'parameterlist'}}) { - my $parameter_name = $parameter; - $parameter_name =~ s/\[.*//; - - ($args{'parameterdescs'}{$parameter_name} ne $undescribed) || next; - print "
" . $parameter . "\n"; - print "
"; - output_highlight($args{'parameterdescs'}{$parameter_name}); - } - print "
\n"; - output_section_html(@_); - print "
\n"; -} - -# output DOC: block header in html -sub output_blockhead_html(%) { - my %args = %{$_[0]}; - my ($parameter, $section); - my $count; - - foreach $section (@{$args{'sectionlist'}}) { - print "

$section

\n"; - print "
    \n"; - output_highlight($args{'sections'}{$section}); - print "
\n"; - } - print "
\n"; -} - -sub output_section_xml(%) { - my %args = %{$_[0]}; - my $section; - # print out each section - $lineprefix=" "; - foreach $section (@{$args{'sectionlist'}}) { - print "\n"; - print "$section\n"; - if ($section =~ m/EXAMPLE/i) { - print "\n"; - } else { - print "\n"; - } - output_highlight($args{'sections'}{$section}); - if ($section =~ m/EXAMPLE/i) { - print "\n"; - } else { - print "\n"; - } - print "\n"; - } -} - -# output function in XML DocBook -sub output_function_xml(%) { - my %args = %{$_[0]}; - my ($parameter, $section); - my $count; - my $id; - - $id = "API-" . $args{'function'}; - $id =~ s/[^A-Za-z0-9]/-/g; - - print "\n"; - print "\n"; - print " LINUX\n"; - print " Kernel Hackers Manual\n"; - print " $man_date\n"; - print "\n"; - print "\n"; - print " " . $args{'function'} . "\n"; - print " 9\n"; - print " " . $kernelversion . "\n"; - print "\n"; - print "\n"; - print " " . $args{'function'} . "\n"; - print " \n"; - print " "; - output_highlight ($args{'purpose'}); - print " \n"; - print "\n"; - - print "\n"; - print " Synopsis\n"; - print " \n"; - print " " . $args{'functiontype'} . " "; - print "" . $args{'function'} . " \n"; - - $count = 0; - if ($#{$args{'parameterlist'}} >= 0) { - foreach $parameter (@{$args{'parameterlist'}}) { - $type = $args{'parametertypes'}{$parameter}; - if ($type =~ m/([^\(]*\(\*)\s*\)\s*\(([^\)]*)\)/) { - # pointer-to-function - print " $1$parameter)\n"; - print " $2\n"; - } else { - print " " . $type; - print " $parameter\n"; - } - } - } else { - print " \n"; - } - print " \n"; - print "\n"; - - # print parameters - print "\n Arguments\n"; - if ($#{$args{'parameterlist'}} >= 0) { - print " \n"; - foreach $parameter (@{$args{'parameterlist'}}) { - my $parameter_name = $parameter; - $parameter_name =~ s/\[.*//; - - print " \n $parameter\n"; - print " \n \n"; - $lineprefix=" "; - output_highlight($args{'parameterdescs'}{$parameter_name}); - print " \n \n \n"; - } - print " \n"; - } else { - print " \n None\n \n"; - } - print "\n"; - - output_section_xml(@_); - print "\n\n"; -} - -# output struct in XML DocBook -sub output_struct_xml(%) { - my %args = %{$_[0]}; - my ($parameter, $section); - my $id; - - $id = "API-struct-" . $args{'struct'}; - $id =~ s/[^A-Za-z0-9]/-/g; - - print "\n"; - print "\n"; - print " LINUX\n"; - print " Kernel Hackers Manual\n"; - print " $man_date\n"; - print "\n"; - print "\n"; - print " " . $args{'type'} . " " . $args{'struct'} . "\n"; - print " 9\n"; - print " " . $kernelversion . "\n"; - print "\n"; - print "\n"; - print " " . $args{'type'} . " " . $args{'struct'} . "\n"; - print " \n"; - print " "; - output_highlight ($args{'purpose'}); - print " \n"; - print "\n"; - - print "\n"; - print " Synopsis\n"; - print " \n"; - print $args{'type'} . " " . $args{'struct'} . " {\n"; - foreach $parameter (@{$args{'parameterlist'}}) { - if ($parameter =~ /^#/) { - print "$parameter\n"; - next; - } - - my $parameter_name = $parameter; - $parameter_name =~ s/\[.*//; - - defined($args{'parameterdescs'}{$parameter_name}) || next; - ($args{'parameterdescs'}{$parameter_name} ne $undescribed) || next; - $type = $args{'parametertypes'}{$parameter}; - if ($type =~ m/([^\(]*\(\*)\s*\)\s*\(([^\)]*)\)/) { - # pointer-to-function - print " $1 $parameter) ($2);\n"; - } elsif ($type =~ m/^(.*?)\s*(:.*)/) { - # bitfield - print " $1 $parameter$2;\n"; - } else { - print " " . $type . " " . $parameter . ";\n"; - } - } - print "};"; - print " \n"; - print "\n"; - - print " \n"; - print " Members\n"; - - if ($#{$args{'parameterlist'}} >= 0) { - print " \n"; - foreach $parameter (@{$args{'parameterlist'}}) { - ($parameter =~ /^#/) && next; - - my $parameter_name = $parameter; - $parameter_name =~ s/\[.*//; - - defined($args{'parameterdescs'}{$parameter_name}) || next; - ($args{'parameterdescs'}{$parameter_name} ne $undescribed) || next; - print " "; - print " $parameter\n"; - print " \n"; - output_highlight($args{'parameterdescs'}{$parameter_name}); - print " \n"; - print " \n"; - } - print " \n"; - } else { - print " \n None\n \n"; - } - print " \n"; - - output_section_xml(@_); - - print "\n\n"; -} - -# output enum in XML DocBook -sub output_enum_xml(%) { - my %args = %{$_[0]}; - my ($parameter, $section); - my $count; - my $id; - - $id = "API-enum-" . $args{'enum'}; - $id =~ s/[^A-Za-z0-9]/-/g; - - print "\n"; - print "\n"; - print " LINUX\n"; - print " Kernel Hackers Manual\n"; - print " $man_date\n"; - print "\n"; - print "\n"; - print " enum " . $args{'enum'} . "\n"; - print " 9\n"; - print " " . $kernelversion . "\n"; - print "\n"; - print "\n"; - print " enum " . $args{'enum'} . "\n"; - print " \n"; - print " "; - output_highlight ($args{'purpose'}); - print " \n"; - print "\n"; - - print "\n"; - print " Synopsis\n"; - print " \n"; - print "enum " . $args{'enum'} . " {\n"; - $count = 0; - foreach $parameter (@{$args{'parameterlist'}}) { - print " $parameter"; - if ($count != $#{$args{'parameterlist'}}) { - $count++; - print ","; - } - print "\n"; - } - print "};"; - print " \n"; - print "\n"; - - print "\n"; - print " Constants\n"; - print " \n"; - foreach $parameter (@{$args{'parameterlist'}}) { - my $parameter_name = $parameter; - $parameter_name =~ s/\[.*//; - - print " "; - print " $parameter\n"; - print " \n"; - output_highlight($args{'parameterdescs'}{$parameter_name}); - print " \n"; - print " \n"; - } - print " \n"; - print "\n"; - - output_section_xml(@_); - - print "\n\n"; -} - -# output typedef in XML DocBook -sub output_typedef_xml(%) { - my %args = %{$_[0]}; - my ($parameter, $section); - my $id; - - $id = "API-typedef-" . $args{'typedef'}; - $id =~ s/[^A-Za-z0-9]/-/g; - - print "\n"; - print "\n"; - print " LINUX\n"; - print " Kernel Hackers Manual\n"; - print " $man_date\n"; - print "\n"; - print "\n"; - print " typedef " . $args{'typedef'} . "\n"; - print " 9\n"; - print "\n"; - print "\n"; - print " typedef " . $args{'typedef'} . "\n"; - print " \n"; - print " "; - output_highlight ($args{'purpose'}); - print " \n"; - print "\n"; - - print "\n"; - print " Synopsis\n"; - print " typedef " . $args{'typedef'} . ";\n"; - print "\n"; - - output_section_xml(@_); - - print "\n\n"; -} - -# output in XML DocBook -sub output_blockhead_xml(%) { - my %args = %{$_[0]}; - my ($parameter, $section); - my $count; - - my $id = $args{'module'}; - $id =~ s/[^A-Za-z0-9]/-/g; - - # print out each section - $lineprefix=" "; - foreach $section (@{$args{'sectionlist'}}) { - if (!$args{'content-only'}) { - print "\n $section\n"; - } - if ($section =~ m/EXAMPLE/i) { - print "\n"; - } else { - print "\n"; - } - output_highlight($args{'sections'}{$section}); - if ($section =~ m/EXAMPLE/i) { - print "\n"; - } else { - print ""; - } - if (!$args{'content-only'}) { - print "\n\n"; - } - } - - print "\n\n"; -} - -# output in XML DocBook -sub output_function_gnome { - my %args = %{$_[0]}; - my ($parameter, $section); - my $count; - my $id; - - $id = $args{'module'} . "-" . $args{'function'}; - $id =~ s/[^A-Za-z0-9]/-/g; - - print "\n"; - print " " . $args{'function'} . "\n"; - - print " \n"; - print " " . $args{'functiontype'} . " "; - print "" . $args{'function'} . " "; - print "\n"; - - $count = 0; - if ($#{$args{'parameterlist'}} >= 0) { - foreach $parameter (@{$args{'parameterlist'}}) { - $type = $args{'parametertypes'}{$parameter}; - if ($type =~ m/([^\(]*\(\*)\s*\)\s*\(([^\)]*)\)/) { - # pointer-to-function - print " $1 $parameter)\n"; - print " $2\n"; - } else { - print " " . $type; - print " $parameter\n"; - } - } - } else { - print " \n"; - } - print " \n"; - if ($#{$args{'parameterlist'}} >= 0) { - print " \n"; - print "\n"; - print "\n"; - print "\n"; - print "\n"; - foreach $parameter (@{$args{'parameterlist'}}) { - my $parameter_name = $parameter; - $parameter_name =~ s/\[.*//; - - print " $parameter\n"; - print " \n"; - $lineprefix=" "; - output_highlight($args{'parameterdescs'}{$parameter_name}); - print " \n"; - } - print " \n"; - } else { - print " \n None\n \n"; - } - - # print out each section - $lineprefix=" "; - foreach $section (@{$args{'sectionlist'}}) { - print "\n $section\n"; - if ($section =~ m/EXAMPLE/i) { - print "\n"; - } else { - } - print "\n"; - output_highlight($args{'sections'}{$section}); - print "\n"; - if ($section =~ m/EXAMPLE/i) { - print "\n"; - } else { - } - print " \n"; - } - - print "\n\n"; -} - -## -# output function in man -sub output_function_man(%) { - my %args = %{$_[0]}; - my ($parameter, $section); - my $count; - - print ".TH \"$args{'function'}\" 9 \"$args{'function'}\" \"$man_date\" \"Kernel Hacker's Manual\" LINUX\n"; - - print ".SH NAME\n"; - print $args{'function'} . " \\- " . $args{'purpose'} . "\n"; - - print ".SH SYNOPSIS\n"; - if ($args{'functiontype'} ne "") { - print ".B \"" . $args{'functiontype'} . "\" " . $args{'function'} . "\n"; - } else { - print ".B \"" . $args{'function'} . "\n"; - } - $count = 0; - my $parenth = "("; - my $post = ","; - foreach my $parameter (@{$args{'parameterlist'}}) { - if ($count == $#{$args{'parameterlist'}}) { - $post = ");"; - } - $type = $args{'parametertypes'}{$parameter}; - if ($type =~ m/([^\(]*\(\*)\s*\)\s*\(([^\)]*)\)/) { - # pointer-to-function - print ".BI \"" . $parenth . $1 . "\" " . $parameter . " \") (" . $2 . ")" . $post . "\"\n"; - } else { - $type =~ s/([^\*])$/$1 /; - print ".BI \"" . $parenth . $type . "\" " . $parameter . " \"" . $post . "\"\n"; - } - $count++; - $parenth = ""; - } - - print ".SH ARGUMENTS\n"; - foreach $parameter (@{$args{'parameterlist'}}) { - my $parameter_name = $parameter; - $parameter_name =~ s/\[.*//; - - print ".IP \"" . $parameter . "\" 12\n"; - output_highlight($args{'parameterdescs'}{$parameter_name}); - } - foreach $section (@{$args{'sectionlist'}}) { - print ".SH \"", uc $section, "\"\n"; - output_highlight($args{'sections'}{$section}); - } -} - -## -# output enum in man -sub output_enum_man(%) { - my %args = %{$_[0]}; - my ($parameter, $section); - my $count; - - print ".TH \"$args{'module'}\" 9 \"enum $args{'enum'}\" \"$man_date\" \"API Manual\" LINUX\n"; - - print ".SH NAME\n"; - print "enum " . $args{'enum'} . " \\- " . $args{'purpose'} . "\n"; - - print ".SH SYNOPSIS\n"; - print "enum " . $args{'enum'} . " {\n"; - $count = 0; - foreach my $parameter (@{$args{'parameterlist'}}) { - print ".br\n.BI \" $parameter\"\n"; - if ($count == $#{$args{'parameterlist'}}) { - print "\n};\n"; - last; - } - else { - print ", \n.br\n"; - } - $count++; - } - - print ".SH Constants\n"; - foreach $parameter (@{$args{'parameterlist'}}) { - my $parameter_name = $parameter; - $parameter_name =~ s/\[.*//; - - print ".IP \"" . $parameter . "\" 12\n"; - output_highlight($args{'parameterdescs'}{$parameter_name}); - } - foreach $section (@{$args{'sectionlist'}}) { - print ".SH \"$section\"\n"; - output_highlight($args{'sections'}{$section}); - } -} - -## -# output struct in man -sub output_struct_man(%) { - my %args = %{$_[0]}; - my ($parameter, $section); - - print ".TH \"$args{'module'}\" 9 \"" . $args{'type'} . " " . $args{'struct'} . "\" \"$man_date\" \"API Manual\" LINUX\n"; - - print ".SH NAME\n"; - print $args{'type'} . " " . $args{'struct'} . " \\- " . $args{'purpose'} . "\n"; - - print ".SH SYNOPSIS\n"; - print $args{'type'} . " " . $args{'struct'} . " {\n.br\n"; - - foreach my $parameter (@{$args{'parameterlist'}}) { - if ($parameter =~ /^#/) { - print ".BI \"$parameter\"\n.br\n"; - next; - } - my $parameter_name = $parameter; - $parameter_name =~ s/\[.*//; - - ($args{'parameterdescs'}{$parameter_name} ne $undescribed) || next; - $type = $args{'parametertypes'}{$parameter}; - if ($type =~ m/([^\(]*\(\*)\s*\)\s*\(([^\)]*)\)/) { - # pointer-to-function - print ".BI \" " . $1 . "\" " . $parameter . " \") (" . $2 . ")" . "\"\n;\n"; - } elsif ($type =~ m/^(.*?)\s*(:.*)/) { - # bitfield - print ".BI \" " . $1 . "\ \" " . $parameter . $2 . " \"" . "\"\n;\n"; - } else { - $type =~ s/([^\*])$/$1 /; - print ".BI \" " . $type . "\" " . $parameter . " \"" . "\"\n;\n"; - } - print "\n.br\n"; - } - print "};\n.br\n"; - - print ".SH Members\n"; - foreach $parameter (@{$args{'parameterlist'}}) { - ($parameter =~ /^#/) && next; - - my $parameter_name = $parameter; - $parameter_name =~ s/\[.*//; - - ($args{'parameterdescs'}{$parameter_name} ne $undescribed) || next; - print ".IP \"" . $parameter . "\" 12\n"; - output_highlight($args{'parameterdescs'}{$parameter_name}); - } - foreach $section (@{$args{'sectionlist'}}) { - print ".SH \"$section\"\n"; - output_highlight($args{'sections'}{$section}); - } -} - -## -# output typedef in man -sub output_typedef_man(%) { - my %args = %{$_[0]}; - my ($parameter, $section); - - print ".TH \"$args{'module'}\" 9 \"$args{'typedef'}\" \"$man_date\" \"API Manual\" LINUX\n"; - - print ".SH NAME\n"; - print "typedef " . $args{'typedef'} . " \\- " . $args{'purpose'} . "\n"; - - foreach $section (@{$args{'sectionlist'}}) { - print ".SH \"$section\"\n"; - output_highlight($args{'sections'}{$section}); - } -} - -sub output_blockhead_man(%) { - my %args = %{$_[0]}; - my ($parameter, $section); - my $count; - - print ".TH \"$args{'module'}\" 9 \"$args{'module'}\" \"$man_date\" \"API Manual\" LINUX\n"; - - foreach $section (@{$args{'sectionlist'}}) { - print ".SH \"$section\"\n"; - output_highlight($args{'sections'}{$section}); - } -} - -## -# output in text -sub output_function_text(%) { - my %args = %{$_[0]}; - my ($parameter, $section); - my $start; - - print "Name:\n\n"; - print $args{'function'} . " - " . $args{'purpose'} . "\n"; - - print "\nSynopsis:\n\n"; - if ($args{'functiontype'} ne "") { - $start = $args{'functiontype'} . " " . $args{'function'} . " ("; - } else { - $start = $args{'function'} . " ("; - } - print $start; - - my $count = 0; - foreach my $parameter (@{$args{'parameterlist'}}) { - $type = $args{'parametertypes'}{$parameter}; - if ($type =~ m/([^\(]*\(\*)\s*\)\s*\(([^\)]*)\)/) { - # pointer-to-function - print $1 . $parameter . ") (" . $2; - } else { - print $type . " " . $parameter; - } - if ($count != $#{$args{'parameterlist'}}) { - $count++; - print ",\n"; - print " " x length($start); - } else { - print ");\n\n"; - } - } - - print "Arguments:\n\n"; - foreach $parameter (@{$args{'parameterlist'}}) { - my $parameter_name = $parameter; - $parameter_name =~ s/\[.*//; - - print $parameter . "\n\t" . $args{'parameterdescs'}{$parameter_name} . "\n"; - } - output_section_text(@_); -} - -#output sections in text -sub output_section_text(%) { - my %args = %{$_[0]}; - my $section; - - print "\n"; - foreach $section (@{$args{'sectionlist'}}) { - print "$section:\n\n"; - output_highlight($args{'sections'}{$section}); - } - print "\n\n"; -} - -# output enum in text -sub output_enum_text(%) { - my %args = %{$_[0]}; - my ($parameter); - my $count; - print "Enum:\n\n"; - - print "enum " . $args{'enum'} . " - " . $args{'purpose'} . "\n\n"; - print "enum " . $args{'enum'} . " {\n"; - $count = 0; - foreach $parameter (@{$args{'parameterlist'}}) { - print "\t$parameter"; - if ($count != $#{$args{'parameterlist'}}) { - $count++; - print ","; - } - print "\n"; - } - print "};\n\n"; - - print "Constants:\n\n"; - foreach $parameter (@{$args{'parameterlist'}}) { - print "$parameter\n\t"; - print $args{'parameterdescs'}{$parameter} . "\n"; - } - - output_section_text(@_); -} - -# output typedef in text -sub output_typedef_text(%) { - my %args = %{$_[0]}; - my ($parameter); - my $count; - print "Typedef:\n\n"; - - print "typedef " . $args{'typedef'} . " - " . $args{'purpose'} . "\n"; - output_section_text(@_); -} - -# output struct as text -sub output_struct_text(%) { - my %args = %{$_[0]}; - my ($parameter); - - print $args{'type'} . " " . $args{'struct'} . " - " . $args{'purpose'} . "\n\n"; - print $args{'type'} . " " . $args{'struct'} . " {\n"; - foreach $parameter (@{$args{'parameterlist'}}) { - if ($parameter =~ /^#/) { - print "$parameter\n"; - next; - } - - my $parameter_name = $parameter; - $parameter_name =~ s/\[.*//; - - ($args{'parameterdescs'}{$parameter_name} ne $undescribed) || next; - $type = $args{'parametertypes'}{$parameter}; - if ($type =~ m/([^\(]*\(\*)\s*\)\s*\(([^\)]*)\)/) { - # pointer-to-function - print "\t$1 $parameter) ($2);\n"; - } elsif ($type =~ m/^(.*?)\s*(:.*)/) { - # bitfield - print "\t$1 $parameter$2;\n"; - } else { - print "\t" . $type . " " . $parameter . ";\n"; - } - } - print "};\n\n"; - - print "Members:\n\n"; - foreach $parameter (@{$args{'parameterlist'}}) { - ($parameter =~ /^#/) && next; - - my $parameter_name = $parameter; - $parameter_name =~ s/\[.*//; - - ($args{'parameterdescs'}{$parameter_name} ne $undescribed) || next; - print "$parameter\n\t"; - print $args{'parameterdescs'}{$parameter_name} . "\n"; - } - print "\n"; - output_section_text(@_); -} - -sub output_blockhead_text(%) { - my %args = %{$_[0]}; - my ($parameter, $section); - - foreach $section (@{$args{'sectionlist'}}) { - print " $section:\n"; - print " -> "; - output_highlight($args{'sections'}{$section}); - } -} - -## -# generic output function for all types (function, struct/union, typedef, enum); -# calls the generated, variable output_ function name based on -# functype and output_mode -sub output_declaration { - no strict 'refs'; - my $name = shift; - my $functype = shift; - my $func = "output_${functype}_$output_mode"; - if (($function_only==0) || - ( $function_only == 1 && defined($function_table{$name})) || - ( $function_only == 2 && !defined($function_table{$name}))) - { - &$func(@_); - $section_counter++; - } -} - -## -# generic output function - calls the right one based on current output mode. -sub output_blockhead { - no strict 'refs'; - my $func = "output_blockhead_" . $output_mode; - &$func(@_); - $section_counter++; -} - -## -# takes a declaration (struct, union, enum, typedef) and -# invokes the right handler. NOT called for functions. -sub dump_declaration($$) { - no strict 'refs'; - my ($prototype, $file) = @_; - my $func = "dump_" . $decl_type; - &$func(@_); -} - -sub dump_union($$) { - dump_struct(@_); -} - -sub dump_struct($$) { - my $x = shift; - my $file = shift; - my $nested; - - if ($x =~ /(struct|union)\s+(\w+)\s*{(.*)}/) { - #my $decl_type = $1; - $declaration_name = $2; - my $members = $3; - - # ignore embedded structs or unions - $members =~ s/({.*})//g; - $nested = $1; - - # ignore members marked private: - $members =~ s/\/\*\s*private:.*?\/\*\s*public:.*?\*\///gos; - $members =~ s/\/\*\s*private:.*//gos; - # strip comments: - $members =~ s/\/\*.*?\*\///gos; - $nested =~ s/\/\*.*?\*\///gos; - # strip kmemcheck_bitfield_{begin,end}.*; - $members =~ s/kmemcheck_bitfield_.*?;//gos; - - create_parameterlist($members, ';', $file); - check_sections($file, $declaration_name, "struct", $sectcheck, $struct_actual, $nested); - - output_declaration($declaration_name, - 'struct', - {'struct' => $declaration_name, - 'module' => $modulename, - 'parameterlist' => \@parameterlist, - 'parameterdescs' => \%parameterdescs, - 'parametertypes' => \%parametertypes, - 'sectionlist' => \@sectionlist, - 'sections' => \%sections, - 'purpose' => $declaration_purpose, - 'type' => $decl_type - }); - } - else { - print STDERR "Error(${file}:$.): Cannot parse struct or union!\n"; - ++$errors; - } -} - -sub dump_enum($$) { - my $x = shift; - my $file = shift; - - $x =~ s@/\*.*?\*/@@gos; # strip comments. - if ($x =~ /enum\s+(\w+)\s*{(.*)}/) { - $declaration_name = $1; - my $members = $2; - - foreach my $arg (split ',', $members) { - $arg =~ s/^\s*(\w+).*/$1/; - push @parameterlist, $arg; - if (!$parameterdescs{$arg}) { - $parameterdescs{$arg} = $undescribed; - print STDERR "Warning(${file}:$.): Enum value '$arg' ". - "not described in enum '$declaration_name'\n"; - } - - } - - output_declaration($declaration_name, - 'enum', - {'enum' => $declaration_name, - 'module' => $modulename, - 'parameterlist' => \@parameterlist, - 'parameterdescs' => \%parameterdescs, - 'sectionlist' => \@sectionlist, - 'sections' => \%sections, - 'purpose' => $declaration_purpose - }); - } - else { - print STDERR "Error(${file}:$.): Cannot parse enum!\n"; - ++$errors; - } -} - -sub dump_typedef($$) { - my $x = shift; - my $file = shift; - - $x =~ s@/\*.*?\*/@@gos; # strip comments. - while (($x =~ /\(*.\)\s*;$/) || ($x =~ /\[*.\]\s*;$/)) { - $x =~ s/\(*.\)\s*;$/;/; - $x =~ s/\[*.\]\s*;$/;/; - } - - if ($x =~ /typedef.*\s+(\w+)\s*;/) { - $declaration_name = $1; - - output_declaration($declaration_name, - 'typedef', - {'typedef' => $declaration_name, - 'module' => $modulename, - 'sectionlist' => \@sectionlist, - 'sections' => \%sections, - 'purpose' => $declaration_purpose - }); - } - else { - print STDERR "Error(${file}:$.): Cannot parse typedef!\n"; - ++$errors; - } -} - -sub save_struct_actual($) { - my $actual = shift; - - # strip all spaces from the actual param so that it looks like one string item - $actual =~ s/\s*//g; - $struct_actual = $struct_actual . $actual . " "; -} - -sub create_parameterlist($$$) { - my $args = shift; - my $splitter = shift; - my $file = shift; - my $type; - my $param; - - # temporarily replace commas inside function pointer definition - while ($args =~ /(\([^\),]+),/) { - $args =~ s/(\([^\),]+),/$1#/g; - } - - foreach my $arg (split($splitter, $args)) { - # strip comments - $arg =~ s/\/\*.*\*\///; - # strip leading/trailing spaces - $arg =~ s/^\s*//; - $arg =~ s/\s*$//; - $arg =~ s/\s+/ /; - - if ($arg =~ /^#/) { - # Treat preprocessor directive as a typeless variable just to fill - # corresponding data structures "correctly". Catch it later in - # output_* subs. - push_parameter($arg, "", $file); - } elsif ($arg =~ m/\(.+\)\s*\(/) { - # pointer-to-function - $arg =~ tr/#/,/; - $arg =~ m/[^\(]+\(\*?\s*(\w*)\s*\)/; - $param = $1; - $type = $arg; - $type =~ s/([^\(]+\(\*?)\s*$param/$1/; - save_struct_actual($param); - push_parameter($param, $type, $file); - } elsif ($arg) { - $arg =~ s/\s*:\s*/:/g; - $arg =~ s/\s*\[/\[/g; - - my @args = split('\s*,\s*', $arg); - if ($args[0] =~ m/\*/) { - $args[0] =~ s/(\*+)\s*/ $1/; - } - - my @first_arg; - if ($args[0] =~ /^(.*\s+)(.*?\[.*\].*)$/) { - shift @args; - push(@first_arg, split('\s+', $1)); - push(@first_arg, $2); - } else { - @first_arg = split('\s+', shift @args); - } - - unshift(@args, pop @first_arg); - $type = join " ", @first_arg; - - foreach $param (@args) { - if ($param =~ m/^(\*+)\s*(.*)/) { - save_struct_actual($2); - push_parameter($2, "$type $1", $file); - } - elsif ($param =~ m/(.*?):(\d+)/) { - if ($type ne "") { # skip unnamed bit-fields - save_struct_actual($1); - push_parameter($1, "$type:$2", $file) - } - } - else { - save_struct_actual($param); - push_parameter($param, $type, $file); - } - } - } - } -} - -sub push_parameter($$$) { - my $param = shift; - my $type = shift; - my $file = shift; - - if (($anon_struct_union == 1) && ($type eq "") && - ($param eq "}")) { - return; # ignore the ending }; from anon. struct/union - } - - $anon_struct_union = 0; - my $param_name = $param; - $param_name =~ s/\[.*//; - - if ($type eq "" && $param =~ /\.\.\.$/) - { - if (!defined $parameterdescs{$param} || $parameterdescs{$param} eq "") { - $parameterdescs{$param} = "variable arguments"; - } - } - elsif ($type eq "" && ($param eq "" or $param eq "void")) - { - $param="void"; - $parameterdescs{void} = "no arguments"; - } - elsif ($type eq "" && ($param eq "struct" or $param eq "union")) - # handle unnamed (anonymous) union or struct: - { - $type = $param; - $param = "{unnamed_" . $param . "}"; - $parameterdescs{$param} = "anonymous\n"; - $anon_struct_union = 1; - } - - # warn if parameter has no description - # (but ignore ones starting with # as these are not parameters - # but inline preprocessor statements); - # also ignore unnamed structs/unions; - if (!$anon_struct_union) { - if (!defined $parameterdescs{$param_name} && $param_name !~ /^#/) { - - $parameterdescs{$param_name} = $undescribed; - - if (($type eq 'function') || ($type eq 'enum')) { - print STDERR "Warning(${file}:$.): Function parameter ". - "or member '$param' not " . - "described in '$declaration_name'\n"; - } - print STDERR "Warning(${file}:$.):" . - " No description found for parameter '$param'\n"; - ++$warnings; - } - } - - # strip spaces from $param so that it is one continous string - # on @parameterlist; - # this fixes a problem where check_sections() cannot find - # a parameter like "addr[6 + 2]" because it actually appears - # as "addr[6", "+", "2]" on the parameter list; - # but it's better to maintain the param string unchanged for output, - # so just weaken the string compare in check_sections() to ignore - # "[blah" in a parameter string; - ###$param =~ s/\s*//g; - push @parameterlist, $param; - $parametertypes{$param} = $type; -} - -sub check_sections($$$$$$) { - my ($file, $decl_name, $decl_type, $sectcheck, $prmscheck, $nested) = @_; - my @sects = split ' ', $sectcheck; - my @prms = split ' ', $prmscheck; - my $err; - my ($px, $sx); - my $prm_clean; # strip trailing "[array size]" and/or beginning "*" - - foreach $sx (0 .. $#sects) { - $err = 1; - foreach $px (0 .. $#prms) { - $prm_clean = $prms[$px]; - $prm_clean =~ s/\[.*\]//; - $prm_clean =~ s/__attribute__\s*\(\([a-z,_\*\s\(\)]*\)\)//; - # ignore array size in a parameter string; - # however, the original param string may contain - # spaces, e.g.: addr[6 + 2] - # and this appears in @prms as "addr[6" since the - # parameter list is split at spaces; - # hence just ignore "[..." for the sections check; - $prm_clean =~ s/\[.*//; - - ##$prm_clean =~ s/^\**//; - if ($prm_clean eq $sects[$sx]) { - $err = 0; - last; - } - } - if ($err) { - if ($decl_type eq "function") { - print STDERR "Warning(${file}:$.): " . - "Excess function parameter " . - "'$sects[$sx]' " . - "description in '$decl_name'\n"; - ++$warnings; - } else { - if ($nested !~ m/\Q$sects[$sx]\E/) { - print STDERR "Warning(${file}:$.): " . - "Excess struct/union/enum/typedef member " . - "'$sects[$sx]' " . - "description in '$decl_name'\n"; - ++$warnings; - } - } - } - } -} - -## -# takes a function prototype and the name of the current file being -# processed and spits out all the details stored in the global -# arrays/hashes. -sub dump_function($$) { - my $prototype = shift; - my $file = shift; - - $prototype =~ s/^static +//; - $prototype =~ s/^extern +//; - $prototype =~ s/^asmlinkage +//; - $prototype =~ s/^inline +//; - $prototype =~ s/^__inline__ +//; - $prototype =~ s/^__inline +//; - $prototype =~ s/^__always_inline +//; - $prototype =~ s/^noinline +//; - $prototype =~ s/__devinit +//; - $prototype =~ s/__init +//; - $prototype =~ s/^#\s*define\s+//; #ak added - $prototype =~ s/__attribute__\s*\(\([a-z,]*\)\)//; - - # Yes, this truly is vile. We are looking for: - # 1. Return type (may be nothing if we're looking at a macro) - # 2. Function name - # 3. Function parameters. - # - # All the while we have to watch out for function pointer parameters - # (which IIRC is what the two sections are for), C types (these - # regexps don't even start to express all the possibilities), and - # so on. - # - # If you mess with these regexps, it's a good idea to check that - # the following functions' documentation still comes out right: - # - parport_register_device (function pointer parameters) - # - atomic_set (macro) - # - pci_match_device, __copy_to_user (long return type) - - if ($prototype =~ m/^()([a-zA-Z0-9_~:]+)\s*\(([^\(]*)\)/ || - $prototype =~ m/^(\w+)\s+([a-zA-Z0-9_~:]+)\s*\(([^\(]*)\)/ || - $prototype =~ m/^(\w+\s*\*)\s*([a-zA-Z0-9_~:]+)\s*\(([^\(]*)\)/ || - $prototype =~ m/^(\w+\s+\w+)\s+([a-zA-Z0-9_~:]+)\s*\(([^\(]*)\)/ || - $prototype =~ m/^(\w+\s+\w+\s*\*+)\s*([a-zA-Z0-9_~:]+)\s*\(([^\(]*)\)/ || - $prototype =~ m/^(\w+\s+\w+\s+\w+)\s+([a-zA-Z0-9_~:]+)\s*\(([^\(]*)\)/ || - $prototype =~ m/^(\w+\s+\w+\s+\w+\s*\*)\s*([a-zA-Z0-9_~:]+)\s*\(([^\(]*)\)/ || - $prototype =~ m/^()([a-zA-Z0-9_~:]+)\s*\(([^\{]*)\)/ || - $prototype =~ m/^(\w+)\s+([a-zA-Z0-9_~:]+)\s*\(([^\{]*)\)/ || - $prototype =~ m/^(\w+\s*\*)\s*([a-zA-Z0-9_~:]+)\s*\(([^\{]*)\)/ || - $prototype =~ m/^(\w+\s+\w+)\s+([a-zA-Z0-9_~:]+)\s*\(([^\{]*)\)/ || - $prototype =~ m/^(\w+\s+\w+\s*\*)\s*([a-zA-Z0-9_~:]+)\s*\(([^\{]*)\)/ || - $prototype =~ m/^(\w+\s+\w+\s+\w+)\s+([a-zA-Z0-9_~:]+)\s*\(([^\{]*)\)/ || - $prototype =~ m/^(\w+\s+\w+\s+\w+\s*\*)\s*([a-zA-Z0-9_~:]+)\s*\(([^\{]*)\)/ || - $prototype =~ m/^(\w+\s+\w+\s+\w+\s+\w+)\s+([a-zA-Z0-9_~:]+)\s*\(([^\{]*)\)/ || - $prototype =~ m/^(\w+\s+\w+\s+\w+\s+\w+\s*\*)\s*([a-zA-Z0-9_~:]+)\s*\(([^\{]*)\)/ || - $prototype =~ m/^(\w+\s+\w+\s*\*\s*\w+\s*\*\s*)\s*([a-zA-Z0-9_~:]+)\s*\(([^\{]*)\)/) { - $return_type = $1; - $declaration_name = $2; - my $args = $3; - - create_parameterlist($args, ',', $file); - } else { - print STDERR "Error(${file}:$.): cannot understand prototype: '$prototype'\n"; - ++$errors; - return; - } - - my $prms = join " ", @parameterlist; - check_sections($file, $declaration_name, "function", $sectcheck, $prms, ""); - - output_declaration($declaration_name, - 'function', - {'function' => $declaration_name, - 'module' => $modulename, - 'functiontype' => $return_type, - 'parameterlist' => \@parameterlist, - 'parameterdescs' => \%parameterdescs, - 'parametertypes' => \%parametertypes, - 'sectionlist' => \@sectionlist, - 'sections' => \%sections, - 'purpose' => $declaration_purpose - }); -} - -sub process_file($); - -# Read the file that maps relative names to absolute names for -# separate source and object directories and for shadow trees. -if (open(SOURCE_MAP, "<.tmp_filelist.txt")) { - my ($relname, $absname); - while() { - chop(); - ($relname, $absname) = (split())[0..1]; - $relname =~ s:^/+::; - $source_map{$relname} = $absname; - } - close(SOURCE_MAP); -} - -if ($filelist) { - open(FLIST,"<$filelist") or die "Can't open file list $filelist"; - while() { - chop; - process_file($_); - } -} - -foreach (@ARGV) { - chomp; - process_file($_); -} -if ($verbose && $errors) { - print STDERR "$errors errors\n"; -} -if ($verbose && $warnings) { - print STDERR "$warnings warnings\n"; -} - -exit($errors); - -sub reset_state { - $function = ""; - %constants = (); - %parameterdescs = (); - %parametertypes = (); - @parameterlist = (); - %sections = (); - @sectionlist = (); - $sectcheck = ""; - $struct_actual = ""; - $prototype = ""; - - $state = 0; -} - -sub tracepoint_munge($) { - my $file = shift; - my $tracepointname = 0; - my $tracepointargs = 0; - - if ($prototype =~ m/TRACE_EVENT\((.*?),/) { - $tracepointname = $1; - } - if ($prototype =~ m/DEFINE_SINGLE_EVENT\((.*?),/) { - $tracepointname = $1; - } - if ($prototype =~ m/DEFINE_EVENT\((.*?),(.*?),/) { - $tracepointname = $2; - } - $tracepointname =~ s/^\s+//; #strip leading whitespace - if ($prototype =~ m/TP_PROTO\((.*?)\)/) { - $tracepointargs = $1; - } - if (($tracepointname eq 0) || ($tracepointargs eq 0)) { - print STDERR "Warning(${file}:$.): Unrecognized tracepoint format: \n". - "$prototype\n"; - } else { - $prototype = "static inline void trace_$tracepointname($tracepointargs)"; - } -} - -sub syscall_munge() { - my $void = 0; - - $prototype =~ s@[\r\n\t]+@ @gos; # strip newlines/CR's/tabs -## if ($prototype =~ m/SYSCALL_DEFINE0\s*\(\s*(a-zA-Z0-9_)*\s*\)/) { - if ($prototype =~ m/SYSCALL_DEFINE0/) { - $void = 1; -## $prototype = "long sys_$1(void)"; - } - - $prototype =~ s/SYSCALL_DEFINE.*\(/long sys_/; # fix return type & func name - if ($prototype =~ m/long (sys_.*?),/) { - $prototype =~ s/,/\(/; - } elsif ($void) { - $prototype =~ s/\)/\(void\)/; - } - - # now delete all of the odd-number commas in $prototype - # so that arg types & arg names don't have a comma between them - my $count = 0; - my $len = length($prototype); - if ($void) { - $len = 0; # skip the for-loop - } - for (my $ix = 0; $ix < $len; $ix++) { - if (substr($prototype, $ix, 1) eq ',') { - $count++; - if ($count % 2 == 1) { - substr($prototype, $ix, 1) = ' '; - } - } - } -} - -sub process_state3_function($$) { - my $x = shift; - my $file = shift; - - $x =~ s@\/\/.*$@@gos; # strip C99-style comments to end of line - - if ($x =~ m#\s*/\*\s+MACDOC\s*#io || ($x =~ /^#/ && $x !~ /^#\s*define/)) { - # do nothing - } - elsif ($x =~ /([^\{]*)/) { - $prototype .= $1; - } - - if (($x =~ /\{/) || ($x =~ /\#\s*define/) || ($x =~ /;/)) { - $prototype =~ s@/\*.*?\*/@@gos; # strip comments. - $prototype =~ s@[\r\n]+@ @gos; # strip newlines/cr's. - $prototype =~ s@^\s+@@gos; # strip leading spaces - if ($prototype =~ /SYSCALL_DEFINE/) { - syscall_munge(); - } - if ($prototype =~ /TRACE_EVENT/ || $prototype =~ /DEFINE_EVENT/ || - $prototype =~ /DEFINE_SINGLE_EVENT/) - { - tracepoint_munge($file); - } - dump_function($prototype, $file); - reset_state(); - } -} - -sub process_state3_type($$) { - my $x = shift; - my $file = shift; - - $x =~ s@[\r\n]+@ @gos; # strip newlines/cr's. - $x =~ s@^\s+@@gos; # strip leading spaces - $x =~ s@\s+$@@gos; # strip trailing spaces - $x =~ s@\/\/.*$@@gos; # strip C99-style comments to end of line - - if ($x =~ /^#/) { - # To distinguish preprocessor directive from regular declaration later. - $x .= ";"; - } - - while (1) { - if ( $x =~ /([^{};]*)([{};])(.*)/ ) { - $prototype .= $1 . $2; - ($2 eq '{') && $brcount++; - ($2 eq '}') && $brcount--; - if (($2 eq ';') && ($brcount == 0)) { - dump_declaration($prototype, $file); - reset_state(); - last; - } - $x = $3; - } else { - $prototype .= $x; - last; - } - } -} - -# xml_escape: replace <, >, and & in the text stream; -# -# however, formatting controls that are generated internally/locally in the -# kernel-doc script are not escaped here; instead, they begin life like -# $blankline_html (4 of '\' followed by a mnemonic + ':'), then these strings -# are converted to their mnemonic-expected output, without the 4 * '\' & ':', -# just before actual output; (this is done by local_unescape()) -sub xml_escape($) { - my $text = shift; - if (($output_mode eq "text") || ($output_mode eq "man")) { - return $text; - } - $text =~ s/\&/\\\\\\amp;/g; - $text =~ s/\/\\\\\\gt;/g; - return $text; -} - -# convert local escape strings to html -# local escape strings look like: '\\\\menmonic:' (that's 4 backslashes) -sub local_unescape($) { - my $text = shift; - if (($output_mode eq "text") || ($output_mode eq "man")) { - return $text; - } - $text =~ s/\\\\\\\\lt://g; - return $text; -} - -sub process_file($) { - my $file; - my $identifier; - my $func; - my $descr; - my $in_purpose = 0; - my $initial_section_counter = $section_counter; - - if (defined($ENV{'SRCTREE'})) { - $file = "$ENV{'SRCTREE'}" . "/" . "@_"; - } - else { - $file = "@_"; - } - if (defined($source_map{$file})) { - $file = $source_map{$file}; - } - - if (!open(IN,"<$file")) { - print STDERR "Error: Cannot open file $file\n"; - ++$errors; - return; - } - - $section_counter = 0; - while () { - if ($state == 0) { - if (/$doc_start/o) { - $state = 1; # next line is always the function name - $in_doc_sect = 0; - } - } elsif ($state == 1) { # this line is the function name (always) - if (/$doc_block/o) { - $state = 4; - $contents = ""; - if ( $1 eq "" ) { - $section = $section_intro; - } else { - $section = $1; - } - } - elsif (/$doc_decl/o) { - $identifier = $1; - if (/\s*([\w\s]+?)\s*-/) { - $identifier = $1; - } - - $state = 2; - if (/-(.*)/) { - # strip leading/trailing/multiple spaces - $descr= $1; - $descr =~ s/^\s*//; - $descr =~ s/\s*$//; - $descr =~ s/\s+/ /; - $declaration_purpose = xml_escape($descr); - $in_purpose = 1; - } else { - $declaration_purpose = ""; - } - - if (($declaration_purpose eq "") && $verbose) { - print STDERR "Warning(${file}:$.): missing initial short description on line:\n"; - print STDERR $_; - ++$warnings; - } - - if ($identifier =~ m/^struct/) { - $decl_type = 'struct'; - } elsif ($identifier =~ m/^union/) { - $decl_type = 'union'; - } elsif ($identifier =~ m/^enum/) { - $decl_type = 'enum'; - } elsif ($identifier =~ m/^typedef/) { - $decl_type = 'typedef'; - } else { - $decl_type = 'function'; - } - - if ($verbose) { - print STDERR "Info(${file}:$.): Scanning doc for $identifier\n"; - } - } else { - print STDERR "Warning(${file}:$.): Cannot understand $_ on line $.", - " - I thought it was a doc line\n"; - ++$warnings; - $state = 0; - } - } elsif ($state == 2) { # look for head: lines, and include content - if (/$doc_sect/o) { - $newsection = $1; - $newcontents = $2; - - if (($contents ne "") && ($contents ne "\n")) { - if (!$in_doc_sect && $verbose) { - print STDERR "Warning(${file}:$.): contents before sections\n"; - ++$warnings; - } - dump_section($file, $section, xml_escape($contents)); - $section = $section_default; - } - - $in_doc_sect = 1; - $in_purpose = 0; - $contents = $newcontents; - if ($contents ne "") { - while ((substr($contents, 0, 1) eq " ") || - substr($contents, 0, 1) eq "\t") { - $contents = substr($contents, 1); - } - $contents .= "\n"; - } - $section = $newsection; - } elsif (/$doc_end/) { - - if ($contents ne "") { - dump_section($file, $section, xml_escape($contents)); - $section = $section_default; - $contents = ""; - } - # look for doc_com + + doc_end: - if ($_ =~ m'\s*\*\s*[a-zA-Z_0-9:\.]+\*/') { - print STDERR "Warning(${file}:$.): suspicious ending line: $_"; - ++$warnings; - } - - $prototype = ""; - $state = 3; - $brcount = 0; -# print STDERR "end of doc comment, looking for prototype\n"; - } elsif (/$doc_content/) { - # miguel-style comment kludge, look for blank lines after - # @parameter line to signify start of description - if ($1 eq "") { - if ($section =~ m/^@/ || $section eq $section_context) { - dump_section($file, $section, xml_escape($contents)); - $section = $section_default; - $contents = ""; - } else { - $contents .= "\n"; - } - $in_purpose = 0; - } elsif ($in_purpose == 1) { - # Continued declaration purpose - chomp($declaration_purpose); - $declaration_purpose .= " " . xml_escape($1); - } else { - $contents .= $1 . "\n"; - } - } else { - # i dont know - bad line? ignore. - print STDERR "Warning(${file}:$.): bad line: $_"; - ++$warnings; - } - } elsif ($state == 3) { # scanning for function '{' (end of prototype) - if ($decl_type eq 'function') { - process_state3_function($_, $file); - } else { - process_state3_type($_, $file); - } - } elsif ($state == 4) { - # Documentation block - if (/$doc_block/) { - dump_doc_section($file, $section, xml_escape($contents)); - $contents = ""; - $function = ""; - %constants = (); - %parameterdescs = (); - %parametertypes = (); - @parameterlist = (); - %sections = (); - @sectionlist = (); - $prototype = ""; - if ( $1 eq "" ) { - $section = $section_intro; - } else { - $section = $1; - } - } - elsif (/$doc_end/) - { - dump_doc_section($file, $section, xml_escape($contents)); - $contents = ""; - $function = ""; - %constants = (); - %parameterdescs = (); - %parametertypes = (); - @parameterlist = (); - %sections = (); - @sectionlist = (); - $prototype = ""; - $state = 0; - } - elsif (/$doc_content/) - { - if ( $1 eq "" ) - { - $contents .= $blankline; - } - else - { - $contents .= $1 . "\n"; - } - } - } - } - if ($initial_section_counter == $section_counter) { - print STDERR "Warning(${file}): no structured comments found\n"; - if ($output_mode eq "xml") { - # The template wants at least one RefEntry here; make one. - print "\n"; - print " \n"; - print " \n"; - print " ${file}\n"; - print " \n"; - print " \n"; - print " Document generation inconsistency\n"; - print " \n"; - print " \n"; - print " \n"; - print " \n"; - print " Oops\n"; - print " \n"; - print " \n"; - print " \n"; - print " The template for this document tried to insert\n"; - print " the structured comment from the file\n"; - print " ${file} at this point,\n"; - print " but none was found.\n"; - print " This dummy section is inserted to allow\n"; - print " generation to continue.\n"; - print " \n"; - print " \n"; - print " \n"; - print "\n"; - } - } -} diff --git a/libs/libwebsockets/test-server/Makefile.am b/libs/libwebsockets/test-server/Makefile.am deleted file mode 100644 index 77ee02c370..0000000000 --- a/libs/libwebsockets/test-server/Makefile.am +++ /dev/null @@ -1,61 +0,0 @@ -bin_PROGRAMS=libwebsockets-test-server libwebsockets-test-client libwebsockets-test-server-extpoll libwebsockets-test-fraggle -libwebsockets_test_server_SOURCES=test-server.c -libwebsockets_test_server_LDADD=-L../lib -lwebsockets -lz -libwebsockets_test_client_SOURCES=test-client.c -libwebsockets_test_client_LDADD=-L../lib -lwebsockets -lz -libwebsockets_test_server_extpoll_SOURCES=test-server-extpoll.c -libwebsockets_test_server_extpoll_LDADD=-L../lib -lwebsockets -lz -libwebsockets_test_fraggle_SOURCES=test-fraggle.c -libwebsockets_test_fraggle_LDADD=-L../lib -lwebsockets -lz - -if MINGW -libwebsockets_test_server_CFLAGS= -w -I../win32port/win32helpers -libwebsockets_test_client_CFLAGS= -w -I../win32port/win32helpers -libwebsockets_test_server_extpoll_CFLAGS= -w -I../win32port/win32helpers -libwebsockets_test_fraggle_CFLAGS= -w -I../win32port/win32helpers - -libwebsockets_test_server_LDADD+= -lm -luser32 -ladvapi32 -lkernel32 -lgcc -lws2_32 -lz -libwebsockets_test_client_LDADD+= -lm -luser32 -ladvapi32 -lkernel32 -lgcc -lws2_32 -lz -libwebsockets_test_server_extpoll_LDADD+= -lm -luser32 -ladvapi32 -lkernel32 -lgcc -lws2_32 -lz -libwebsockets_test_fraggle_LDADD+= -lm -luser32 -ladvapi32 -lkernel32 -lgcc -lws2_32 -lz - -else -libwebsockets_test_server_CFLAGS= -Werror -libwebsockets_test_client_CFLAGS= -Werror -libwebsockets_test_server_extpoll_CFLAGS= -Werror -libwebsockets_test_fraggle_CFLAGS= -Werror -endif - -libwebsockets_test_server_CFLAGS+= -Wall -std=gnu99 -pedantic -DINSTALL_DATADIR=\"@datadir@\" -DLWS_OPENSSL_CLIENT_CERTS=\"@clientcertdir@\" -libwebsockets_test_client_CFLAGS+= -Wall -std=gnu99 -pedantic -DINSTALL_DATADIR=\"@datadir@\" -DLWS_OPENSSL_CLIENT_CERTS=\"@clientcertdir@\" -libwebsockets_test_server_extpoll_CFLAGS+= -Wall -std=gnu99 -pedantic -DINSTALL_DATADIR=\"@datadir@\" -DLWS_OPENSSL_CLIENT_CERTS=\"@clientcertdir@\" -libwebsockets_test_fraggle_CFLAGS+= -Wall -std=gnu99 -pedantic -DINSTALL_DATADIR=\"@datadir@\" -DLWS_OPENSSL_CLIENT_CERTS=\"@clientcertdir@\" - - -if NOPING -else -bin_PROGRAMS+=libwebsockets-test-ping -libwebsockets_test_ping_SOURCES=test-ping.c -libwebsockets_test_ping_LDADD=-L../lib -lwebsockets -libwebsockets_test_ping_CFLAGS= -Wall -Werror -std=gnu99 -pedantic -DINSTALL_DATADIR=\"@datadir@\" -DLWS_OPENSSL_CLIENT_CERTS=\"@clientcertdir@\" -endif - - -# -# cook a random test cert and key -# notice your real cert and key will want to be 0600 permissions -libwebsockets-test-server.pem libwebsockets-test-server.key.pem: - printf "GB\nErewhon\nAll around\nlibwebsockets-test\n\nlocalhost\nnone@invalid.org\n" | \ - openssl req -new -newkey rsa:1024 -days 10000 -nodes -x509 -keyout \ - ./libwebsockets-test-server.key.pem -out ./libwebsockets-test-server.pem >/dev/null 2>&1 && \ - chmod 644 ./libwebsockets-test-server.key.pem \ - ./libwebsockets-test-server.pem - -clean-local: - rm -f ./libwebsockets-test-server.key.pem ./libwebsockets-test-server.pem - -install-data-local:libwebsockets-test-server.key.pem libwebsockets-test-server.pem - mkdir -p $(DESTDIR)$(datadir)/libwebsockets-test-server - cp -a test.html favicon.ico libwebsockets-test-server.key.pem libwebsockets-test-server.pem \ - $(DESTDIR)$(datadir)/libwebsockets-test-server - diff --git a/libs/libwebsockets/test-server/favicon.ico b/libs/libwebsockets/test-server/favicon.ico deleted file mode 100644 index c0cc2e3dff..0000000000 Binary files a/libs/libwebsockets/test-server/favicon.ico and /dev/null differ diff --git a/libs/libwebsockets/test-server/test-client.c b/libs/libwebsockets/test-server/test-client.c deleted file mode 100644 index ffd636569b..0000000000 --- a/libs/libwebsockets/test-server/test-client.c +++ /dev/null @@ -1,341 +0,0 @@ -/* - * libwebsockets-test-client - libwebsockets test implementation - * - * Copyright (C) 2011 Andy Green - * - * This 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: - * version 2.1 of the License. - * - * This 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 this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301 USA - */ - -#include -#include -#include -#include -#include - -#include "../lib/libwebsockets.h" - -static unsigned int opts; -static int was_closed; -static int deny_deflate; -static int deny_mux; -static struct libwebsocket *wsi_mirror; - -/* - * This demo shows how to connect multiple websockets simultaneously to a - * websocket server (there is no restriction on their having to be the same - * server just it simplifies the demo). - * - * dumb-increment-protocol: we connect to the server and print the number - * we are given - * - * lws-mirror-protocol: draws random circles, which are mirrored on to every - * client (see them being drawn in every browser - * session also using the test server) - */ - -enum demo_protocols { - - PROTOCOL_DUMB_INCREMENT, - PROTOCOL_LWS_MIRROR, - - /* always last */ - DEMO_PROTOCOL_COUNT -}; - - -/* dumb_increment protocol */ - -static int -callback_dumb_increment(struct libwebsocket_context *this, - struct libwebsocket *wsi, - enum libwebsocket_callback_reasons reason, - void *user, void *in, size_t len) -{ - switch (reason) { - - case LWS_CALLBACK_CLOSED: - fprintf(stderr, "LWS_CALLBACK_CLOSED\n"); - was_closed = 1; - break; - - case LWS_CALLBACK_CLIENT_RECEIVE: - ((char *)in)[len] = '\0'; - fprintf(stderr, "rx %d '%s'\n", (int)len, (char *)in); - break; - - /* because we are protocols[0] ... */ - - case LWS_CALLBACK_CLIENT_CONFIRM_EXTENSION_SUPPORTED: - if ((strcmp(in, "deflate-stream") == 0) && deny_deflate) { - fprintf(stderr, "denied deflate-stream extension\n"); - return 1; - } - if ((strcmp(in, "x-google-mux") == 0) && deny_mux) { - fprintf(stderr, "denied x-google-mux extension\n"); - return 1; - } - - break; - - default: - break; - } - - return 0; -} - - -/* lws-mirror_protocol */ - - -static int -callback_lws_mirror(struct libwebsocket_context *this, - struct libwebsocket *wsi, - enum libwebsocket_callback_reasons reason, - void *user, void *in, size_t len) -{ - unsigned char buf[LWS_SEND_BUFFER_PRE_PADDING + 4096 + - LWS_SEND_BUFFER_POST_PADDING]; - int l; - - switch (reason) { - - case LWS_CALLBACK_CLOSED: - fprintf(stderr, "mirror: LWS_CALLBACK_CLOSED\n"); - wsi_mirror = NULL; - break; - - case LWS_CALLBACK_CLIENT_ESTABLISHED: - - /* - * start the ball rolling, - * LWS_CALLBACK_CLIENT_WRITEABLE will come next service - */ - - libwebsocket_callback_on_writable(this, wsi); - break; - - case LWS_CALLBACK_CLIENT_RECEIVE: -/* fprintf(stderr, "rx %d '%s'\n", (int)len, (char *)in); */ - break; - - case LWS_CALLBACK_CLIENT_WRITEABLE: - - l = sprintf((char *)&buf[LWS_SEND_BUFFER_PRE_PADDING], - "c #%06X %d %d %d;", - (int)random() & 0xffffff, - (int)random() % 500, - (int)random() % 250, - (int)random() % 24); - - libwebsocket_write(wsi, - &buf[LWS_SEND_BUFFER_PRE_PADDING], l, opts | LWS_WRITE_TEXT); - - /* get notified as soon as we can write again */ - - libwebsocket_callback_on_writable(this, wsi); - - /* - * without at least this delay, we choke the browser - * and the connection stalls, despite we now take care about - * flow control - */ - - usleep(200); - break; - - default: - break; - } - - return 0; -} - - -/* list of supported protocols and callbacks */ - -static struct libwebsocket_protocols protocols[] = { - { - "dumb-increment-protocol", - callback_dumb_increment, - 0, - }, - { - "lws-mirror-protocol", - callback_lws_mirror, - 0, - }, - { /* end of list */ - NULL, - NULL, - 0 - } -}; - -static struct option options[] = { - { "help", no_argument, NULL, 'h' }, - { "port", required_argument, NULL, 'p' }, - { "ssl", no_argument, NULL, 's' }, - { "killmask", no_argument, NULL, 'k' }, - { "version", required_argument, NULL, 'v' }, - { "undeflated", no_argument, NULL, 'u' }, - { "nomux", no_argument, NULL, 'n' }, - { NULL, 0, 0, 0 } -}; - - -int main(int argc, char **argv) -{ - int n = 0; - int port = 7681; - int use_ssl = 0; - struct libwebsocket_context *context; - const char *address; - struct libwebsocket *wsi_dumb; - int ietf_version = -1; /* latest */ - int mirror_lifetime = 0; - - fprintf(stderr, "libwebsockets test client\n" - "(C) Copyright 2010 Andy Green " - "licensed under LGPL2.1\n"); - - if (argc < 2) - goto usage; - - while (n >= 0) { - n = getopt_long(argc, argv, "nuv:khsp:", options, NULL); - if (n < 0) - continue; - switch (n) { - case 's': - use_ssl = 2; /* 2 = allow selfsigned */ - break; - case 'p': - port = atoi(optarg); - break; - case 'k': - opts = LWS_WRITE_CLIENT_IGNORE_XOR_MASK; - break; - case 'v': - ietf_version = atoi(optarg); - break; - case 'u': - deny_deflate = 1; - break; - case 'n': - deny_mux = 1; - break; - case 'h': - goto usage; - } - } - - if (optind >= argc) - goto usage; - - address = argv[optind]; - - /* - * create the websockets context. This tracks open connections and - * knows how to route any traffic and which protocol version to use, - * and if each connection is client or server side. - * - * For this client-only demo, we tell it to not listen on any port. - */ - - context = libwebsocket_create_context(CONTEXT_PORT_NO_LISTEN, NULL, - protocols, libwebsocket_internal_extensions, - NULL, NULL, -1, -1, 0); - if (context == NULL) { - fprintf(stderr, "Creating libwebsocket context failed\n"); - return 1; - } - - - /* create a client websocket using dumb increment protocol */ - - wsi_dumb = libwebsocket_client_connect(context, address, port, use_ssl, - "/", argv[optind], argv[optind], - protocols[PROTOCOL_DUMB_INCREMENT].name, ietf_version); - - if (wsi_dumb == NULL) { - fprintf(stderr, "libwebsocket dumb connect failed\n"); - return -1; - } - - fprintf(stderr, "Websocket connections opened\n"); - - /* - * sit there servicing the websocket context to handle incoming - * packets, and drawing random circles on the mirror protocol websocket - */ - - n = 0; - while (n >= 0 && !was_closed) { - n = libwebsocket_service(context, 1000); - - if (n < 0) - continue; - - if (wsi_mirror == NULL) { - - /* create a client websocket using mirror protocol */ - - wsi_mirror = libwebsocket_client_connect(context, - address, port, use_ssl, "/", - argv[optind], argv[optind], - protocols[PROTOCOL_LWS_MIRROR].name, - ietf_version); - - if (wsi_mirror == NULL) { - fprintf(stderr, "libwebsocket " - "dumb connect failed\n"); - return -1; - } - - mirror_lifetime = 10 + (random() & 1023); - - fprintf(stderr, "opened mirror connection with " - "%d lifetime\n", mirror_lifetime); - - } else { - - mirror_lifetime--; - if (mirror_lifetime == 0) { - fprintf(stderr, "closing mirror session\n"); - libwebsocket_close_and_free_session(context, - wsi_mirror, LWS_CLOSE_STATUS_GOINGAWAY); - - /* - * wsi_mirror will get set to NULL in - * callback when close completes - */ - } - } - } - - fprintf(stderr, "Exiting\n"); - - libwebsocket_context_destroy(context); - - return 0; - -usage: - fprintf(stderr, "Usage: libwebsockets-test-client " - " [--port=

] " - "[--ssl] [-k] [-v ]\n"); - return 1; -} diff --git a/libs/libwebsockets/test-server/test-fraggle.c b/libs/libwebsockets/test-server/test-fraggle.c deleted file mode 100644 index 1c77d59fe8..0000000000 --- a/libs/libwebsockets/test-server/test-fraggle.c +++ /dev/null @@ -1,333 +0,0 @@ -/* - * libwebsockets-test-fraggle - random fragmentation test - * - * Copyright (C) 2010-2011 Andy Green - * - * This 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: - * version 2.1 of the License. - * - * This 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 this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301 USA - */ - -#include -#include -#include -#include -#include -#include - -#include "../lib/libwebsockets.h" - -#define LOCAL_RESOURCE_PATH INSTALL_DATADIR"/libwebsockets-test-server" - -static int client; -static int terminate; - -enum demo_protocols { - PROTOCOL_FRAGGLE, - - /* always last */ - DEMO_PROTOCOL_COUNT -}; - -/* fraggle protocol */ - -enum fraggle_states { - FRAGSTATE_START_MESSAGE, - FRAGSTATE_RANDOM_PAYLOAD, - FRAGSTATE_POST_PAYLOAD_SUM, -}; - -struct per_session_data__fraggle { - int packets_left; - int total_message; - unsigned long sum; - enum fraggle_states state; -}; - -static int -callback_fraggle(struct libwebsocket_context *context, - struct libwebsocket *wsi, - enum libwebsocket_callback_reasons reason, - void *user, void *in, size_t len) -{ - int n; - unsigned char buf[LWS_SEND_BUFFER_PRE_PADDING + 2048 + - LWS_SEND_BUFFER_POST_PADDING]; - struct per_session_data__fraggle *psf = user; - int chunk; - int write_mode = LWS_WRITE_CONTINUATION; - unsigned long sum; - unsigned char *p = (unsigned char *)in; - unsigned char *bp = &buf[LWS_SEND_BUFFER_PRE_PADDING]; - - switch (reason) { - - case LWS_CALLBACK_ESTABLISHED: - - fprintf(stderr, "server sees client connect\n"); - psf->state = FRAGSTATE_START_MESSAGE; - /* start the ball rolling */ - libwebsocket_callback_on_writable(context, wsi); - break; - - case LWS_CALLBACK_CLIENT_ESTABLISHED: - - fprintf(stderr, "client connects to server\n"); - psf->state = FRAGSTATE_START_MESSAGE; - break; - - case LWS_CALLBACK_CLIENT_RECEIVE: - - switch (psf->state) { - - case FRAGSTATE_START_MESSAGE: - - psf->state = FRAGSTATE_RANDOM_PAYLOAD; - psf->sum = 0; - psf->total_message = 0; - psf->packets_left = 0; - - /* fallthru */ - - case FRAGSTATE_RANDOM_PAYLOAD: - - for (n = 0; n < len; n++) - psf->sum += p[n]; - - psf->total_message += len; - psf->packets_left++; - - if (libwebsocket_is_final_fragment(wsi)) - psf->state = FRAGSTATE_POST_PAYLOAD_SUM; - break; - - case FRAGSTATE_POST_PAYLOAD_SUM: - - sum = p[0] << 24; - sum |= p[1] << 16; - sum |= p[2] << 8; - sum |= p[3]; - if (sum == psf->sum) - fprintf(stderr, "EOM received %d correctly " - "from %d fragments\n", - psf->total_message, psf->packets_left); - else - fprintf(stderr, "**** ERROR at EOM: " - "length %d, rx sum = 0x%lX, " - "server says it sent 0x%lX\n", - psf->total_message, psf->sum, sum); - - psf->state = FRAGSTATE_START_MESSAGE; - break; - } - break; - - case LWS_CALLBACK_SERVER_WRITEABLE: - - switch (psf->state) { - - case FRAGSTATE_START_MESSAGE: - - psf->packets_left = (random() % 1024) + 1; - fprintf(stderr, "Spamming %d random fragments\n", - psf->packets_left); - psf->sum = 0; - psf->total_message = 0; - write_mode = LWS_WRITE_BINARY; - psf->state = FRAGSTATE_RANDOM_PAYLOAD; - - /* fallthru */ - - case FRAGSTATE_RANDOM_PAYLOAD: - - chunk = (random() % 2000) + 1; - psf->total_message += chunk; - - libwebsockets_get_random(context, bp, chunk); - for (n = 0; n < chunk; n++) - psf->sum += bp[n]; - - psf->packets_left--; - if (psf->packets_left) - write_mode |= LWS_WRITE_NO_FIN; - else - psf->state = FRAGSTATE_POST_PAYLOAD_SUM; - - n = libwebsocket_write(wsi, bp, chunk, write_mode); - - libwebsocket_callback_on_writable(context, wsi); - break; - - case FRAGSTATE_POST_PAYLOAD_SUM: - - fprintf(stderr, "Spamming session over, " - "len = %d. sum = 0x%lX\n", - psf->total_message, psf->sum); - - bp[0] = psf->sum >> 24; - bp[1] = psf->sum >> 16; - bp[2] = psf->sum >> 8; - bp[3] = psf->sum; - - n = libwebsocket_write(wsi, (unsigned char *)bp, - 4, LWS_WRITE_BINARY); - - psf->state = FRAGSTATE_START_MESSAGE; - - libwebsocket_callback_on_writable(context, wsi); - break; - } - break; - - case LWS_CALLBACK_CLOSED: - - terminate = 1; - break; - - /* because we are protocols[0] ... */ - - case LWS_CALLBACK_CLIENT_CONFIRM_EXTENSION_SUPPORTED: - if (strcmp(in, "deflate-stream") == 0) { - fprintf(stderr, "denied deflate-stream extension\n"); - return 1; - } - break; - - default: - break; - } - - return 0; -} - - - -/* list of supported protocols and callbacks */ - -static struct libwebsocket_protocols protocols[] = { - { - "fraggle-protocol", - callback_fraggle, - sizeof(struct per_session_data__fraggle), - }, - { - NULL, NULL, 0 /* End of list */ - } -}; - -static struct option options[] = { - { "help", no_argument, NULL, 'h' }, - { "port", required_argument, NULL, 'p' }, - { "ssl", no_argument, NULL, 's' }, - { "killmask", no_argument, NULL, 'k' }, - { "interface", required_argument, NULL, 'i' }, - { "client", no_argument, NULL, 'c' }, - { NULL, 0, 0, 0 } -}; - -int main(int argc, char **argv) -{ - int n = 0; - const char *cert_path = - LOCAL_RESOURCE_PATH"/libwebsockets-test-server.pem"; - const char *key_path = - LOCAL_RESOURCE_PATH"/libwebsockets-test-server.key.pem"; - int port = 7681; - int use_ssl = 0; - struct libwebsocket_context *context; - int opts = 0; - char interface_name[128] = ""; - const char *interface = NULL; - struct libwebsocket *wsi; - const char *address; - int server_port = port; - - fprintf(stderr, "libwebsockets test fraggle\n" - "(C) Copyright 2010-2011 Andy Green " - "licensed under LGPL2.1\n"); - - while (n >= 0) { - n = getopt_long(argc, argv, "ci:khsp:", options, NULL); - if (n < 0) - continue; - switch (n) { - case 's': - use_ssl = 1; - break; - case 'k': - opts = LWS_SERVER_OPTION_DEFEAT_CLIENT_MASK; - break; - case 'p': - port = atoi(optarg); - server_port = port; - break; - case 'i': - strncpy(interface_name, optarg, sizeof interface_name); - interface_name[(sizeof interface_name) - 1] = '\0'; - interface = interface_name; - break; - case 'c': - client = 1; - fprintf(stderr, " Client mode\n"); - break; - case 'h': - fprintf(stderr, "Usage: libwebsockets-test-fraggle " - "[--port=

] [--ssl] [--client]\n"); - exit(1); - } - } - - if (client) { - server_port = CONTEXT_PORT_NO_LISTEN; - if (optind >= argc) { - fprintf(stderr, "Must give address of server\n"); - return 1; - } - } - - if (!use_ssl) - cert_path = key_path = NULL; - - context = libwebsocket_create_context(server_port, interface, protocols, - libwebsocket_internal_extensions, - cert_path, key_path, -1, -1, opts); - if (context == NULL) { - fprintf(stderr, "libwebsocket init failed\n"); - return -1; - } - - if (client) { - address = argv[optind]; - fprintf(stderr, "Connecting to %s:%u\n", address, port); - wsi = libwebsocket_client_connect(context, address, - port, use_ssl, "/", address, - "origin", protocols[PROTOCOL_FRAGGLE].name, - -1); - if (wsi == NULL) { - fprintf(stderr, "Client connect to server failed\n"); - goto bail; - } - } - - n = 0; - while (!n && !terminate) - n = libwebsocket_service(context, 50); - - fprintf(stderr, "Terminating...\n"); - -bail: - libwebsocket_context_destroy(context); - - return 0; -} diff --git a/libs/libwebsockets/test-server/test-ping.c b/libs/libwebsockets/test-server/test-ping.c deleted file mode 100644 index 672f62cc0d..0000000000 --- a/libs/libwebsockets/test-server/test-ping.c +++ /dev/null @@ -1,512 +0,0 @@ -/* - * libwebsockets-test-ping - libwebsockets floodping - * - * Copyright (C) 2011 Andy Green - * - * This 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: - * version 2.1 of the License. - * - * This 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 this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301 USA - */ - -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include - -#include - -#include "../lib/libwebsockets.h" -#include - -/* - * this is specified in the 04 standard, control frames can only have small - * payload length styles - */ -#define MAX_PING_PAYLOAD 125 -#define MAX_MIRROR_PAYLOAD 4096 -#define MAX_PING_CLIENTS 256 -#define PING_RINGBUFFER_SIZE 256 - -static struct libwebsocket *ping_wsi[MAX_PING_CLIENTS]; -static unsigned int interval_us = 1000000; -static unsigned int size = 64; -static int flood; -static const char *address; -static unsigned char pingbuf[LWS_SEND_BUFFER_PRE_PADDING + MAX_MIRROR_PAYLOAD + - LWS_SEND_BUFFER_POST_PADDING]; -static char peer_name[128]; -static unsigned long started; -static int screen_width = 80; -static int use_mirror; -static unsigned int write_options; - -static unsigned long rtt_min = 100000000; -static unsigned long rtt_max; -static unsigned long rtt_avg; -static unsigned long global_rx_count; -static unsigned long global_tx_count; -static int clients = 1; -static unsigned long interrupted_time; - -struct ping { - unsigned long issue_timestamp; - unsigned long index; - unsigned int seen; -}; - -struct per_session_data__ping { - unsigned long ping_index; - - struct ping ringbuffer[PING_RINGBUFFER_SIZE]; - int ringbuffer_head; - int ringbuffer_tail; - - unsigned long rx_count; -}; - -/* - * uses the ping pong protocol features to provide an equivalent for the - * ping utility for 04+ websockets - */ - -enum demo_protocols { - - PROTOCOL_LWS_MIRROR, - - /* always last */ - DEMO_PROTOCOL_COUNT -}; - - -static int -callback_lws_mirror(struct libwebsocket_context * this, - struct libwebsocket *wsi, - enum libwebsocket_callback_reasons reason, - void *user, void *in, size_t len) -{ - struct timeval tv; - unsigned char *p; - int shift; - unsigned long l; - unsigned long iv; - int n; - int match = 0; - struct per_session_data__ping *psd = user; - - switch (reason) { - case LWS_CALLBACK_CLOSED: - - fprintf(stderr, "LWS_CALLBACK_CLOSED on %p\n", (void *)wsi); - - /* remove closed guy */ - - for (n = 0; n < clients; n++) - if (ping_wsi[n] == wsi) { - clients--; - while (n < clients) { - ping_wsi[n] = ping_wsi[n + 1]; - n++; - } - } - - break; - - case LWS_CALLBACK_CLIENT_ESTABLISHED: - - psd->rx_count = 0; - psd->ping_index = 1; - psd->ringbuffer_head = 0; - psd->ringbuffer_tail = 0; - - /* - * start the ball rolling, - * LWS_CALLBACK_CLIENT_WRITEABLE will come next service - */ - - libwebsocket_callback_on_writable(this, wsi); - break; - - case LWS_CALLBACK_CLIENT_RECEIVE: - case LWS_CALLBACK_CLIENT_RECEIVE_PONG: - gettimeofday(&tv, NULL); - iv = (tv.tv_sec * 1000000) + tv.tv_usec; - - psd->rx_count++; - - shift = 56; - p = in; - l = 0; - - while (shift >= 0) { - l |= (*p++) << shift; - shift -= 8; - } - - /* find it in the ringbuffer, look backwards from head */ - n = psd->ringbuffer_head; - while (!match) { - - if (psd->ringbuffer[n].index == l) { - psd->ringbuffer[n].seen++; - match = 1; - continue; - } - - if (n == psd->ringbuffer_tail) { - match = -1; - continue; - } - - if (n == 0) - n = PING_RINGBUFFER_SIZE - 1; - else - n--; - } - - if (match < 1) { - - if (!flood) - fprintf(stderr, "%d bytes from %s: req=%ld " - "time=(unknown)\n", (int)len, address, l); - else - fprintf(stderr, "\b \b"); - - break; - } - - if (psd->ringbuffer[n].seen > 1) - fprintf(stderr, "DUP! "); - - if ((iv - psd->ringbuffer[n].issue_timestamp) < rtt_min) - rtt_min = iv - psd->ringbuffer[n].issue_timestamp; - - if ((iv - psd->ringbuffer[n].issue_timestamp) > rtt_max) - rtt_max = iv - psd->ringbuffer[n].issue_timestamp; - - rtt_avg += iv - psd->ringbuffer[n].issue_timestamp; - global_rx_count++; - - if (!flood) - fprintf(stderr, "%d bytes from %s: req=%ld " - "time=%lu.%lums\n", (int)len, address, l, - (iv - psd->ringbuffer[n].issue_timestamp) / 1000, - ((iv - psd->ringbuffer[n].issue_timestamp) / 100) % 10); - else - fprintf(stderr, "\b \b"); - break; - - case LWS_CALLBACK_CLIENT_WRITEABLE: - - shift = 56; - p = &pingbuf[LWS_SEND_BUFFER_PRE_PADDING]; - - /* 64-bit ping index in network byte order */ - - while (shift >= 0) { - *p++ = psd->ping_index >> shift; - shift -= 8; - } - - gettimeofday(&tv, NULL); - - psd->ringbuffer[psd->ringbuffer_head].issue_timestamp = - (tv.tv_sec * 1000000) + tv.tv_usec; - psd->ringbuffer[psd->ringbuffer_head].index = psd->ping_index++; - psd->ringbuffer[psd->ringbuffer_head].seen = 0; - - if (psd->ringbuffer_head == PING_RINGBUFFER_SIZE - 1) - psd->ringbuffer_head = 0; - else - psd->ringbuffer_head++; - - /* snip any re-used tail so we keep to the ring length */ - - if (psd->ringbuffer_tail == psd->ringbuffer_head) { - if (psd->ringbuffer_tail == PING_RINGBUFFER_SIZE - 1) - psd->ringbuffer_tail = 0; - else - psd->ringbuffer_tail++; - } - - global_tx_count++; - - if (use_mirror) - libwebsocket_write(wsi, - &pingbuf[LWS_SEND_BUFFER_PRE_PADDING], - size, write_options | LWS_WRITE_BINARY); - else - libwebsocket_write(wsi, - &pingbuf[LWS_SEND_BUFFER_PRE_PADDING], - size, write_options | LWS_WRITE_PING); - - if (flood && - (psd->ping_index - psd->rx_count) < (screen_width - 1)) - fprintf(stderr, "."); - break; - - default: - break; - } - - return 0; -} - - -/* list of supported protocols and callbacks */ - -static struct libwebsocket_protocols protocols[] = { - - [PROTOCOL_LWS_MIRROR] = { - .name = "lws-mirror-protocol", - .callback = callback_lws_mirror, - .per_session_data_size = sizeof (struct per_session_data__ping), - }, - [DEMO_PROTOCOL_COUNT] = { /* end of list */ - .callback = NULL - } -}; - -static struct option options[] = { - { "help", no_argument, NULL, 'h' }, - { "port", required_argument, NULL, 'p' }, - { "ssl", no_argument, NULL, 't' }, - { "interval", required_argument, NULL, 'i' }, - { "size", required_argument, NULL, 's' }, - { "protocol", required_argument, NULL, 'n' }, - { "flood", no_argument, NULL, 'f' }, - { "mirror", no_argument, NULL, 'm' }, - { "replicate", required_argument, NULL, 'r' }, - { "killmask", no_argument, NULL, 'k' }, - { "version", required_argument, NULL, 'v' }, - { NULL, 0, 0, 0 } -}; - - -static void -signal_handler(int sig, siginfo_t *si, void *v) -{ - struct timeval tv; - - gettimeofday(&tv, NULL); - interrupted_time = (tv.tv_sec * 1000000) + tv.tv_usec; -} - - -int main(int argc, char **argv) -{ - int n = 0; - int port = 7681; - int use_ssl = 0; - struct libwebsocket_context *context; - char protocol_name[256]; - char ip[30]; - struct sigaction sa; - struct timeval tv; - struct winsize w; - unsigned long oldus = 0; - unsigned long l; - int ietf_version = -1; - - if (argc < 2) - goto usage; - - address = argv[1]; - optind++; - - while (n >= 0) { - n = getopt_long(argc, argv, "v:kr:hmfts:n:i:p:", options, NULL); - if (n < 0) - continue; - switch (n) { - case 'm': - use_mirror = 1; - break; - case 't': - use_ssl = 2; /* 2 = allow selfsigned */ - break; - case 'p': - port = atoi(optarg); - break; - case 'n': - strncpy(protocol_name, optarg, sizeof protocol_name); - protocol_name[(sizeof protocol_name) - 1] = '\0'; - protocols[PROTOCOL_LWS_MIRROR].name = protocol_name; - break; - case 'i': - interval_us = 1000000.0 * atof(optarg); - break; - case 's': - size = atoi(optarg); - break; - case 'f': - flood = 1; - break; - case 'r': - clients = atoi(optarg); - if (clients > MAX_PING_CLIENTS || clients < 1) { - fprintf(stderr, "Max clients supportd = %d\n", - MAX_PING_CLIENTS); - return 1; - } - break; - case 'k': - write_options = LWS_WRITE_CLIENT_IGNORE_XOR_MASK; - break; - case 'v': - ietf_version = atoi(optarg); - break; - - case 'h': - goto usage; - } - } - - if (!use_mirror) { - if (size > MAX_PING_PAYLOAD) { - fprintf(stderr, "Max ping opcode payload size %d\n", - MAX_PING_PAYLOAD); - return 1; - } - } else { - if (size > MAX_MIRROR_PAYLOAD) { - fprintf(stderr, "Max mirror payload size %d\n", - MAX_MIRROR_PAYLOAD); - return 1; - } - } - - - if (isatty(STDOUT_FILENO)) - if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &w) != -1) - if (w.ws_col > 0) - screen_width = w.ws_col; - - context = libwebsocket_create_context(CONTEXT_PORT_NO_LISTEN, NULL, - protocols, - libwebsocket_internal_extensions, - NULL, NULL, -1, -1, 0); - if (context == NULL) { - fprintf(stderr, "Creating libwebsocket context failed\n"); - return 1; - } - - /* create client websockets using dumb increment protocol */ - - for (n = 0; n < clients; n++) { - ping_wsi[n] = libwebsocket_client_connect(context, address, - port, use_ssl, "/", address, - "origin", protocols[PROTOCOL_LWS_MIRROR].name, - ietf_version); - if (ping_wsi[n] == NULL) { - fprintf(stderr, "client connnection %d failed to " - "connect\n", n); - return 1; - } - } - - libwebsockets_get_peer_addresses( - libwebsocket_get_socket_fd(ping_wsi[0]), - peer_name, sizeof peer_name, ip, sizeof ip); - - fprintf(stderr, "Websocket PING %s (%s) %d bytes of data.\n", - peer_name, ip, size); - - /* set the ^C handler */ - - sa.sa_sigaction = signal_handler; - sa.sa_flags = SA_SIGINFO; - sigemptyset(&sa.sa_mask); - sigaction(SIGINT, &sa, NULL); - - gettimeofday(&tv, NULL); - started = (tv.tv_sec * 1000000) + tv.tv_usec; - - /* service loop */ - - n = 0; - while (n >= 0) { - - gettimeofday(&tv, NULL); - l = (tv.tv_sec * 1000000) + tv.tv_usec; - - /* servers can hang up on us */ - - if (clients == 0) { - n = -1; - continue; - } - - if (!interrupted_time) { - if ((l - oldus) > interval_us) { - for (n = 0; n < clients; n++) - libwebsocket_callback_on_writable( - context, ping_wsi[n]); - oldus = l; - } - } else - - /* allow time for in-flight pongs to come */ - - if ((l - interrupted_time) > 250000) { - n = -1; - continue; - } - - if (!interval_us) - n = libwebsocket_service(context, 0); - else - n = libwebsocket_service(context, 1); - } - - /* stats */ - - fprintf(stderr, "\n--- %s websocket ping statistics " - "using %d connections ---\n" - "%lu packets transmitted, %lu received, " - "%lu%% packet loss, time %ldms\n" - "rtt min/avg/max = %0.3f/%0.3f/%0.3f ms\n" - "payload bandwidth average %0.3f KiBytes/sec\n", - peer_name, clients, global_tx_count, global_rx_count, - ((global_tx_count - global_rx_count) * 100) / global_tx_count, - (l - started) / 1000, - ((double)rtt_min) / 1000.0, - ((double)rtt_avg / global_rx_count) / 1000.0, - ((double)rtt_max) / 1000.0, - ((double)global_rx_count * (double)size) / - ((double)(l - started) / 1000000.0) / 1024.0); - - libwebsocket_context_destroy(context); - - return 0; - -usage: - fprintf(stderr, "Usage: libwebsockets-test-ping " - " [--port=

] " - "[--ssl] [--interval=] " - "[--size=] " - "[--protocol=] " - "[--mirror] " - "[--replicate=clients>]" - "[--version ]" - "\n"); - return 1; -} diff --git a/libs/libwebsockets/test-server/test-server-extpoll.c b/libs/libwebsockets/test-server/test-server-extpoll.c deleted file mode 100644 index 8131412fe3..0000000000 --- a/libs/libwebsockets/test-server/test-server-extpoll.c +++ /dev/null @@ -1,553 +0,0 @@ -/* - * libwebsockets-test-server-extpoll - libwebsockets external poll loop sample - * - * This acts the same as libwebsockets-test-server but works with the poll - * loop taken out of libwebsockets and into this app. It's an example of how - * you can integrate libwebsockets polling into an app that already has its - * own poll loop. - * - * Copyright (C) 2010-2011 Andy Green - * - * This 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: - * version 2.1 of the License. - * - * This 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 this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301 USA - */ - -#include -#include -#include -#include -#include -#include -#ifdef __MINGW32__ -#include "../win32port/win32helpers/websock-w32.h" -#else -#ifdef __MINGW64__ -#include "../win32port/win32helpers/websock-w32.h" -#else -#include -#endif -#endif - -#include "../lib/libwebsockets.h" - - -/* - * This demo server shows how to use libwebsockets for one or more - * websocket protocols in the same server - * - * It defines the following websocket protocols: - * - * dumb-increment-protocol: once the socket is opened, an incrementing - * ascii string is sent down it every 50ms. - * If you send "reset\n" on the websocket, then - * the incrementing number is reset to 0. - * - * lws-mirror-protocol: copies any received packet to every connection also - * using this protocol, including the sender - */ - -#define MAX_POLL_ELEMENTS 100 -struct pollfd pollfds[100]; -int count_pollfds = 0; - - - -enum demo_protocols { - /* always first */ - PROTOCOL_HTTP = 0, - - PROTOCOL_DUMB_INCREMENT, - PROTOCOL_LWS_MIRROR, - - /* always last */ - DEMO_PROTOCOL_COUNT -}; - - -#define LOCAL_RESOURCE_PATH INSTALL_DATADIR"/libwebsockets-test-server" - -/* this protocol server (always the first one) just knows how to do HTTP */ - -static int callback_http(struct libwebsocket_context * this, - struct libwebsocket *wsi, - enum libwebsocket_callback_reasons reason, void *user, - void *in, size_t len) -{ - int n; - char client_name[128]; - char client_ip[128]; - - switch (reason) { - case LWS_CALLBACK_HTTP: - fprintf(stderr, "serving HTTP URI %s\n", (char *)in); - - if (in && strcmp(in, "/favicon.ico") == 0) { - if (libwebsockets_serve_http_file(wsi, - LOCAL_RESOURCE_PATH"/favicon.ico", "image/x-icon")) - fprintf(stderr, "Failed to send favicon\n"); - break; - } - - /* send the script... when it runs it'll start websockets */ - - if (libwebsockets_serve_http_file(wsi, - LOCAL_RESOURCE_PATH"/test.html", "text/html")) - fprintf(stderr, "Failed to send HTTP file\n"); - break; - - /* - * callback for confirming to continue with client IP appear in - * protocol 0 callback since no websocket protocol has been agreed - * yet. You can just ignore this if you won't filter on client IP - * since the default uhandled callback return is 0 meaning let the - * connection continue. - */ - - case LWS_CALLBACK_FILTER_NETWORK_CONNECTION: - - libwebsockets_get_peer_addresses((int)(long)user, client_name, - sizeof(client_name), client_ip, sizeof(client_ip)); - - fprintf(stderr, "Received network connect from %s (%s)\n", - client_name, client_ip); - - /* if we returned non-zero from here, we kill the connection */ - break; - - /* - * callbacks for managing the external poll() array appear in - * protocol 0 callback - */ - - case LWS_CALLBACK_ADD_POLL_FD: - pollfds[count_pollfds].fd = (int)(long)user; - pollfds[count_pollfds].events = (int)len; - pollfds[count_pollfds++].revents = 0; - break; - - case LWS_CALLBACK_DEL_POLL_FD: - for (n = 0; n < count_pollfds; n++) - if (pollfds[n].fd == (int)(long)user) - while (n < count_pollfds) { - pollfds[n] = pollfds[n + 1]; - n++; - } - count_pollfds--; - break; - - case LWS_CALLBACK_SET_MODE_POLL_FD: - for (n = 0; n < count_pollfds; n++) - if (pollfds[n].fd == (int)(long)user) - pollfds[n].events |= (int)(long)len; - break; - - case LWS_CALLBACK_CLEAR_MODE_POLL_FD: - for (n = 0; n < count_pollfds; n++) - if (pollfds[n].fd == (int)(long)user) - pollfds[n].events &= ~(int)(long)len; - break; - - default: - break; - } - - return 0; -} - -/* - * this is just an example of parsing handshake headers, you don't need this - * in your code unless you will filter allowing connections by the header - * content - */ - -static void -dump_handshake_info(struct lws_tokens *lwst) -{ - int n; - static const char *token_names[] = { - [WSI_TOKEN_GET_URI] = "GET URI", - [WSI_TOKEN_HOST] = "Host", - [WSI_TOKEN_CONNECTION] = "Connection", - [WSI_TOKEN_KEY1] = "key 1", - [WSI_TOKEN_KEY2] = "key 2", - [WSI_TOKEN_PROTOCOL] = "Protocol", - [WSI_TOKEN_UPGRADE] = "Upgrade", - [WSI_TOKEN_ORIGIN] = "Origin", - [WSI_TOKEN_DRAFT] = "Draft", - [WSI_TOKEN_CHALLENGE] = "Challenge", - - /* new for 04 */ - [WSI_TOKEN_KEY] = "Key", - [WSI_TOKEN_VERSION] = "Version", - [WSI_TOKEN_SWORIGIN] = "Sworigin", - - /* new for 05 */ - [WSI_TOKEN_EXTENSIONS] = "Extensions", - - /* client receives these */ - [WSI_TOKEN_ACCEPT] = "Accept", - [WSI_TOKEN_NONCE] = "Nonce", - [WSI_TOKEN_HTTP] = "Http", - [WSI_TOKEN_MUXURL] = "MuxURL", - }; - - for (n = 0; n < WSI_TOKEN_COUNT; n++) { - if (lwst[n].token == NULL) - continue; - - fprintf(stderr, " %s = %s\n", token_names[n], lwst[n].token); - } -} - -/* dumb_increment protocol */ - -/* - * one of these is auto-created for each connection and a pointer to the - * appropriate instance is passed to the callback in the user parameter - * - * for this example protocol we use it to individualize the count for each - * connection. - */ - -struct per_session_data__dumb_increment { - int number; -}; - -static int -callback_dumb_increment(struct libwebsocket_context * this, - struct libwebsocket *wsi, - enum libwebsocket_callback_reasons reason, - void *user, void *in, size_t len) -{ - int n; - unsigned char buf[LWS_SEND_BUFFER_PRE_PADDING + 512 + - LWS_SEND_BUFFER_POST_PADDING]; - unsigned char *p = &buf[LWS_SEND_BUFFER_PRE_PADDING]; - struct per_session_data__dumb_increment *pss = user; - - switch (reason) { - - case LWS_CALLBACK_ESTABLISHED: - pss->number = 0; - break; - - /* - * in this protocol, we just use the broadcast action as the chance to - * send our own connection-specific data and ignore the broadcast info - * that is available in the 'in' parameter - */ - - case LWS_CALLBACK_BROADCAST: - n = sprintf((char *)p, "%d", pss->number++); - n = libwebsocket_write(wsi, p, n, LWS_WRITE_TEXT); - if (n < 0) { - fprintf(stderr, "ERROR writing to socket"); - return 1; - } - break; - - case LWS_CALLBACK_RECEIVE: - fprintf(stderr, "rx %d\n", (int)len); - if (len < 6) - break; - if (strcmp(in, "reset\n") == 0) - pss->number = 0; - break; - - /* - * this just demonstrates how to use the protocol filter. If you won't - * study and reject connections based on header content, you don't need - * to handle this callback - */ - - case LWS_CALLBACK_FILTER_PROTOCOL_CONNECTION: - dump_handshake_info((struct lws_tokens *)(long)user); - /* you could return non-zero here and kill the connection */ - break; - - default: - break; - } - - return 0; -} - - -/* lws-mirror_protocol */ - -#define MAX_MESSAGE_QUEUE 64 - -struct per_session_data__lws_mirror { - struct libwebsocket *wsi; - int ringbuffer_tail; -}; - -struct a_message { - void *payload; - size_t len; -}; - -static struct a_message ringbuffer[MAX_MESSAGE_QUEUE]; -static int ringbuffer_head; - - -static int -callback_lws_mirror(struct libwebsocket_context * this, - struct libwebsocket *wsi, - enum libwebsocket_callback_reasons reason, - void *user, void *in, size_t len) -{ - int n; - struct per_session_data__lws_mirror *pss = user; - - switch (reason) { - - case LWS_CALLBACK_ESTABLISHED: - pss->ringbuffer_tail = ringbuffer_head; - pss->wsi = wsi; - libwebsocket_callback_on_writable(this, wsi); - break; - - case LWS_CALLBACK_SERVER_WRITEABLE: - - if (pss->ringbuffer_tail != ringbuffer_head) { - - n = libwebsocket_write(wsi, (unsigned char *) - ringbuffer[pss->ringbuffer_tail].payload + - LWS_SEND_BUFFER_PRE_PADDING, - ringbuffer[pss->ringbuffer_tail].len, - LWS_WRITE_TEXT); - - if (n < 0) { - fprintf(stderr, "ERROR writing to socket"); - exit(1); - } - - if (pss->ringbuffer_tail == (MAX_MESSAGE_QUEUE - 1)) - pss->ringbuffer_tail = 0; - else - pss->ringbuffer_tail++; - - if (((ringbuffer_head - pss->ringbuffer_tail) % - MAX_MESSAGE_QUEUE) < (MAX_MESSAGE_QUEUE - 15)) - libwebsocket_rx_flow_control(wsi, 1); - - libwebsocket_callback_on_writable(this, wsi); - - } - break; - - case LWS_CALLBACK_BROADCAST: - n = libwebsocket_write(wsi, in, len, LWS_WRITE_TEXT); - if (n < 0) - fprintf(stderr, "mirror write failed\n"); - break; - - case LWS_CALLBACK_RECEIVE: - - if (ringbuffer[ringbuffer_head].payload) - free(ringbuffer[ringbuffer_head].payload); - - ringbuffer[ringbuffer_head].payload = - malloc(LWS_SEND_BUFFER_PRE_PADDING + len + - LWS_SEND_BUFFER_POST_PADDING); - ringbuffer[ringbuffer_head].len = len; - memcpy((char *)ringbuffer[ringbuffer_head].payload + - LWS_SEND_BUFFER_PRE_PADDING, in, len); - if (ringbuffer_head == (MAX_MESSAGE_QUEUE - 1)) - ringbuffer_head = 0; - else - ringbuffer_head++; - - if (((ringbuffer_head - pss->ringbuffer_tail) % - MAX_MESSAGE_QUEUE) > (MAX_MESSAGE_QUEUE - 10)) - libwebsocket_rx_flow_control(wsi, 0); - - libwebsocket_callback_on_writable_all_protocol( - libwebsockets_get_protocol(wsi)); - break; - - /* - * this just demonstrates how to use the protocol filter. If you won't - * study and reject connections based on header content, you don't need - * to handle this callback - */ - - case LWS_CALLBACK_FILTER_PROTOCOL_CONNECTION: - dump_handshake_info((struct lws_tokens *)(long)user); - /* you could return non-zero here and kill the connection */ - break; - - default: - break; - } - - return 0; -} - - -/* list of supported protocols and callbacks */ - -static struct libwebsocket_protocols protocols[] = { - /* first protocol must always be HTTP handler */ - - { - "http-only", /* name */ - callback_http, /* callback */ - 0 /* per_session_data_size */ - }, - { - "dumb-increment-protocol", - callback_dumb_increment, - sizeof(struct per_session_data__dumb_increment), - }, - { - "lws-mirror-protocol", - callback_lws_mirror, - sizeof(struct per_session_data__lws_mirror) - }, - { - NULL, NULL, 0 /* End of list */ - } -}; - -static struct option options[] = { - { "help", no_argument, NULL, 'h' }, - { "port", required_argument, NULL, 'p' }, - { "ssl", no_argument, NULL, 's' }, - { "killmask", no_argument, NULL, 'k' }, - { "interface", required_argument, NULL, 'i' }, - { NULL, 0, 0, 0 } -}; - -int main(int argc, char **argv) -{ - int n = 0; - const char *cert_path = - LOCAL_RESOURCE_PATH"/libwebsockets-test-server.pem"; - const char *key_path = - LOCAL_RESOURCE_PATH"/libwebsockets-test-server.key.pem"; - unsigned char buf[LWS_SEND_BUFFER_PRE_PADDING + 1024 + - LWS_SEND_BUFFER_POST_PADDING]; - int port = 7681; - int use_ssl = 0; - struct libwebsocket_context *context; - int opts = 0; - unsigned int oldus = 0; - char interface_name[128] = ""; - const char *interface_ptr = NULL; - - fprintf(stderr, "libwebsockets test server with external poll()\n" - "(C) Copyright 2010-2011 Andy Green " - "licensed under LGPL2.1\n"); - - while (n >= 0) { - n = getopt_long(argc, argv, "i:khsp:", options, NULL); - if (n < 0) - continue; - switch (n) { - case 's': - use_ssl = 1; - break; - case 'k': - opts = LWS_SERVER_OPTION_DEFEAT_CLIENT_MASK; - break; - case 'p': - port = atoi(optarg); - break; - case 'i': - strncpy(interface_name, optarg, sizeof interface_name); - interface_name[(sizeof interface_name) - 1] = '\0'; - interface_ptr = interface_name; - break; - case 'h': - fprintf(stderr, "Usage: test-server " - "[--port=

] [--ssl]\n"); - exit(1); - } - } - - if (!use_ssl) - cert_path = key_path = NULL; - - context = libwebsocket_create_context(port, interface_ptr, protocols, - libwebsocket_internal_extensions, - cert_path, key_path, -1, -1, opts); - if (context == NULL) { - fprintf(stderr, "libwebsocket init failed\n"); - return -1; - } - - buf[LWS_SEND_BUFFER_PRE_PADDING] = 'x'; - - /* - * This is an example of an existing application's explicit poll() - * loop that libwebsockets can integrate with. - */ - - while (1) { - struct timeval tv; - - /* - * this represents an existing server's single poll action - * which also includes libwebsocket sockets - */ - - n = poll(pollfds, count_pollfds, 25); - if (n < 0) - goto done; - - if (n) - for (n = 0; n < count_pollfds; n++) - if (pollfds[n].revents) - /* - * returns immediately if the fd does not - * match anything under libwebsockets - * control - */ - if (libwebsocket_service_fd(context, - &pollfds[n])) - goto done; - - /* do our broadcast periodically */ - - gettimeofday(&tv, NULL); - - /* - * This broadcasts to all dumb-increment-protocol connections - * at 20Hz. - * - * We're just sending a character 'x', in these examples the - * callbacks send their own per-connection content. - * - * You have to send something with nonzero length to get the - * callback actions delivered. - * - * We take care of pre-and-post padding allocation. - */ - - if (((unsigned int)tv.tv_usec - oldus) > 50000) { - libwebsockets_broadcast( - &protocols[PROTOCOL_DUMB_INCREMENT], - &buf[LWS_SEND_BUFFER_PRE_PADDING], 1); - oldus = tv.tv_usec; - } - } - -done: - libwebsocket_context_destroy(context); - - return 0; -} diff --git a/libs/libwebsockets/test-server/test-server.c b/libs/libwebsockets/test-server/test-server.c deleted file mode 100644 index 516deff7bd..0000000000 --- a/libs/libwebsockets/test-server/test-server.c +++ /dev/null @@ -1,551 +0,0 @@ -/* - * libwebsockets-test-server - libwebsockets test implementation - * - * Copyright (C) 2010-2011 Andy Green - * - * This 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: - * version 2.1 of the License. - * - * This 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 this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301 USA - */ - -#include -#include -#include -#include -#include -#include - -#include "../lib/libwebsockets.h" - -static int close_testing; - -/* - * This demo server shows how to use libwebsockets for one or more - * websocket protocols in the same server - * - * It defines the following websocket protocols: - * - * dumb-increment-protocol: once the socket is opened, an incrementing - * ascii string is sent down it every 50ms. - * If you send "reset\n" on the websocket, then - * the incrementing number is reset to 0. - * - * lws-mirror-protocol: copies any received packet to every connection also - * using this protocol, including the sender - */ - -enum demo_protocols { - /* always first */ - PROTOCOL_HTTP = 0, - - PROTOCOL_DUMB_INCREMENT, - PROTOCOL_LWS_MIRROR, - - /* always last */ - DEMO_PROTOCOL_COUNT -}; - - -#define LOCAL_RESOURCE_PATH INSTALL_DATADIR"/libwebsockets-test-server" - -/* this protocol server (always the first one) just knows how to do HTTP */ - -static int callback_http(struct libwebsocket_context *context, - struct libwebsocket *wsi, - enum libwebsocket_callback_reasons reason, void *user, - void *in, size_t len) -{ - char client_name[128]; - char client_ip[128]; - - switch (reason) { - case LWS_CALLBACK_HTTP: - fprintf(stderr, "serving HTTP URI %s\n", (char *)in); - - if (in && strcmp(in, "/favicon.ico") == 0) { - if (libwebsockets_serve_http_file(wsi, - LOCAL_RESOURCE_PATH"/favicon.ico", "image/x-icon")) - fprintf(stderr, "Failed to send favicon\n"); - break; - } - - /* send the script... when it runs it'll start websockets */ - - if (libwebsockets_serve_http_file(wsi, - LOCAL_RESOURCE_PATH"/test.html", "text/html")) - fprintf(stderr, "Failed to send HTTP file\n"); - break; - - /* - * callback for confirming to continue with client IP appear in - * protocol 0 callback since no websocket protocol has been agreed - * yet. You can just ignore this if you won't filter on client IP - * since the default uhandled callback return is 0 meaning let the - * connection continue. - */ - - case LWS_CALLBACK_FILTER_NETWORK_CONNECTION: - - libwebsockets_get_peer_addresses((int)(long)user, client_name, - sizeof(client_name), client_ip, sizeof(client_ip)); - - fprintf(stderr, "Received network connect from %s (%s)\n", - client_name, client_ip); - - /* if we returned non-zero from here, we kill the connection */ - break; - - default: - break; - } - - return 0; -} - - -/* - * this is just an example of parsing handshake headers, you don't need this - * in your code unless you will filter allowing connections by the header - * content - */ - -static void -dump_handshake_info(struct lws_tokens *lwst) -{ - int n; - static const char *token_names[WSI_TOKEN_COUNT] = { - /*[WSI_TOKEN_GET_URI] =*/ "GET URI", - /*[WSI_TOKEN_HOST] =*/ "Host", - /*[WSI_TOKEN_CONNECTION] =*/ "Connection", - /*[WSI_TOKEN_KEY1] =*/ "key 1", - /*[WSI_TOKEN_KEY2] =*/ "key 2", - /*[WSI_TOKEN_PROTOCOL] =*/ "Protocol", - /*[WSI_TOKEN_UPGRADE] =*/ "Upgrade", - /*[WSI_TOKEN_ORIGIN] =*/ "Origin", - /*[WSI_TOKEN_DRAFT] =*/ "Draft", - /*[WSI_TOKEN_CHALLENGE] =*/ "Challenge", - - /* new for 04 */ - /*[WSI_TOKEN_KEY] =*/ "Key", - /*[WSI_TOKEN_VERSION] =*/ "Version", - /*[WSI_TOKEN_SWORIGIN] =*/ "Sworigin", - - /* new for 05 */ - /*[WSI_TOKEN_EXTENSIONS] =*/ "Extensions", - - /* client receives these */ - /*[WSI_TOKEN_ACCEPT] =*/ "Accept", - /*[WSI_TOKEN_NONCE] =*/ "Nonce", - /*[WSI_TOKEN_HTTP] =*/ "Http", - /*[WSI_TOKEN_MUXURL] =*/ "MuxURL", - }; - - for (n = 0; n < WSI_TOKEN_COUNT; n++) { - if (lwst[n].token == NULL) - continue; - - fprintf(stderr, " %s = %s\n", token_names[n], lwst[n].token); - } -} - -/* dumb_increment protocol */ - -/* - * one of these is auto-created for each connection and a pointer to the - * appropriate instance is passed to the callback in the user parameter - * - * for this example protocol we use it to individualize the count for each - * connection. - */ - -struct per_session_data__dumb_increment { - int number; -}; - -static int -callback_dumb_increment(struct libwebsocket_context *context, - struct libwebsocket *wsi, - enum libwebsocket_callback_reasons reason, - void *user, void *in, size_t len) -{ - int n; - unsigned char buf[LWS_SEND_BUFFER_PRE_PADDING + 512 + - LWS_SEND_BUFFER_POST_PADDING]; - unsigned char *p = &buf[LWS_SEND_BUFFER_PRE_PADDING]; - struct per_session_data__dumb_increment *pss = user; - - switch (reason) { - - case LWS_CALLBACK_ESTABLISHED: - fprintf(stderr, "callback_dumb_increment: " - "LWS_CALLBACK_ESTABLISHED\n"); - pss->number = 0; - break; - - /* - * in this protocol, we just use the broadcast action as the chance to - * send our own connection-specific data and ignore the broadcast info - * that is available in the 'in' parameter - */ - - case LWS_CALLBACK_BROADCAST: - n = sprintf((char *)p, "%d", pss->number++); - n = libwebsocket_write(wsi, p, n, LWS_WRITE_TEXT); - if (n < 0) { - fprintf(stderr, "ERROR writing to socket"); - return 1; - } - if (close_testing && pss->number == 50) { - fprintf(stderr, "close tesing limit, closing\n"); - libwebsocket_close_and_free_session(context, wsi, - LWS_CLOSE_STATUS_NORMAL); - } - break; - - case LWS_CALLBACK_RECEIVE: - fprintf(stderr, "rx %d\n", (int)len); - if (len < 6) - break; - if (strcmp(in, "reset\n") == 0) - pss->number = 0; - break; - /* - * this just demonstrates how to use the protocol filter. If you won't - * study and reject connections based on header content, you don't need - * to handle this callback - */ - - case LWS_CALLBACK_FILTER_PROTOCOL_CONNECTION: - dump_handshake_info((struct lws_tokens *)(long)user); - /* you could return non-zero here and kill the connection */ - break; - - default: - break; - } - - return 0; -} - - -/* lws-mirror_protocol */ - -#define MAX_MESSAGE_QUEUE 64 - -struct per_session_data__lws_mirror { - struct libwebsocket *wsi; - int ringbuffer_tail; -}; - -struct a_message { - void *payload; - size_t len; -}; - -static struct a_message ringbuffer[MAX_MESSAGE_QUEUE]; -static int ringbuffer_head; - - -static int -callback_lws_mirror(struct libwebsocket_context *context, - struct libwebsocket *wsi, - enum libwebsocket_callback_reasons reason, - void *user, void *in, size_t len) -{ - int n; - struct per_session_data__lws_mirror *pss = user; - - switch (reason) { - - case LWS_CALLBACK_ESTABLISHED: - fprintf(stderr, "callback_lws_mirror: " - "LWS_CALLBACK_ESTABLISHED\n"); - pss->ringbuffer_tail = ringbuffer_head; - pss->wsi = wsi; - break; - - case LWS_CALLBACK_SERVER_WRITEABLE: - if (close_testing) - break; - if (pss->ringbuffer_tail != ringbuffer_head) { - - n = libwebsocket_write(wsi, (unsigned char *) - ringbuffer[pss->ringbuffer_tail].payload + - LWS_SEND_BUFFER_PRE_PADDING, - ringbuffer[pss->ringbuffer_tail].len, - LWS_WRITE_TEXT); - if (n < 0) { - fprintf(stderr, "ERROR writing to socket"); - exit(1); - } - - if (pss->ringbuffer_tail == (MAX_MESSAGE_QUEUE - 1)) - pss->ringbuffer_tail = 0; - else - pss->ringbuffer_tail++; - - if (((ringbuffer_head - pss->ringbuffer_tail) % - MAX_MESSAGE_QUEUE) < (MAX_MESSAGE_QUEUE - 15)) - libwebsocket_rx_flow_control(wsi, 1); - - libwebsocket_callback_on_writable(context, wsi); - - } - break; - - case LWS_CALLBACK_BROADCAST: - n = libwebsocket_write(wsi, in, len, LWS_WRITE_TEXT); - if (n < 0) - fprintf(stderr, "mirror write failed\n"); - break; - - case LWS_CALLBACK_RECEIVE: - - if (ringbuffer[ringbuffer_head].payload) - free(ringbuffer[ringbuffer_head].payload); - - ringbuffer[ringbuffer_head].payload = - malloc(LWS_SEND_BUFFER_PRE_PADDING + len + - LWS_SEND_BUFFER_POST_PADDING); - ringbuffer[ringbuffer_head].len = len; - memcpy((char *)ringbuffer[ringbuffer_head].payload + - LWS_SEND_BUFFER_PRE_PADDING, in, len); - if (ringbuffer_head == (MAX_MESSAGE_QUEUE - 1)) - ringbuffer_head = 0; - else - ringbuffer_head++; - - if (((ringbuffer_head - pss->ringbuffer_tail) % - MAX_MESSAGE_QUEUE) > (MAX_MESSAGE_QUEUE - 10)) - libwebsocket_rx_flow_control(wsi, 0); - - libwebsocket_callback_on_writable_all_protocol( - libwebsockets_get_protocol(wsi)); - break; - /* - * this just demonstrates how to use the protocol filter. If you won't - * study and reject connections based on header content, you don't need - * to handle this callback - */ - - case LWS_CALLBACK_FILTER_PROTOCOL_CONNECTION: - dump_handshake_info((struct lws_tokens *)(long)user); - /* you could return non-zero here and kill the connection */ - break; - - default: - break; - } - - return 0; -} - - -/* list of supported protocols and callbacks */ - -static struct libwebsocket_protocols protocols[] = { - /* first protocol must always be HTTP handler */ - - { - "http-only", /* name */ - callback_http, /* callback */ - 0 /* per_session_data_size */ - }, - { - "dumb-increment-protocol", - callback_dumb_increment, - sizeof(struct per_session_data__dumb_increment), - }, - { - "lws-mirror-protocol", - callback_lws_mirror, - sizeof(struct per_session_data__lws_mirror) - }, - { - NULL, NULL, 0 /* End of list */ - } -}; - -static struct option options[] = { - { "help", no_argument, NULL, 'h' }, - { "port", required_argument, NULL, 'p' }, - { "ssl", no_argument, NULL, 's' }, - { "killmask", no_argument, NULL, 'k' }, - { "interface", required_argument, NULL, 'i' }, - { "closetest", no_argument, NULL, 'c' }, - { NULL, 0, 0, 0 } -}; - -int main(int argc, char **argv) -{ - int n = 0; - const char *cert_path = - LOCAL_RESOURCE_PATH"/libwebsockets-test-server.pem"; - const char *key_path = - LOCAL_RESOURCE_PATH"/libwebsockets-test-server.key.pem"; - unsigned char buf[LWS_SEND_BUFFER_PRE_PADDING + 1024 + - LWS_SEND_BUFFER_POST_PADDING]; - int port = 7681; - int use_ssl = 0; - struct libwebsocket_context *context; - int opts = 0; - char interface_name[128] = ""; - const char *interface = NULL; -#ifdef LWS_NO_FORK - unsigned int oldus = 0; -#endif - - fprintf(stderr, "libwebsockets test server\n" - "(C) Copyright 2010-2011 Andy Green " - "licensed under LGPL2.1\n"); - - while (n >= 0) { - n = getopt_long(argc, argv, "ci:khsp:", options, NULL); - if (n < 0) - continue; - switch (n) { - case 's': - use_ssl = 1; - break; - case 'k': - opts = LWS_SERVER_OPTION_DEFEAT_CLIENT_MASK; - break; - case 'p': - port = atoi(optarg); - break; - case 'i': - strncpy(interface_name, optarg, sizeof interface_name); - interface_name[(sizeof interface_name) - 1] = '\0'; - interface = interface_name; - break; - case 'c': - close_testing = 1; - fprintf(stderr, " Close testing mode -- closes on " - "client after 50 dumb increments" - "and suppresses lws_mirror spam\n"); - break; - case 'h': - fprintf(stderr, "Usage: test-server " - "[--port=

] [--ssl]\n"); - exit(1); - } - } - - if (!use_ssl) - cert_path = key_path = NULL; - - context = libwebsocket_create_context(port, interface, protocols, - libwebsocket_internal_extensions, - cert_path, key_path, -1, -1, opts); - if (context == NULL) { - fprintf(stderr, "libwebsocket init failed\n"); - return -1; - } - - buf[LWS_SEND_BUFFER_PRE_PADDING] = 'x'; - -#ifdef LWS_NO_FORK - - /* - * This example shows how to work with no forked service loop - */ - - fprintf(stderr, " Using no-fork service loop\n"); - - n = 0; - while (n >= 0) { - struct timeval tv; - - gettimeofday(&tv, NULL); - - /* - * This broadcasts to all dumb-increment-protocol connections - * at 20Hz. - * - * We're just sending a character 'x', in these examples the - * callbacks send their own per-connection content. - * - * You have to send something with nonzero length to get the - * callback actions delivered. - * - * We take care of pre-and-post padding allocation. - */ - - if (((unsigned int)tv.tv_usec - oldus) > 50000) { - libwebsockets_broadcast( - &protocols[PROTOCOL_DUMB_INCREMENT], - &buf[LWS_SEND_BUFFER_PRE_PADDING], 1); - oldus = tv.tv_usec; - } - - /* - * This example server does not fork or create a thread for - * websocket service, it all runs in this single loop. So, - * we have to give the websockets an opportunity to service - * "manually". - * - * If no socket is needing service, the call below returns - * immediately and quickly. Negative return means we are - * in process of closing - */ - - n = libwebsocket_service(context, 50); - } - -#else - - /* - * This example shows how to work with the forked websocket service loop - */ - - fprintf(stderr, " Using forked service loop\n"); - - /* - * This forks the websocket service action into a subprocess so we - * don't have to take care about it. - */ - - n = libwebsockets_fork_service_loop(context); - if (n < 0) { - fprintf(stderr, "Unable to fork service loop %d\n", n); - return 1; - } - - while (1) { - - usleep(50000); - - /* - * This broadcasts to all dumb-increment-protocol connections - * at 20Hz. - * - * We're just sending a character 'x', in these examples the - * callbacks send their own per-connection content. - * - * You have to send something with nonzero length to get the - * callback actions delivered. - * - * We take care of pre-and-post padding allocation. - */ - - libwebsockets_broadcast(&protocols[PROTOCOL_DUMB_INCREMENT], - &buf[LWS_SEND_BUFFER_PRE_PADDING], 1); - } - -#endif - - libwebsocket_context_destroy(context); - - return 0; -} diff --git a/libs/libwebsockets/test-server/test.html b/libs/libwebsockets/test-server/test.html deleted file mode 100644 index 99d6236b83..0000000000 --- a/libs/libwebsockets/test-server/test.html +++ /dev/null @@ -1,361 +0,0 @@ - - - - - Minimal Websocket test app - - - -

Detected Browser:
...

-

libwebsockets "dumb-increment-protocol" test applet

-The incrementing number is coming from the server and is individual for -each connection to the server... try opening a second browser window. -Click the button to send the server a websocket message to -reset the number.

- - - - - - - -
Not initialized
- -

libwebsockets "lws-mirror-protocol" test applet

-Use the mouse to draw on the canvas below -- all other browser windows open -on this page see your drawing in realtime and you can see any of theirs as -well. -

-The lws-mirror protocol doesn't interpret what is being sent to it, it just -re-sends it to every other websocket it has a connection with using that -protocol, including the guy who sent the packet. -

libwebsockets-test-client spams circles on to this shared canvas when -run.

-

- - - - - - - - - -
Drawing color: - -
Not initialized
- - - - - diff --git a/libs/libwebsockets/win32port/client/client.vcxproj b/libs/libwebsockets/win32port/client/client.vcxproj deleted file mode 100644 index 1192afc142..0000000000 --- a/libs/libwebsockets/win32port/client/client.vcxproj +++ /dev/null @@ -1,259 +0,0 @@ - - - - - Debug static - Win32 - - - Debug - Win32 - - - Debug - x64 - - - Release DLL - Win32 - - - Release DLL - x64 - - - Release static - Win32 - - - Release - Win32 - - - Release - x64 - - - - - - - - - - - {332bf17e-fd30-4363-975a-aa731a827b4f} - - - {4156fc56-8443-2973-4fe2-a0bb2c621525} - - - - - - - - {6265650C-4799-451C-A687-94DE48759A8B} - Win32Proj - client - - - - Application - true - Unicode - - - Application - true - Unicode - - - Application - true - Unicode - - - Application - true - Unicode - - - Application - false - true - Unicode - - - Application - false - true - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - true - - - true - - - true - - - true - - - false - - - false - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../win32helpers - false - - - Console - true - ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../win32helpers - MultiThreadedDebug - false - - - Console - true - ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../win32helpers - - - Console - true - ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../win32helpers - - - Console - true - ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../win32helpers - MultiThreaded - false - - - Console - true - true - true - ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../win32helpers - - - Console - true - true - true - ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - - - - - false - ../win32helpers - WIN32;_CONSOLE - MultiThreaded - - - Ws2_32.lib;%(AdditionalDependencies) - - - - - false - MultiThreaded - false - ../win32helpers - WIN32;_CONSOLE;LWS_DLL - - - - - - \ No newline at end of file diff --git a/libs/libwebsockets/win32port/client/client.vcxproj.filters b/libs/libwebsockets/win32port/client/client.vcxproj.filters deleted file mode 100644 index 76f11219e3..0000000000 --- a/libs/libwebsockets/win32port/client/client.vcxproj.filters +++ /dev/null @@ -1,39 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/libs/libwebsockets/win32port/libwebsocketswin32/libwebsocketswin32.vcxproj b/libs/libwebsockets/win32port/libwebsocketswin32/libwebsocketswin32.vcxproj deleted file mode 100644 index 8c371f3ffe..0000000000 --- a/libs/libwebsockets/win32port/libwebsocketswin32/libwebsocketswin32.vcxproj +++ /dev/null @@ -1,274 +0,0 @@ - - - - - Debug static - Win32 - - - Debug - Win32 - - - Debug - x64 - - - Release DLL - Win32 - - - Release DLL - x64 - - - Release static - Win32 - - - Release - Win32 - - - Release - x64 - - - - {332BF17E-FD30-4363-975A-AA731A827B4F} - Win32Proj - libwebsocketswin32 - - - - StaticLibrary - true - Unicode - - - StaticLibrary - true - Unicode - - - StaticLibrary - true - Unicode - - - StaticLibrary - true - Unicode - - - StaticLibrary - false - true - Unicode - - - StaticLibrary - false - true - Unicode - - - StaticLibrary - - - DynamicLibrary - true - - - - - - - - - - - - - - - - - - - - - - - - - $(SolutionDir)..\output\ - D:\Libraries\libwebsockets\output\;$(LibraryPath) - libwebsockets_vc100-mt-sgd - - - D:\Libraries\libwebsockets\output\;$(LibraryPath) - - - D:\Libraries\libwebsockets\output\;$(LibraryPath) - - - libwebsockets_vc100-mt-s - - - - - - Level3 - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - ../win32helpers;../zlib - false - - - Windows - true - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - ../win32helpers;../zlib - MultiThreadedDebug - false - - - Windows - true - - - $(OutDir)libwebsockets_vc100-mt-sgd$(TargetExt) - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - ../win32helpers;../zlib - - - Windows - true - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - ../win32helpers;../zlib - - - Windows - true - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - ../win32helpers;../zlib - MultiThreaded - false - - - Windows - true - true - true - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - ../win32helpers;../zlib - - - Windows - true - true - true - - - - - ../win32helpers;../zlib - WIN32 - false - MultiThreaded - - - $(OutDir)libwebsockets_vc100-mt-s.lib - - - - - ../win32helpers;../zlib - WIN32;LWS_INTERNAL;LWS_DLL - false - MultiThreaded - false - Speed - true - - - $(OutDir)libwebsockets_vc100-mt-s.lib - - - Ws2_32.lib;..\..\output\ZLib_vc100-mt-s.lib;%(AdditionalDependencies) - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/libs/libwebsockets/win32port/libwebsocketswin32/libwebsocketswin32.vcxproj.filters b/libs/libwebsockets/win32port/libwebsocketswin32/libwebsocketswin32.vcxproj.filters deleted file mode 100644 index 3c6edbb327..0000000000 --- a/libs/libwebsockets/win32port/libwebsocketswin32/libwebsocketswin32.vcxproj.filters +++ /dev/null @@ -1,72 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Source Files - - - Header Files - - - \ No newline at end of file diff --git a/libs/libwebsockets/win32port/server/server.vcxproj b/libs/libwebsockets/win32port/server/server.vcxproj deleted file mode 100644 index 7fe50a8550..0000000000 --- a/libs/libwebsockets/win32port/server/server.vcxproj +++ /dev/null @@ -1,276 +0,0 @@ - - - - - Debug static - Win32 - - - Debug - Win32 - - - Debug - x64 - - - Release DLL - Win32 - - - Release DLL - x64 - - - Release static - Win32 - - - Release - Win32 - - - Release - x64 - - - - - ../win32helpers - ../win32helpers - ../win32helpers - ../win32helpers - - - - - - - - - - - - - - - - {332bf17e-fd30-4363-975a-aa731a827b4f} - - - {4156fc56-8443-2973-4fe2-a0bb2c621525} - - - - {E585B64F-9365-4C58-9EF8-56393EB27F8B} - Win32Proj - server - - - - Application - true - Unicode - - - Application - true - Unicode - - - Application - true - Unicode - - - Application - true - Unicode - - - Application - false - true - Unicode - - - Application - false - true - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - true - - - true - - - true - - - true - - - false - - - false - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../win32helpers - false - - - Console - true - - - ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../win32helpers - MultiThreadedDebug - false - - - Console - true - - - ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../win32helpers - - - Console - true - - - ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../win32helpers - - - Console - true - - - ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../win32helpers - MultiThreaded - false - - - Console - true - true - true - ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../win32helpers - - - Console - true - true - true - ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - - - - - false - ../win32helpers - WIN32;_CONSOLE - MultiThreaded - - - Ws2_32.lib;%(AdditionalDependencies) - - - - - false - MultiThreaded - false - ../win32helpers - WIN32;_CONSOLE;LWS_DLL - - - - - - \ No newline at end of file diff --git a/libs/libwebsockets/win32port/server/server.vcxproj.filters b/libs/libwebsockets/win32port/server/server.vcxproj.filters deleted file mode 100644 index d4a9c7da53..0000000000 --- a/libs/libwebsockets/win32port/server/server.vcxproj.filters +++ /dev/null @@ -1,51 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/libs/libwebsockets/win32port/win32helpers/getopt.c b/libs/libwebsockets/win32port/win32helpers/getopt.c deleted file mode 100644 index 2181f1cb12..0000000000 --- a/libs/libwebsockets/win32port/win32helpers/getopt.c +++ /dev/null @@ -1,153 +0,0 @@ -/* $NetBSD: getopt.c,v 1.16 1999/12/02 13:15:56 kleink Exp $ */ - -/* - * Copyright (c) 1987, 1993, 1994 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#if 0 -static char sccsid[] = "@(#)getopt.c 8.3 (Berkeley) 4/27/95"; -#endif - -#include -#include -#include -#include - -#define __P(x) x -#define _DIAGASSERT(x) assert(x) - -#ifdef __weak_alias -__weak_alias(getopt,_getopt); -#endif - - -int opterr = 1, /* if error message should be printed */ - optind = 1, /* index into parent argv vector */ - optopt, /* character checked for validity */ - optreset; /* reset getopt */ -char *optarg; /* argument associated with option */ - -static char * _progname __P((char *)); -int getopt_internal __P((int, char * const *, const char *)); - -static char * -_progname(nargv0) - char * nargv0; -{ - char * tmp; - - _DIAGASSERT(nargv0 != NULL); - - tmp = strrchr(nargv0, '/'); - if (tmp) - tmp++; - else - tmp = nargv0; - return(tmp); -} - -#define BADCH (int)'?' -#define BADARG (int)':' -#define EMSG "" - -/* - * getopt -- - * Parse argc/argv argument vector. - */ -int -getopt(nargc, nargv, ostr) - int nargc; - char * const nargv[]; - const char *ostr; -{ - static char *__progname = 0; - static char *place = EMSG; /* option letter processing */ - char *oli; /* option letter list index */ - __progname = __progname?__progname:_progname(*nargv); - - _DIAGASSERT(nargv != NULL); - _DIAGASSERT(ostr != NULL); - - if (optreset || !*place) { /* update scanning pointer */ - optreset = 0; - if (optind >= nargc || *(place = nargv[optind]) != '-') { - place = EMSG; - return (-1); - } - if (place[1] && *++place == '-' /* found "--" */ - && place[1] == '\0') { - ++optind; - place = EMSG; - return (-1); - } - } /* option letter okay? */ - if ((optopt = (int)*place++) == (int)':' || - !(oli = strchr(ostr, optopt))) { - /* - * if the user didn't specify '-' as an option, - * assume it means -1. - */ - if (optopt == (int)'-') - return (-1); - if (!*place) - ++optind; - if (opterr && *ostr != ':') - (void)fprintf(stderr, - "%s: illegal option -- %c\n", __progname, optopt); - return (BADCH); - } - if (*++oli != ':') { /* don't need argument */ - optarg = NULL; - if (!*place) - ++optind; - } - else { /* need an argument */ - if (*place) /* no white space */ - optarg = place; - else if (nargc <= ++optind) { /* no arg */ - place = EMSG; - if (*ostr == ':') - return (BADARG); - if (opterr) - (void)fprintf(stderr, - "%s: option requires an argument -- %c\n", - __progname, optopt); - return (BADCH); - } - else /* white space */ - optarg = nargv[optind]; - place = EMSG; - ++optind; - } - return (optopt); /* dump back option letter */ -} - diff --git a/libs/libwebsockets/win32port/win32helpers/getopt.h b/libs/libwebsockets/win32port/win32helpers/getopt.h deleted file mode 100644 index 5a88c2df6b..0000000000 --- a/libs/libwebsockets/win32port/win32helpers/getopt.h +++ /dev/null @@ -1,33 +0,0 @@ -#ifndef __GETOPT_H__ -#define __GETOPT_H__ - -#ifdef __cplusplus -extern "C" { -#endif - -extern int opterr; /* if error message should be printed */ -extern int optind; /* index into parent argv vector */ -extern int optopt; /* character checked for validity */ -extern int optreset; /* reset getopt */ -extern char *optarg; /* argument associated with option */ - -struct option -{ - const char *name; - int has_arg; - int *flag; - int val; -}; - -#define no_argument 0 -#define required_argument 1 -#define optional_argument 2 - -int getopt(int, char**, char*); -int getopt_long(int, char**, char*, struct option*, int*); - -#ifdef __cplusplus -} -#endif - -#endif /* __GETOPT_H__ */ diff --git a/libs/libwebsockets/win32port/win32helpers/getopt_long.c b/libs/libwebsockets/win32port/win32helpers/getopt_long.c deleted file mode 100644 index 43a5cba79a..0000000000 --- a/libs/libwebsockets/win32port/win32helpers/getopt_long.c +++ /dev/null @@ -1,237 +0,0 @@ - -/* - * Copyright (c) 1987, 1993, 1994, 1996 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#include -#include -#include -#include -#include -#include "getopt.h" - -extern int opterr; /* if error message should be printed */ -extern int optind; /* index into parent argv vector */ -extern int optopt; /* character checked for validity */ -extern int optreset; /* reset getopt */ -extern char *optarg; /* argument associated with option */ - -#define __P(x) x -#define _DIAGASSERT(x) assert(x) - -static char * __progname __P((char *)); -int getopt_internal __P((int, char * const *, const char *)); - -static char * -__progname(nargv0) - char * nargv0; -{ - char * tmp; - - _DIAGASSERT(nargv0 != NULL); - - tmp = strrchr(nargv0, '/'); - if (tmp) - tmp++; - else - tmp = nargv0; - return(tmp); -} - -#define BADCH (int)'?' -#define BADARG (int)':' -#define EMSG "" - -/* - * getopt -- - * Parse argc/argv argument vector. - */ -int -getopt_internal(nargc, nargv, ostr) - int nargc; - char * const *nargv; - const char *ostr; -{ - static char *place = EMSG; /* option letter processing */ - char *oli; /* option letter list index */ - - _DIAGASSERT(nargv != NULL); - _DIAGASSERT(ostr != NULL); - - if (optreset || !*place) { /* update scanning pointer */ - optreset = 0; - if (optind >= nargc || *(place = nargv[optind]) != '-') { - place = EMSG; - return (-1); - } - if (place[1] && *++place == '-') { /* found "--" */ - /* ++optind; */ - place = EMSG; - return (-2); - } - } /* option letter okay? */ - if ((optopt = (int)*place++) == (int)':' || - !(oli = strchr(ostr, optopt))) { - /* - * if the user didn't specify '-' as an option, - * assume it means -1. - */ - if (optopt == (int)'-') - return (-1); - if (!*place) - ++optind; - if (opterr && *ostr != ':') - (void)fprintf(stderr, - "%s: illegal option -- %c\n", __progname(nargv[0]), optopt); - return (BADCH); - } - if (*++oli != ':') { /* don't need argument */ - optarg = NULL; - if (!*place) - ++optind; - } else { /* need an argument */ - if (*place) /* no white space */ - optarg = place; - else if (nargc <= ++optind) { /* no arg */ - place = EMSG; - if ((opterr) && (*ostr != ':')) - (void)fprintf(stderr, - "%s: option requires an argument -- %c\n", - __progname(nargv[0]), optopt); - return (BADARG); - } else /* white space */ - optarg = nargv[optind]; - place = EMSG; - ++optind; - } - return (optopt); /* dump back option letter */ -} - -#if 0 -/* - * getopt -- - * Parse argc/argv argument vector. - */ -int -getopt2(nargc, nargv, ostr) - int nargc; - char * const *nargv; - const char *ostr; -{ - int retval; - - if ((retval = getopt_internal(nargc, nargv, ostr)) == -2) { - retval = -1; - ++optind; - } - return(retval); -} -#endif - -/* - * getopt_long -- - * Parse argc/argv argument vector. - */ -int -getopt_long(nargc, nargv, options, long_options, index) - int nargc; - char ** nargv; - char * options; - struct option * long_options; - int * index; -{ - int retval; - - _DIAGASSERT(nargv != NULL); - _DIAGASSERT(options != NULL); - _DIAGASSERT(long_options != NULL); - /* index may be NULL */ - - if ((retval = getopt_internal(nargc, nargv, options)) == -2) { - char *current_argv = nargv[optind++] + 2, *has_equal; - int i, current_argv_len, match = -1; - - if (*current_argv == '\0') { - return(-1); - } - if ((has_equal = strchr(current_argv, '=')) != NULL) { - current_argv_len = has_equal - current_argv; - has_equal++; - } else - current_argv_len = strlen(current_argv); - - for (i = 0; long_options[i].name; i++) { - if (strncmp(current_argv, long_options[i].name, current_argv_len)) - continue; - - if (strlen(long_options[i].name) == (unsigned)current_argv_len) { - match = i; - break; - } - if (match == -1) - match = i; - } - if (match != -1) { - if (long_options[match].has_arg == required_argument || - long_options[match].has_arg == optional_argument) { - if (has_equal) - optarg = has_equal; - else - optarg = nargv[optind++]; - } - if ((long_options[match].has_arg == required_argument) - && (optarg == NULL)) { - /* - * Missing argument, leading : - * indicates no error should be generated - */ - if ((opterr) && (*options != ':')) - (void)fprintf(stderr, - "%s: option requires an argument -- %s\n", - __progname(nargv[0]), current_argv); - return (BADARG); - } - } else { /* No matching argument */ - if ((opterr) && (*options != ':')) - (void)fprintf(stderr, - "%s: illegal option -- %s\n", __progname(nargv[0]), current_argv); - return (BADCH); - } - if (long_options[match].flag) { - *long_options[match].flag = long_options[match].val; - retval = 0; - } else - retval = long_options[match].val; - if (index) - *index = match; - } - return(retval); -} diff --git a/libs/libwebsockets/win32port/win32helpers/gettimeofday.c b/libs/libwebsockets/win32port/win32helpers/gettimeofday.c deleted file mode 100644 index a424db923b..0000000000 --- a/libs/libwebsockets/win32port/win32helpers/gettimeofday.c +++ /dev/null @@ -1,48 +0,0 @@ -#include < time.h > -#include //I've ommited context line. -#if defined(_MSC_VER) || defined(_MSC_EXTENSIONS) - #define DELTA_EPOCH_IN_MICROSECS 11644473600000000Ui64 -#else - #define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL -#endif - -struct timezone -{ - int tz_minuteswest; /* minutes W of Greenwich */ - int tz_dsttime; /* type of dst correction */ -}; - -int gettimeofday(struct timeval *tv, struct timezone *tz) -{ - FILETIME ft; - unsigned __int64 tmpres = 0; - static int tzflag; - - if (NULL != tv) - { - GetSystemTimeAsFileTime(&ft); - - tmpres |= ft.dwHighDateTime; - tmpres <<= 32; - tmpres |= ft.dwLowDateTime; - - /*converting file time to unix epoch*/ - tmpres -= DELTA_EPOCH_IN_MICROSECS; - tmpres /= 10; /*convert into microseconds*/ - tv->tv_sec = (long)(tmpres / 1000000UL); - tv->tv_usec = (long)(tmpres % 1000000UL); - } - - if (NULL != tz) - { - if (!tzflag) - { - _tzset(); - tzflag++; - } - tz->tz_minuteswest = _timezone / 60; - tz->tz_dsttime = _daylight; - } - - return 0; -} diff --git a/libs/libwebsockets/win32port/win32helpers/gettimeofday.h b/libs/libwebsockets/win32port/win32helpers/gettimeofday.h deleted file mode 100644 index 223ceeed8b..0000000000 --- a/libs/libwebsockets/win32port/win32helpers/gettimeofday.h +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef _GET_TIME_OF_DAY_H -#define _GET_TIME_OF_DAY_H - -#ifdef __MINGW64__ -#else -#ifdef __MINGW32__ -#else -#include < time.h > -#endif -#endif - -#include //I've ommited context line. -#if defined(_MSC_VER) || defined(_MSC_EXTENSIONS) - #define DELTA_EPOCH_IN_MICROSECS 11644473600000000Ui64 -#else - #define DELTA_EPOCH_IN_MICROSECS 11644473600000000ULL -#endif - -struct timezone -{ - int tz_minuteswest; /* minutes W of Greenwich */ - int tz_dsttime; /* type of dst correction */ -}; - -int gettimeofday(struct timeval *tv, struct timezone *tz); - - -#endif diff --git a/libs/libwebsockets/win32port/win32helpers/netdb.h b/libs/libwebsockets/win32port/win32helpers/netdb.h deleted file mode 100644 index 45304b7673..0000000000 --- a/libs/libwebsockets/win32port/win32helpers/netdb.h +++ /dev/null @@ -1 +0,0 @@ -// Left blank for win32 \ No newline at end of file diff --git a/libs/libwebsockets/win32port/win32helpers/strings.h b/libs/libwebsockets/win32port/win32helpers/strings.h deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/libs/libwebsockets/win32port/win32helpers/sys/time.h b/libs/libwebsockets/win32port/win32helpers/sys/time.h deleted file mode 100644 index 258af63bcd..0000000000 --- a/libs/libwebsockets/win32port/win32helpers/sys/time.h +++ /dev/null @@ -1 +0,0 @@ -// left blank \ No newline at end of file diff --git a/libs/libwebsockets/win32port/win32helpers/unistd.h b/libs/libwebsockets/win32port/win32helpers/unistd.h deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/libs/libwebsockets/win32port/win32helpers/websock-w32.c b/libs/libwebsockets/win32port/win32helpers/websock-w32.c deleted file mode 100644 index bec150b179..0000000000 --- a/libs/libwebsockets/win32port/win32helpers/websock-w32.c +++ /dev/null @@ -1,104 +0,0 @@ -#define FD_SETSIZE 256 - -#ifdef __MINGW32__ -#include -#else -#ifdef __MINGW64__ -#include -#else -#include -#endif -#endif - -#include -#include -#include "websock-w32.h" - -PFNWSAPOLL poll = NULL; - -INT WSAAPI emulated_poll(LPWSAPOLLFD fdarray, ULONG nfds, INT timeout) -{ - fd_set readfds; - fd_set writefds; - struct timeval tv; - struct timeval *ptv = &tv; - SOCKET max_socket = 0; - ULONG n = 0; - int waiting; - int pending = 0; - WSAPOLLFD * poll_fd = fdarray; - - if (NULL == fdarray) { - errno = EFAULT; - return -1; - } - - FD_ZERO(&readfds); - FD_ZERO(&writefds); - - tv.tv_sec = timeout / 1000; - tv.tv_usec = (timeout % 1000) * 1000; - - if (timeout < 0) - ptv = NULL; - - while (n < nfds) { - - poll_fd->revents = 0; - - if (poll_fd->fd < 0 || !poll_fd->events) - goto skip1; - - if (max_socket < poll_fd->fd) - max_socket = poll_fd->fd; - - if (poll_fd->events & POLLIN) - FD_SET(poll_fd->fd, &readfds); - - if (poll_fd->events & POLLOUT) - FD_SET(poll_fd->fd, &writefds); -skip1: - poll_fd++; - n++; - } - - waiting = select((int)max_socket + 1, &readfds, &writefds, NULL, ptv); - - if (waiting <= 0) - return waiting; - - poll_fd = fdarray; - - while (waiting && nfds--) { - - if (!poll_fd->events) - goto skip2; - - if (poll_fd->fd <= 0) { - poll_fd->revents = POLLNVAL; - goto skip2; - } - - if (FD_ISSET(poll_fd->fd, &readfds)) { - - /* defer POLLHUP / error detect to false read attempt */ - - poll_fd->revents |= POLLIN; - waiting--; - } - - if (FD_ISSET(poll_fd->fd, &writefds)) { - - poll_fd->revents |= poll_fd->events & POLLOUT; - waiting--; - } - - if (poll_fd->revents) - pending++; - -skip2: - poll_fd++; - } - - return pending; -} diff --git a/libs/libwebsockets/win32port/win32helpers/websock-w32.h b/libs/libwebsockets/win32port/win32helpers/websock-w32.h deleted file mode 100644 index dfd99ca917..0000000000 --- a/libs/libwebsockets/win32port/win32helpers/websock-w32.h +++ /dev/null @@ -1,64 +0,0 @@ -#ifndef __WEB_SOCK_W32_H__ -#define __WEB_SOCK_W32_H__ - -// Windows uses _DEBUG and NDEBUG -#ifdef _DEBUG -#undef DEBUG -#define DEBUG 1 -#endif - -#pragma warning(disable : 4996) - -#define bzero(b,len) (memset((b), '\0', (len)), (void) 0) - -#define MSG_NOSIGNAL 0 -#define SHUT_RDWR SD_BOTH - -#define SOL_TCP IPPROTO_TCP - -#define random rand -#define usleep _sleep - -#ifdef __MINGW64__ -#define DEF_POLL_STUFF -#endif -#ifdef __MINGW32__ -#define DEF_POLL_STUFF -#endif - -#ifdef DEF_POLL_STUFF - -#include - -typedef struct pollfd { - SOCKET fd; - short events; - short revents; -} WSAPOLLFD, *PWSAPOLLFD, *LPWSAPOLLFD; - -#define POLLIN 0x0001 /* any readable data available */ -#define POLLOUT 0x0004 /* file descriptor is writeable */ -#define POLLERR 0x0008 /* some poll error occurred */ -#define POLLHUP 0x0010 /* file descriptor was "hung up" */ -#define POLLNVAL 0x0020 /* requested events "invalid" */ - -#endif - -typedef INT (WSAAPI *PFNWSAPOLL)(LPWSAPOLLFD fdarray, ULONG nfds, INT timeout); -extern PFNWSAPOLL poll; - -extern INT WSAAPI emulated_poll(LPWSAPOLLFD fdarray, ULONG nfds, INT timeout); - -/* override configure because we are not using Makefiles */ - -#define LWS_NO_FORK - -/* windows can't cope with this idea, needs assets in cwd */ - -#ifdef INSTALL_DATADIR -#undef INSTALL_DATADIR -#endif - -#define INSTALL_DATADIR "." - -#endif diff --git a/libs/libwebsockets/win32port/win32port.sln b/libs/libwebsockets/win32port/win32port.sln deleted file mode 100644 index fc7ca7c2eb..0000000000 --- a/libs/libwebsockets/win32port/win32port.sln +++ /dev/null @@ -1,100 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server", "server\server.vcxproj", "{E585B64F-9365-4C58-9EF8-56393EB27F8B}" - ProjectSection(ProjectDependencies) = postProject - {332BF17E-FD30-4363-975A-AA731A827B4F} = {332BF17E-FD30-4363-975A-AA731A827B4F} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwebsocketswin32", "libwebsocketswin32\libwebsocketswin32.vcxproj", "{332BF17E-FD30-4363-975A-AA731A827B4F}" - ProjectSection(ProjectDependencies) = postProject - {4156FC56-8443-2973-4FE2-A0BB2C621525} = {4156FC56-8443-2973-4FE2-A0BB2C621525} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "client\client.vcxproj", "{6265650C-4799-451C-A687-94DE48759A8B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ZLib", "zlib\ZLib.vcxproj", "{4156FC56-8443-2973-4FE2-A0BB2C621525}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug static|Win32 = Debug static|Win32 - Debug static|x64 = Debug static|x64 - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release DLL|Win32 = Release DLL|Win32 - Release DLL|x64 = Release DLL|x64 - Release static|Win32 = Release static|Win32 - Release static|x64 = Release static|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {332BF17E-FD30-4363-975A-AA731A827B4F}.Debug static|Win32.ActiveCfg = Debug static|Win32 - {332BF17E-FD30-4363-975A-AA731A827B4F}.Debug static|Win32.Build.0 = Debug static|Win32 - {332BF17E-FD30-4363-975A-AA731A827B4F}.Debug static|x64.ActiveCfg = Debug static|Win32 - {332BF17E-FD30-4363-975A-AA731A827B4F}.Debug|Win32.ActiveCfg = Debug|Win32 - {332BF17E-FD30-4363-975A-AA731A827B4F}.Debug|Win32.Build.0 = Debug|Win32 - {332BF17E-FD30-4363-975A-AA731A827B4F}.Debug|x64.ActiveCfg = Debug|Win32 - {332BF17E-FD30-4363-975A-AA731A827B4F}.Release DLL|Win32.ActiveCfg = Release DLL|Win32 - {332BF17E-FD30-4363-975A-AA731A827B4F}.Release DLL|Win32.Build.0 = Release DLL|Win32 - {332BF17E-FD30-4363-975A-AA731A827B4F}.Release DLL|x64.ActiveCfg = Release DLL|x64 - {332BF17E-FD30-4363-975A-AA731A827B4F}.Release DLL|x64.Build.0 = Release DLL|x64 - {332BF17E-FD30-4363-975A-AA731A827B4F}.Release static|Win32.ActiveCfg = Release static|Win32 - {332BF17E-FD30-4363-975A-AA731A827B4F}.Release static|Win32.Build.0 = Release static|Win32 - {332BF17E-FD30-4363-975A-AA731A827B4F}.Release static|x64.ActiveCfg = Release static|Win32 - {332BF17E-FD30-4363-975A-AA731A827B4F}.Release|Win32.ActiveCfg = Release|Win32 - {332BF17E-FD30-4363-975A-AA731A827B4F}.Release|Win32.Build.0 = Release|Win32 - {332BF17E-FD30-4363-975A-AA731A827B4F}.Release|x64.ActiveCfg = Release|Win32 - {4156FC56-8443-2973-4FE2-A0BB2C621525}.Debug static|Win32.ActiveCfg = Debug static|Win32 - {4156FC56-8443-2973-4FE2-A0BB2C621525}.Debug static|Win32.Build.0 = Debug static|Win32 - {4156FC56-8443-2973-4FE2-A0BB2C621525}.Debug static|x64.ActiveCfg = Debug static|Win32 - {4156FC56-8443-2973-4FE2-A0BB2C621525}.Debug|Win32.ActiveCfg = Debug|Win32 - {4156FC56-8443-2973-4FE2-A0BB2C621525}.Debug|Win32.Build.0 = Debug|Win32 - {4156FC56-8443-2973-4FE2-A0BB2C621525}.Debug|x64.ActiveCfg = Debug|Win32 - {4156FC56-8443-2973-4FE2-A0BB2C621525}.Release DLL|Win32.ActiveCfg = Release DLL|Win32 - {4156FC56-8443-2973-4FE2-A0BB2C621525}.Release DLL|Win32.Build.0 = Release DLL|Win32 - {4156FC56-8443-2973-4FE2-A0BB2C621525}.Release DLL|x64.ActiveCfg = Release DLL|x64 - {4156FC56-8443-2973-4FE2-A0BB2C621525}.Release DLL|x64.Build.0 = Release DLL|x64 - {4156FC56-8443-2973-4FE2-A0BB2C621525}.Release static|Win32.ActiveCfg = Release static|Win32 - {4156FC56-8443-2973-4FE2-A0BB2C621525}.Release static|Win32.Build.0 = Release static|Win32 - {4156FC56-8443-2973-4FE2-A0BB2C621525}.Release static|x64.ActiveCfg = Release static|Win32 - {4156FC56-8443-2973-4FE2-A0BB2C621525}.Release|Win32.ActiveCfg = Release|Win32 - {4156FC56-8443-2973-4FE2-A0BB2C621525}.Release|Win32.Build.0 = Release|Win32 - {4156FC56-8443-2973-4FE2-A0BB2C621525}.Release|x64.ActiveCfg = Release|Win32 - {6265650C-4799-451C-A687-94DE48759A8B}.Debug static|Win32.ActiveCfg = Debug static|Win32 - {6265650C-4799-451C-A687-94DE48759A8B}.Debug static|Win32.Build.0 = Debug static|Win32 - {6265650C-4799-451C-A687-94DE48759A8B}.Debug static|x64.ActiveCfg = Debug static|Win32 - {6265650C-4799-451C-A687-94DE48759A8B}.Debug|Win32.ActiveCfg = Debug|Win32 - {6265650C-4799-451C-A687-94DE48759A8B}.Debug|Win32.Build.0 = Debug|Win32 - {6265650C-4799-451C-A687-94DE48759A8B}.Debug|x64.ActiveCfg = Debug|Win32 - {6265650C-4799-451C-A687-94DE48759A8B}.Release DLL|Win32.ActiveCfg = Release DLL|Win32 - {6265650C-4799-451C-A687-94DE48759A8B}.Release DLL|Win32.Build.0 = Release DLL|Win32 - {6265650C-4799-451C-A687-94DE48759A8B}.Release DLL|x64.ActiveCfg = Release DLL|x64 - {6265650C-4799-451C-A687-94DE48759A8B}.Release DLL|x64.Build.0 = Release DLL|x64 - {6265650C-4799-451C-A687-94DE48759A8B}.Release static|Win32.ActiveCfg = Release static|Win32 - {6265650C-4799-451C-A687-94DE48759A8B}.Release static|Win32.Build.0 = Release static|Win32 - {6265650C-4799-451C-A687-94DE48759A8B}.Release static|x64.ActiveCfg = Release static|Win32 - {6265650C-4799-451C-A687-94DE48759A8B}.Release|Win32.ActiveCfg = Release|Win32 - {6265650C-4799-451C-A687-94DE48759A8B}.Release|Win32.Build.0 = Release|Win32 - {6265650C-4799-451C-A687-94DE48759A8B}.Release|x64.ActiveCfg = Release|Win32 - {E585B64F-9365-4C58-9EF8-56393EB27F8B}.Debug static|Win32.ActiveCfg = Debug static|Win32 - {E585B64F-9365-4C58-9EF8-56393EB27F8B}.Debug static|Win32.Build.0 = Debug static|Win32 - {E585B64F-9365-4C58-9EF8-56393EB27F8B}.Debug static|x64.ActiveCfg = Debug static|Win32 - {E585B64F-9365-4C58-9EF8-56393EB27F8B}.Debug|Win32.ActiveCfg = Debug|Win32 - {E585B64F-9365-4C58-9EF8-56393EB27F8B}.Debug|Win32.Build.0 = Debug|Win32 - {E585B64F-9365-4C58-9EF8-56393EB27F8B}.Debug|x64.ActiveCfg = Debug|Win32 - {E585B64F-9365-4C58-9EF8-56393EB27F8B}.Release DLL|Win32.ActiveCfg = Release DLL|Win32 - {E585B64F-9365-4C58-9EF8-56393EB27F8B}.Release DLL|Win32.Build.0 = Release DLL|Win32 - {E585B64F-9365-4C58-9EF8-56393EB27F8B}.Release DLL|x64.ActiveCfg = Release DLL|x64 - {E585B64F-9365-4C58-9EF8-56393EB27F8B}.Release DLL|x64.Build.0 = Release DLL|x64 - {E585B64F-9365-4C58-9EF8-56393EB27F8B}.Release static|Win32.ActiveCfg = Release static|Win32 - {E585B64F-9365-4C58-9EF8-56393EB27F8B}.Release static|Win32.Build.0 = Release static|Win32 - {E585B64F-9365-4C58-9EF8-56393EB27F8B}.Release static|x64.ActiveCfg = Release static|Win32 - {E585B64F-9365-4C58-9EF8-56393EB27F8B}.Release|Win32.ActiveCfg = Release|Win32 - {E585B64F-9365-4C58-9EF8-56393EB27F8B}.Release|Win32.Build.0 = Release|Win32 - {E585B64F-9365-4C58-9EF8-56393EB27F8B}.Release|x64.ActiveCfg = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/libs/libwebsockets/win32port/zlib/ZLib.vcxproj b/libs/libwebsockets/win32port/zlib/ZLib.vcxproj deleted file mode 100644 index 0afc43c923..0000000000 --- a/libs/libwebsockets/win32port/zlib/ZLib.vcxproj +++ /dev/null @@ -1,374 +0,0 @@ - - - - - Debug static - Win32 - - - Debug - Win32 - - - Debug - x64 - - - Release DLL - Win32 - - - Release DLL - x64 - - - Release static - Win32 - - - Release - Win32 - - - Release - x64 - - - - {4156FC56-8443-2973-4FE2-A0BB2C621525} - - - - StaticLibrary - false - MultiByte - - - StaticLibrary - false - MultiByte - - - StaticLibrary - MultiByte - - - StaticLibrary - MultiByte - - - StaticLibrary - MultiByte - - - StaticLibrary - MultiByte - - - StaticLibrary - - - StaticLibrary - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - DebugV10\ - DebugV10\ - - - $(SolutionDir)..\output\ - DebugV10\ - ZLib_vc100-mt-sgd - - - DebugV10\ - DebugV10\ - - - DebugV10\ - DebugV10\ - - - .\Release\ - .\Release\ - - - .\Release\ - .\Release\ - - - $(SolutionDir)..\output\ - ZLib_vc100-mt-s - - - $(SolutionDir)..\output\ - ZLib_vc100-mt-s - - - - MultiThreadedDebugDLL - Default - false - Disabled - true - Level3 - true - EditAndContinue - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - DebugV10\ - DebugV10\ZLib.pch - DebugV10\ - DebugV10\ - EnableFastChecks - false - false - - - 0x1c09 - _DEBUG;%(PreprocessorDefinitions) - - - true - DebugV10\ZLib.bsc - - - true - DebugV10\ZLib.lib - - - - - MultiThreadedDebug - Default - false - Disabled - true - Level3 - true - EditAndContinue - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - DebugV10\ - DebugV10\ZLib.pch - DebugV10\ - DebugV10\ - EnableFastChecks - false - false - - - 0x1c09 - _DEBUG;%(PreprocessorDefinitions) - - - true - DebugV10\ZLib.bsc - - - true - $(OutDir)ZLib_vc100-mt-sgd.lib - - - - - MultiThreadedDebugDLL - Default - false - Disabled - true - Level3 - ProgramDatabase - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - DebugV10\ - DebugV10\ZLib.pch - DebugV10\ - DebugV10\ - EnableFastChecks - false - - - 0x1c09 - _DEBUG;%(PreprocessorDefinitions) - - - true - DebugV10\ZLib.bsc - - - true - DebugV10\ZLib.lib - - - - - MultiThreadedDebugDLL - Default - false - Disabled - true - Level3 - ProgramDatabase - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - DebugV10\ - DebugV10\ZLib.pch - DebugV10\ - DebugV10\ - EnableFastChecks - false - - - 0x1c09 - _DEBUG;%(PreprocessorDefinitions) - - - true - DebugV10\ZLib.bsc - - - true - DebugV10\ZLib.lib - - - - - MultiThreaded - OnlyExplicitInline - true - true - MaxSpeed - true - Level3 - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - .\Release\ - .\Release\ZLib.pch - .\Release\ - .\Release\ - false - false - - - 0x1c09 - NDEBUG;%(PreprocessorDefinitions) - - - true - .\Release\ZLib.bsc - - - true - .\Release\ZLib.lib - - - - - MultiThreadedDLL - OnlyExplicitInline - true - true - MaxSpeed - true - Level3 - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - .\Release\ - .\Release\ZLib.pch - .\Release\ - .\Release\ - false - - - 0x1c09 - NDEBUG;%(PreprocessorDefinitions) - - - true - .\Release\ZLib.bsc - - - true - .\Release\ZLib.lib - - - - - $(OutDir)ZLib_vc100-mt-s.lib - - - MultiThreaded - false - - - - - $(OutDir)ZLib_vc100-mt-s.lib - true - - - MultiThreaded - false - false - true - Speed - WIN32 - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/libs/libwebsockets/win32port/zlib/ZLib.vcxproj.filters b/libs/libwebsockets/win32port/zlib/ZLib.vcxproj.filters deleted file mode 100644 index 3e6c18da25..0000000000 --- a/libs/libwebsockets/win32port/zlib/ZLib.vcxproj.filters +++ /dev/null @@ -1,95 +0,0 @@ - - - - - {2e5deede-b2ef-40bd-950a-a7f7f0fc0413} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {85d35343-9068-43e8-875e-60b528a03c9b} - h;hpp;hxx;hm;inl - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - \ No newline at end of file diff --git a/libs/libwebsockets/win32port/zlib/adler32.c b/libs/libwebsockets/win32port/zlib/adler32.c deleted file mode 100644 index 5f2bc6bf4f..0000000000 --- a/libs/libwebsockets/win32port/zlib/adler32.c +++ /dev/null @@ -1,169 +0,0 @@ -/* adler32.c -- compute the Adler-32 checksum of a data stream - * Copyright (C) 1995-2007 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -/* @(#) $Id$ */ - -#include "zutil.h" - -#define local static - -local uLong adler32_combine_(uLong adler1, uLong adler2, z_off64_t len2); - -#define BASE 65521UL /* largest prime smaller than 65536 */ -#define NMAX 5552 -/* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */ - -#define DO1(buf,i) {adler += (buf)[i]; sum2 += adler;} -#define DO2(buf,i) DO1(buf,i); DO1(buf,i+1); -#define DO4(buf,i) DO2(buf,i); DO2(buf,i+2); -#define DO8(buf,i) DO4(buf,i); DO4(buf,i+4); -#define DO16(buf) DO8(buf,0); DO8(buf,8); - -/* use NO_DIVIDE if your processor does not do division in hardware */ -#ifdef NO_DIVIDE -# define MOD(a) \ - do { \ - if (a >= (BASE << 16)) a -= (BASE << 16); \ - if (a >= (BASE << 15)) a -= (BASE << 15); \ - if (a >= (BASE << 14)) a -= (BASE << 14); \ - if (a >= (BASE << 13)) a -= (BASE << 13); \ - if (a >= (BASE << 12)) a -= (BASE << 12); \ - if (a >= (BASE << 11)) a -= (BASE << 11); \ - if (a >= (BASE << 10)) a -= (BASE << 10); \ - if (a >= (BASE << 9)) a -= (BASE << 9); \ - if (a >= (BASE << 8)) a -= (BASE << 8); \ - if (a >= (BASE << 7)) a -= (BASE << 7); \ - if (a >= (BASE << 6)) a -= (BASE << 6); \ - if (a >= (BASE << 5)) a -= (BASE << 5); \ - if (a >= (BASE << 4)) a -= (BASE << 4); \ - if (a >= (BASE << 3)) a -= (BASE << 3); \ - if (a >= (BASE << 2)) a -= (BASE << 2); \ - if (a >= (BASE << 1)) a -= (BASE << 1); \ - if (a >= BASE) a -= BASE; \ - } while (0) -# define MOD4(a) \ - do { \ - if (a >= (BASE << 4)) a -= (BASE << 4); \ - if (a >= (BASE << 3)) a -= (BASE << 3); \ - if (a >= (BASE << 2)) a -= (BASE << 2); \ - if (a >= (BASE << 1)) a -= (BASE << 1); \ - if (a >= BASE) a -= BASE; \ - } while (0) -#else -# define MOD(a) a %= BASE -# define MOD4(a) a %= BASE -#endif - -/* ========================================================================= */ -uLong ZEXPORT adler32(adler, buf, len) - uLong adler; - const Bytef *buf; - uInt len; -{ - unsigned long sum2; - unsigned n; - - /* split Adler-32 into component sums */ - sum2 = (adler >> 16) & 0xffff; - adler &= 0xffff; - - /* in case user likes doing a byte at a time, keep it fast */ - if (len == 1) { - adler += buf[0]; - if (adler >= BASE) - adler -= BASE; - sum2 += adler; - if (sum2 >= BASE) - sum2 -= BASE; - return adler | (sum2 << 16); - } - - /* initial Adler-32 value (deferred check for len == 1 speed) */ - if (buf == Z_NULL) - return 1L; - - /* in case short lengths are provided, keep it somewhat fast */ - if (len < 16) { - while (len--) { - adler += *buf++; - sum2 += adler; - } - if (adler >= BASE) - adler -= BASE; - MOD4(sum2); /* only added so many BASE's */ - return adler | (sum2 << 16); - } - - /* do length NMAX blocks -- requires just one modulo operation */ - while (len >= NMAX) { - len -= NMAX; - n = NMAX / 16; /* NMAX is divisible by 16 */ - do { - DO16(buf); /* 16 sums unrolled */ - buf += 16; - } while (--n); - MOD(adler); - MOD(sum2); - } - - /* do remaining bytes (less than NMAX, still just one modulo) */ - if (len) { /* avoid modulos if none remaining */ - while (len >= 16) { - len -= 16; - DO16(buf); - buf += 16; - } - while (len--) { - adler += *buf++; - sum2 += adler; - } - MOD(adler); - MOD(sum2); - } - - /* return recombined sums */ - return adler | (sum2 << 16); -} - -/* ========================================================================= */ -local uLong adler32_combine_(adler1, adler2, len2) - uLong adler1; - uLong adler2; - z_off64_t len2; -{ - unsigned long sum1; - unsigned long sum2; - unsigned rem; - - /* the derivation of this formula is left as an exercise for the reader */ - rem = (unsigned)(len2 % BASE); - sum1 = adler1 & 0xffff; - sum2 = rem * sum1; - MOD(sum2); - sum1 += (adler2 & 0xffff) + BASE - 1; - sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem; - if (sum1 >= BASE) sum1 -= BASE; - if (sum1 >= BASE) sum1 -= BASE; - if (sum2 >= (BASE << 1)) sum2 -= (BASE << 1); - if (sum2 >= BASE) sum2 -= BASE; - return sum1 | (sum2 << 16); -} - -/* ========================================================================= */ -uLong ZEXPORT adler32_combine(adler1, adler2, len2) - uLong adler1; - uLong adler2; - z_off_t len2; -{ - return adler32_combine_(adler1, adler2, len2); -} - -uLong ZEXPORT adler32_combine64(adler1, adler2, len2) - uLong adler1; - uLong adler2; - z_off64_t len2; -{ - return adler32_combine_(adler1, adler2, len2); -} diff --git a/libs/libwebsockets/win32port/zlib/compress.c b/libs/libwebsockets/win32port/zlib/compress.c deleted file mode 100644 index c46727a416..0000000000 --- a/libs/libwebsockets/win32port/zlib/compress.c +++ /dev/null @@ -1,80 +0,0 @@ -/* compress.c -- compress a memory buffer - * Copyright (C) 1995-2005 Jean-loup Gailly. - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -/* @(#) $Id$ */ - -#define ZLIB_INTERNAL -#include "zlib.h" - -/* =========================================================================== - Compresses the source buffer into the destination buffer. The level - parameter has the same meaning as in deflateInit. sourceLen is the byte - length of the source buffer. Upon entry, destLen is the total size of the - destination buffer, which must be at least 0.1% larger than sourceLen plus - 12 bytes. Upon exit, destLen is the actual size of the compressed buffer. - - compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough - memory, Z_BUF_ERROR if there was not enough room in the output buffer, - Z_STREAM_ERROR if the level parameter is invalid. -*/ -int ZEXPORT compress2 (dest, destLen, source, sourceLen, level) - Bytef *dest; - uLongf *destLen; - const Bytef *source; - uLong sourceLen; - int level; -{ - z_stream stream; - int err; - - stream.next_in = (Bytef*)source; - stream.avail_in = (uInt)sourceLen; -#ifdef MAXSEG_64K - /* Check for source > 64K on 16-bit machine: */ - if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR; -#endif - stream.next_out = dest; - stream.avail_out = (uInt)*destLen; - if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR; - - stream.zalloc = (alloc_func)0; - stream.zfree = (free_func)0; - stream.opaque = (voidpf)0; - - err = deflateInit(&stream, level); - if (err != Z_OK) return err; - - err = deflate(&stream, Z_FINISH); - if (err != Z_STREAM_END) { - deflateEnd(&stream); - return err == Z_OK ? Z_BUF_ERROR : err; - } - *destLen = stream.total_out; - - err = deflateEnd(&stream); - return err; -} - -/* =========================================================================== - */ -int ZEXPORT compress (dest, destLen, source, sourceLen) - Bytef *dest; - uLongf *destLen; - const Bytef *source; - uLong sourceLen; -{ - return compress2(dest, destLen, source, sourceLen, Z_DEFAULT_COMPRESSION); -} - -/* =========================================================================== - If the default memLevel or windowBits for deflateInit() is changed, then - this function needs to be updated. - */ -uLong ZEXPORT compressBound (sourceLen) - uLong sourceLen; -{ - return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) + - (sourceLen >> 25) + 13; -} diff --git a/libs/libwebsockets/win32port/zlib/crc32.c b/libs/libwebsockets/win32port/zlib/crc32.c deleted file mode 100644 index 8cb3d8fffd..0000000000 --- a/libs/libwebsockets/win32port/zlib/crc32.c +++ /dev/null @@ -1,442 +0,0 @@ -/* crc32.c -- compute the CRC-32 of a data stream - * Copyright (C) 1995-2006, 2010 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h - * - * Thanks to Rodney Brown for his contribution of faster - * CRC methods: exclusive-oring 32 bits of data at a time, and pre-computing - * tables for updating the shift register in one step with three exclusive-ors - * instead of four steps with four exclusive-ors. This results in about a - * factor of two increase in speed on a Power PC G4 (PPC7455) using gcc -O3. - */ - -/* @(#) $Id$ */ - -/* - Note on the use of DYNAMIC_CRC_TABLE: there is no mutex or semaphore - protection on the static variables used to control the first-use generation - of the crc tables. Therefore, if you #define DYNAMIC_CRC_TABLE, you should - first call get_crc_table() to initialize the tables before allowing more than - one thread to use crc32(). - */ - -#ifdef MAKECRCH -# include -# ifndef DYNAMIC_CRC_TABLE -# define DYNAMIC_CRC_TABLE -# endif /* !DYNAMIC_CRC_TABLE */ -#endif /* MAKECRCH */ - -#include "zutil.h" /* for STDC and FAR definitions */ - -#define local static - -/* Find a four-byte integer type for crc32_little() and crc32_big(). */ -#ifndef NOBYFOUR -# ifdef STDC /* need ANSI C limits.h to determine sizes */ -# include -# define BYFOUR -# if (UINT_MAX == 0xffffffffUL) - typedef unsigned int u4; -# else -# if (ULONG_MAX == 0xffffffffUL) - typedef unsigned long u4; -# else -# if (USHRT_MAX == 0xffffffffUL) - typedef unsigned short u4; -# else -# undef BYFOUR /* can't find a four-byte integer type! */ -# endif -# endif -# endif -# endif /* STDC */ -#endif /* !NOBYFOUR */ - -/* Definitions for doing the crc four data bytes at a time. */ -#ifdef BYFOUR -# define REV(w) ((((w)>>24)&0xff)+(((w)>>8)&0xff00)+ \ - (((w)&0xff00)<<8)+(((w)&0xff)<<24)) - local unsigned long crc32_little OF((unsigned long, - const unsigned char FAR *, unsigned)); - local unsigned long crc32_big OF((unsigned long, - const unsigned char FAR *, unsigned)); -# define TBLS 8 -#else -# define TBLS 1 -#endif /* BYFOUR */ - -/* Local functions for crc concatenation */ -local unsigned long gf2_matrix_times OF((unsigned long *mat, - unsigned long vec)); -local void gf2_matrix_square OF((unsigned long *square, unsigned long *mat)); -local uLong crc32_combine_(uLong crc1, uLong crc2, z_off64_t len2); - - -#ifdef DYNAMIC_CRC_TABLE - -local volatile int crc_table_empty = 1; -local unsigned long FAR crc_table[TBLS][256]; -local void make_crc_table OF((void)); -#ifdef MAKECRCH - local void write_table OF((FILE *, const unsigned long FAR *)); -#endif /* MAKECRCH */ -/* - Generate tables for a byte-wise 32-bit CRC calculation on the polynomial: - x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1. - - Polynomials over GF(2) are represented in binary, one bit per coefficient, - with the lowest powers in the most significant bit. Then adding polynomials - is just exclusive-or, and multiplying a polynomial by x is a right shift by - one. If we call the above polynomial p, and represent a byte as the - polynomial q, also with the lowest power in the most significant bit (so the - byte 0xb1 is the polynomial x^7+x^3+x+1), then the CRC is (q*x^32) mod p, - where a mod b means the remainder after dividing a by b. - - This calculation is done using the shift-register method of multiplying and - taking the remainder. The register is initialized to zero, and for each - incoming bit, x^32 is added mod p to the register if the bit is a one (where - x^32 mod p is p+x^32 = x^26+...+1), and the register is multiplied mod p by - x (which is shifting right by one and adding x^32 mod p if the bit shifted - out is a one). We start with the highest power (least significant bit) of - q and repeat for all eight bits of q. - - The first table is simply the CRC of all possible eight bit values. This is - all the information needed to generate CRCs on data a byte at a time for all - combinations of CRC register values and incoming bytes. The remaining tables - allow for word-at-a-time CRC calculation for both big-endian and little- - endian machines, where a word is four bytes. -*/ -local void make_crc_table() -{ - unsigned long c; - int n, k; - unsigned long poly; /* polynomial exclusive-or pattern */ - /* terms of polynomial defining this crc (except x^32): */ - static volatile int first = 1; /* flag to limit concurrent making */ - static const unsigned char p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26}; - - /* See if another task is already doing this (not thread-safe, but better - than nothing -- significantly reduces duration of vulnerability in - case the advice about DYNAMIC_CRC_TABLE is ignored) */ - if (first) { - first = 0; - - /* make exclusive-or pattern from polynomial (0xedb88320UL) */ - poly = 0UL; - for (n = 0; n < sizeof(p)/sizeof(unsigned char); n++) - poly |= 1UL << (31 - p[n]); - - /* generate a crc for every 8-bit value */ - for (n = 0; n < 256; n++) { - c = (unsigned long)n; - for (k = 0; k < 8; k++) - c = c & 1 ? poly ^ (c >> 1) : c >> 1; - crc_table[0][n] = c; - } - -#ifdef BYFOUR - /* generate crc for each value followed by one, two, and three zeros, - and then the byte reversal of those as well as the first table */ - for (n = 0; n < 256; n++) { - c = crc_table[0][n]; - crc_table[4][n] = REV(c); - for (k = 1; k < 4; k++) { - c = crc_table[0][c & 0xff] ^ (c >> 8); - crc_table[k][n] = c; - crc_table[k + 4][n] = REV(c); - } - } -#endif /* BYFOUR */ - - crc_table_empty = 0; - } - else { /* not first */ - /* wait for the other guy to finish (not efficient, but rare) */ - while (crc_table_empty) - ; - } - -#ifdef MAKECRCH - /* write out CRC tables to crc32.h */ - { - FILE *out; - - out = fopen("crc32.h", "w"); - if (out == NULL) return; - fprintf(out, "/* crc32.h -- tables for rapid CRC calculation\n"); - fprintf(out, " * Generated automatically by crc32.c\n */\n\n"); - fprintf(out, "local const unsigned long FAR "); - fprintf(out, "crc_table[TBLS][256] =\n{\n {\n"); - write_table(out, crc_table[0]); -# ifdef BYFOUR - fprintf(out, "#ifdef BYFOUR\n"); - for (k = 1; k < 8; k++) { - fprintf(out, " },\n {\n"); - write_table(out, crc_table[k]); - } - fprintf(out, "#endif\n"); -# endif /* BYFOUR */ - fprintf(out, " }\n};\n"); - fclose(out); - } -#endif /* MAKECRCH */ -} - -#ifdef MAKECRCH -local void write_table(out, table) - FILE *out; - const unsigned long FAR *table; -{ - int n; - - for (n = 0; n < 256; n++) - fprintf(out, "%s0x%08lxUL%s", n % 5 ? "" : " ", table[n], - n == 255 ? "\n" : (n % 5 == 4 ? ",\n" : ", ")); -} -#endif /* MAKECRCH */ - -#else /* !DYNAMIC_CRC_TABLE */ -/* ======================================================================== - * Tables of CRC-32s of all single-byte values, made by make_crc_table(). - */ -#include "crc32.h" -#endif /* DYNAMIC_CRC_TABLE */ - -/* ========================================================================= - * This function can be used by asm versions of crc32() - */ -const unsigned long FAR * ZEXPORT get_crc_table() -{ -#ifdef DYNAMIC_CRC_TABLE - if (crc_table_empty) - make_crc_table(); -#endif /* DYNAMIC_CRC_TABLE */ - return (const unsigned long FAR *)crc_table; -} - -/* ========================================================================= */ -#define DO1 crc = crc_table[0][((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8) -#define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1 - -/* ========================================================================= */ -unsigned long ZEXPORT crc32(crc, buf, len) - unsigned long crc; - const unsigned char FAR *buf; - uInt len; -{ - if (buf == Z_NULL) return 0UL; - -#ifdef DYNAMIC_CRC_TABLE - if (crc_table_empty) - make_crc_table(); -#endif /* DYNAMIC_CRC_TABLE */ - -#ifdef BYFOUR - if (sizeof(void *) == sizeof(ptrdiff_t)) { - u4 endian; - - endian = 1; - if (*((unsigned char *)(&endian))) - return crc32_little(crc, buf, len); - else - return crc32_big(crc, buf, len); - } -#endif /* BYFOUR */ - crc = crc ^ 0xffffffffUL; - while (len >= 8) { - DO8; - len -= 8; - } - if (len) do { - DO1; - } while (--len); - return crc ^ 0xffffffffUL; -} - -#ifdef BYFOUR - -/* ========================================================================= */ -#define DOLIT4 c ^= *buf4++; \ - c = crc_table[3][c & 0xff] ^ crc_table[2][(c >> 8) & 0xff] ^ \ - crc_table[1][(c >> 16) & 0xff] ^ crc_table[0][c >> 24] -#define DOLIT32 DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4 - -/* ========================================================================= */ -local unsigned long crc32_little(crc, buf, len) - unsigned long crc; - const unsigned char FAR *buf; - unsigned len; -{ - register u4 c; - register const u4 FAR *buf4; - - c = (u4)crc; - c = ~c; - while (len && ((ptrdiff_t)buf & 3)) { - c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8); - len--; - } - - buf4 = (const u4 FAR *)(const void FAR *)buf; - while (len >= 32) { - DOLIT32; - len -= 32; - } - while (len >= 4) { - DOLIT4; - len -= 4; - } - buf = (const unsigned char FAR *)buf4; - - if (len) do { - c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8); - } while (--len); - c = ~c; - return (unsigned long)c; -} - -/* ========================================================================= */ -#define DOBIG4 c ^= *++buf4; \ - c = crc_table[4][c & 0xff] ^ crc_table[5][(c >> 8) & 0xff] ^ \ - crc_table[6][(c >> 16) & 0xff] ^ crc_table[7][c >> 24] -#define DOBIG32 DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4 - -/* ========================================================================= */ -local unsigned long crc32_big(crc, buf, len) - unsigned long crc; - const unsigned char FAR *buf; - unsigned len; -{ - register u4 c; - register const u4 FAR *buf4; - - c = REV((u4)crc); - c = ~c; - while (len && ((ptrdiff_t)buf & 3)) { - c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8); - len--; - } - - buf4 = (const u4 FAR *)(const void FAR *)buf; - buf4--; - while (len >= 32) { - DOBIG32; - len -= 32; - } - while (len >= 4) { - DOBIG4; - len -= 4; - } - buf4++; - buf = (const unsigned char FAR *)buf4; - - if (len) do { - c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8); - } while (--len); - c = ~c; - return (unsigned long)(REV(c)); -} - -#endif /* BYFOUR */ - -#define GF2_DIM 32 /* dimension of GF(2) vectors (length of CRC) */ - -/* ========================================================================= */ -local unsigned long gf2_matrix_times(mat, vec) - unsigned long *mat; - unsigned long vec; -{ - unsigned long sum; - - sum = 0; - while (vec) { - if (vec & 1) - sum ^= *mat; - vec >>= 1; - mat++; - } - return sum; -} - -/* ========================================================================= */ -local void gf2_matrix_square(square, mat) - unsigned long *square; - unsigned long *mat; -{ - int n; - - for (n = 0; n < GF2_DIM; n++) - square[n] = gf2_matrix_times(mat, mat[n]); -} - -/* ========================================================================= */ -local uLong crc32_combine_(crc1, crc2, len2) - uLong crc1; - uLong crc2; - z_off64_t len2; -{ - int n; - unsigned long row; - unsigned long even[GF2_DIM]; /* even-power-of-two zeros operator */ - unsigned long odd[GF2_DIM]; /* odd-power-of-two zeros operator */ - - /* degenerate case (also disallow negative lengths) */ - if (len2 <= 0) - return crc1; - - /* put operator for one zero bit in odd */ - odd[0] = 0xedb88320UL; /* CRC-32 polynomial */ - row = 1; - for (n = 1; n < GF2_DIM; n++) { - odd[n] = row; - row <<= 1; - } - - /* put operator for two zero bits in even */ - gf2_matrix_square(even, odd); - - /* put operator for four zero bits in odd */ - gf2_matrix_square(odd, even); - - /* apply len2 zeros to crc1 (first square will put the operator for one - zero byte, eight zero bits, in even) */ - do { - /* apply zeros operator for this bit of len2 */ - gf2_matrix_square(even, odd); - if (len2 & 1) - crc1 = gf2_matrix_times(even, crc1); - len2 >>= 1; - - /* if no more bits set, then done */ - if (len2 == 0) - break; - - /* another iteration of the loop with odd and even swapped */ - gf2_matrix_square(odd, even); - if (len2 & 1) - crc1 = gf2_matrix_times(odd, crc1); - len2 >>= 1; - - /* if no more bits set, then done */ - } while (len2 != 0); - - /* return combined crc */ - crc1 ^= crc2; - return crc1; -} - -/* ========================================================================= */ -uLong ZEXPORT crc32_combine(crc1, crc2, len2) - uLong crc1; - uLong crc2; - z_off_t len2; -{ - return crc32_combine_(crc1, crc2, len2); -} - -uLong ZEXPORT crc32_combine64(crc1, crc2, len2) - uLong crc1; - uLong crc2; - z_off64_t len2; -{ - return crc32_combine_(crc1, crc2, len2); -} diff --git a/libs/libwebsockets/win32port/zlib/crc32.h b/libs/libwebsockets/win32port/zlib/crc32.h deleted file mode 100644 index 5de49bc978..0000000000 --- a/libs/libwebsockets/win32port/zlib/crc32.h +++ /dev/null @@ -1,441 +0,0 @@ -/* crc32.h -- tables for rapid CRC calculation - * Generated automatically by crc32.c - */ - -local const unsigned long FAR crc_table[TBLS][256] = -{ - { - 0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL, - 0x706af48fUL, 0xe963a535UL, 0x9e6495a3UL, 0x0edb8832UL, 0x79dcb8a4UL, - 0xe0d5e91eUL, 0x97d2d988UL, 0x09b64c2bUL, 0x7eb17cbdUL, 0xe7b82d07UL, - 0x90bf1d91UL, 0x1db71064UL, 0x6ab020f2UL, 0xf3b97148UL, 0x84be41deUL, - 0x1adad47dUL, 0x6ddde4ebUL, 0xf4d4b551UL, 0x83d385c7UL, 0x136c9856UL, - 0x646ba8c0UL, 0xfd62f97aUL, 0x8a65c9ecUL, 0x14015c4fUL, 0x63066cd9UL, - 0xfa0f3d63UL, 0x8d080df5UL, 0x3b6e20c8UL, 0x4c69105eUL, 0xd56041e4UL, - 0xa2677172UL, 0x3c03e4d1UL, 0x4b04d447UL, 0xd20d85fdUL, 0xa50ab56bUL, - 0x35b5a8faUL, 0x42b2986cUL, 0xdbbbc9d6UL, 0xacbcf940UL, 0x32d86ce3UL, - 0x45df5c75UL, 0xdcd60dcfUL, 0xabd13d59UL, 0x26d930acUL, 0x51de003aUL, - 0xc8d75180UL, 0xbfd06116UL, 0x21b4f4b5UL, 0x56b3c423UL, 0xcfba9599UL, - 0xb8bda50fUL, 0x2802b89eUL, 0x5f058808UL, 0xc60cd9b2UL, 0xb10be924UL, - 0x2f6f7c87UL, 0x58684c11UL, 0xc1611dabUL, 0xb6662d3dUL, 0x76dc4190UL, - 0x01db7106UL, 0x98d220bcUL, 0xefd5102aUL, 0x71b18589UL, 0x06b6b51fUL, - 0x9fbfe4a5UL, 0xe8b8d433UL, 0x7807c9a2UL, 0x0f00f934UL, 0x9609a88eUL, - 0xe10e9818UL, 0x7f6a0dbbUL, 0x086d3d2dUL, 0x91646c97UL, 0xe6635c01UL, - 0x6b6b51f4UL, 0x1c6c6162UL, 0x856530d8UL, 0xf262004eUL, 0x6c0695edUL, - 0x1b01a57bUL, 0x8208f4c1UL, 0xf50fc457UL, 0x65b0d9c6UL, 0x12b7e950UL, - 0x8bbeb8eaUL, 0xfcb9887cUL, 0x62dd1ddfUL, 0x15da2d49UL, 0x8cd37cf3UL, - 0xfbd44c65UL, 0x4db26158UL, 0x3ab551ceUL, 0xa3bc0074UL, 0xd4bb30e2UL, - 0x4adfa541UL, 0x3dd895d7UL, 0xa4d1c46dUL, 0xd3d6f4fbUL, 0x4369e96aUL, - 0x346ed9fcUL, 0xad678846UL, 0xda60b8d0UL, 0x44042d73UL, 0x33031de5UL, - 0xaa0a4c5fUL, 0xdd0d7cc9UL, 0x5005713cUL, 0x270241aaUL, 0xbe0b1010UL, - 0xc90c2086UL, 0x5768b525UL, 0x206f85b3UL, 0xb966d409UL, 0xce61e49fUL, - 0x5edef90eUL, 0x29d9c998UL, 0xb0d09822UL, 0xc7d7a8b4UL, 0x59b33d17UL, - 0x2eb40d81UL, 0xb7bd5c3bUL, 0xc0ba6cadUL, 0xedb88320UL, 0x9abfb3b6UL, - 0x03b6e20cUL, 0x74b1d29aUL, 0xead54739UL, 0x9dd277afUL, 0x04db2615UL, - 0x73dc1683UL, 0xe3630b12UL, 0x94643b84UL, 0x0d6d6a3eUL, 0x7a6a5aa8UL, - 0xe40ecf0bUL, 0x9309ff9dUL, 0x0a00ae27UL, 0x7d079eb1UL, 0xf00f9344UL, - 0x8708a3d2UL, 0x1e01f268UL, 0x6906c2feUL, 0xf762575dUL, 0x806567cbUL, - 0x196c3671UL, 0x6e6b06e7UL, 0xfed41b76UL, 0x89d32be0UL, 0x10da7a5aUL, - 0x67dd4accUL, 0xf9b9df6fUL, 0x8ebeeff9UL, 0x17b7be43UL, 0x60b08ed5UL, - 0xd6d6a3e8UL, 0xa1d1937eUL, 0x38d8c2c4UL, 0x4fdff252UL, 0xd1bb67f1UL, - 0xa6bc5767UL, 0x3fb506ddUL, 0x48b2364bUL, 0xd80d2bdaUL, 0xaf0a1b4cUL, - 0x36034af6UL, 0x41047a60UL, 0xdf60efc3UL, 0xa867df55UL, 0x316e8eefUL, - 0x4669be79UL, 0xcb61b38cUL, 0xbc66831aUL, 0x256fd2a0UL, 0x5268e236UL, - 0xcc0c7795UL, 0xbb0b4703UL, 0x220216b9UL, 0x5505262fUL, 0xc5ba3bbeUL, - 0xb2bd0b28UL, 0x2bb45a92UL, 0x5cb36a04UL, 0xc2d7ffa7UL, 0xb5d0cf31UL, - 0x2cd99e8bUL, 0x5bdeae1dUL, 0x9b64c2b0UL, 0xec63f226UL, 0x756aa39cUL, - 0x026d930aUL, 0x9c0906a9UL, 0xeb0e363fUL, 0x72076785UL, 0x05005713UL, - 0x95bf4a82UL, 0xe2b87a14UL, 0x7bb12baeUL, 0x0cb61b38UL, 0x92d28e9bUL, - 0xe5d5be0dUL, 0x7cdcefb7UL, 0x0bdbdf21UL, 0x86d3d2d4UL, 0xf1d4e242UL, - 0x68ddb3f8UL, 0x1fda836eUL, 0x81be16cdUL, 0xf6b9265bUL, 0x6fb077e1UL, - 0x18b74777UL, 0x88085ae6UL, 0xff0f6a70UL, 0x66063bcaUL, 0x11010b5cUL, - 0x8f659effUL, 0xf862ae69UL, 0x616bffd3UL, 0x166ccf45UL, 0xa00ae278UL, - 0xd70dd2eeUL, 0x4e048354UL, 0x3903b3c2UL, 0xa7672661UL, 0xd06016f7UL, - 0x4969474dUL, 0x3e6e77dbUL, 0xaed16a4aUL, 0xd9d65adcUL, 0x40df0b66UL, - 0x37d83bf0UL, 0xa9bcae53UL, 0xdebb9ec5UL, 0x47b2cf7fUL, 0x30b5ffe9UL, - 0xbdbdf21cUL, 0xcabac28aUL, 0x53b39330UL, 0x24b4a3a6UL, 0xbad03605UL, - 0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL, - 0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL, - 0x2d02ef8dUL -#ifdef BYFOUR - }, - { - 0x00000000UL, 0x191b3141UL, 0x32366282UL, 0x2b2d53c3UL, 0x646cc504UL, - 0x7d77f445UL, 0x565aa786UL, 0x4f4196c7UL, 0xc8d98a08UL, 0xd1c2bb49UL, - 0xfaefe88aUL, 0xe3f4d9cbUL, 0xacb54f0cUL, 0xb5ae7e4dUL, 0x9e832d8eUL, - 0x87981ccfUL, 0x4ac21251UL, 0x53d92310UL, 0x78f470d3UL, 0x61ef4192UL, - 0x2eaed755UL, 0x37b5e614UL, 0x1c98b5d7UL, 0x05838496UL, 0x821b9859UL, - 0x9b00a918UL, 0xb02dfadbUL, 0xa936cb9aUL, 0xe6775d5dUL, 0xff6c6c1cUL, - 0xd4413fdfUL, 0xcd5a0e9eUL, 0x958424a2UL, 0x8c9f15e3UL, 0xa7b24620UL, - 0xbea97761UL, 0xf1e8e1a6UL, 0xe8f3d0e7UL, 0xc3de8324UL, 0xdac5b265UL, - 0x5d5daeaaUL, 0x44469febUL, 0x6f6bcc28UL, 0x7670fd69UL, 0x39316baeUL, - 0x202a5aefUL, 0x0b07092cUL, 0x121c386dUL, 0xdf4636f3UL, 0xc65d07b2UL, - 0xed705471UL, 0xf46b6530UL, 0xbb2af3f7UL, 0xa231c2b6UL, 0x891c9175UL, - 0x9007a034UL, 0x179fbcfbUL, 0x0e848dbaUL, 0x25a9de79UL, 0x3cb2ef38UL, - 0x73f379ffUL, 0x6ae848beUL, 0x41c51b7dUL, 0x58de2a3cUL, 0xf0794f05UL, - 0xe9627e44UL, 0xc24f2d87UL, 0xdb541cc6UL, 0x94158a01UL, 0x8d0ebb40UL, - 0xa623e883UL, 0xbf38d9c2UL, 0x38a0c50dUL, 0x21bbf44cUL, 0x0a96a78fUL, - 0x138d96ceUL, 0x5ccc0009UL, 0x45d73148UL, 0x6efa628bUL, 0x77e153caUL, - 0xbabb5d54UL, 0xa3a06c15UL, 0x888d3fd6UL, 0x91960e97UL, 0xded79850UL, - 0xc7cca911UL, 0xece1fad2UL, 0xf5facb93UL, 0x7262d75cUL, 0x6b79e61dUL, - 0x4054b5deUL, 0x594f849fUL, 0x160e1258UL, 0x0f152319UL, 0x243870daUL, - 0x3d23419bUL, 0x65fd6ba7UL, 0x7ce65ae6UL, 0x57cb0925UL, 0x4ed03864UL, - 0x0191aea3UL, 0x188a9fe2UL, 0x33a7cc21UL, 0x2abcfd60UL, 0xad24e1afUL, - 0xb43fd0eeUL, 0x9f12832dUL, 0x8609b26cUL, 0xc94824abUL, 0xd05315eaUL, - 0xfb7e4629UL, 0xe2657768UL, 0x2f3f79f6UL, 0x362448b7UL, 0x1d091b74UL, - 0x04122a35UL, 0x4b53bcf2UL, 0x52488db3UL, 0x7965de70UL, 0x607eef31UL, - 0xe7e6f3feUL, 0xfefdc2bfUL, 0xd5d0917cUL, 0xcccba03dUL, 0x838a36faUL, - 0x9a9107bbUL, 0xb1bc5478UL, 0xa8a76539UL, 0x3b83984bUL, 0x2298a90aUL, - 0x09b5fac9UL, 0x10aecb88UL, 0x5fef5d4fUL, 0x46f46c0eUL, 0x6dd93fcdUL, - 0x74c20e8cUL, 0xf35a1243UL, 0xea412302UL, 0xc16c70c1UL, 0xd8774180UL, - 0x9736d747UL, 0x8e2de606UL, 0xa500b5c5UL, 0xbc1b8484UL, 0x71418a1aUL, - 0x685abb5bUL, 0x4377e898UL, 0x5a6cd9d9UL, 0x152d4f1eUL, 0x0c367e5fUL, - 0x271b2d9cUL, 0x3e001cddUL, 0xb9980012UL, 0xa0833153UL, 0x8bae6290UL, - 0x92b553d1UL, 0xddf4c516UL, 0xc4eff457UL, 0xefc2a794UL, 0xf6d996d5UL, - 0xae07bce9UL, 0xb71c8da8UL, 0x9c31de6bUL, 0x852aef2aUL, 0xca6b79edUL, - 0xd37048acUL, 0xf85d1b6fUL, 0xe1462a2eUL, 0x66de36e1UL, 0x7fc507a0UL, - 0x54e85463UL, 0x4df36522UL, 0x02b2f3e5UL, 0x1ba9c2a4UL, 0x30849167UL, - 0x299fa026UL, 0xe4c5aeb8UL, 0xfdde9ff9UL, 0xd6f3cc3aUL, 0xcfe8fd7bUL, - 0x80a96bbcUL, 0x99b25afdUL, 0xb29f093eUL, 0xab84387fUL, 0x2c1c24b0UL, - 0x350715f1UL, 0x1e2a4632UL, 0x07317773UL, 0x4870e1b4UL, 0x516bd0f5UL, - 0x7a468336UL, 0x635db277UL, 0xcbfad74eUL, 0xd2e1e60fUL, 0xf9ccb5ccUL, - 0xe0d7848dUL, 0xaf96124aUL, 0xb68d230bUL, 0x9da070c8UL, 0x84bb4189UL, - 0x03235d46UL, 0x1a386c07UL, 0x31153fc4UL, 0x280e0e85UL, 0x674f9842UL, - 0x7e54a903UL, 0x5579fac0UL, 0x4c62cb81UL, 0x8138c51fUL, 0x9823f45eUL, - 0xb30ea79dUL, 0xaa1596dcUL, 0xe554001bUL, 0xfc4f315aUL, 0xd7626299UL, - 0xce7953d8UL, 0x49e14f17UL, 0x50fa7e56UL, 0x7bd72d95UL, 0x62cc1cd4UL, - 0x2d8d8a13UL, 0x3496bb52UL, 0x1fbbe891UL, 0x06a0d9d0UL, 0x5e7ef3ecUL, - 0x4765c2adUL, 0x6c48916eUL, 0x7553a02fUL, 0x3a1236e8UL, 0x230907a9UL, - 0x0824546aUL, 0x113f652bUL, 0x96a779e4UL, 0x8fbc48a5UL, 0xa4911b66UL, - 0xbd8a2a27UL, 0xf2cbbce0UL, 0xebd08da1UL, 0xc0fdde62UL, 0xd9e6ef23UL, - 0x14bce1bdUL, 0x0da7d0fcUL, 0x268a833fUL, 0x3f91b27eUL, 0x70d024b9UL, - 0x69cb15f8UL, 0x42e6463bUL, 0x5bfd777aUL, 0xdc656bb5UL, 0xc57e5af4UL, - 0xee530937UL, 0xf7483876UL, 0xb809aeb1UL, 0xa1129ff0UL, 0x8a3fcc33UL, - 0x9324fd72UL - }, - { - 0x00000000UL, 0x01c26a37UL, 0x0384d46eUL, 0x0246be59UL, 0x0709a8dcUL, - 0x06cbc2ebUL, 0x048d7cb2UL, 0x054f1685UL, 0x0e1351b8UL, 0x0fd13b8fUL, - 0x0d9785d6UL, 0x0c55efe1UL, 0x091af964UL, 0x08d89353UL, 0x0a9e2d0aUL, - 0x0b5c473dUL, 0x1c26a370UL, 0x1de4c947UL, 0x1fa2771eUL, 0x1e601d29UL, - 0x1b2f0bacUL, 0x1aed619bUL, 0x18abdfc2UL, 0x1969b5f5UL, 0x1235f2c8UL, - 0x13f798ffUL, 0x11b126a6UL, 0x10734c91UL, 0x153c5a14UL, 0x14fe3023UL, - 0x16b88e7aUL, 0x177ae44dUL, 0x384d46e0UL, 0x398f2cd7UL, 0x3bc9928eUL, - 0x3a0bf8b9UL, 0x3f44ee3cUL, 0x3e86840bUL, 0x3cc03a52UL, 0x3d025065UL, - 0x365e1758UL, 0x379c7d6fUL, 0x35dac336UL, 0x3418a901UL, 0x3157bf84UL, - 0x3095d5b3UL, 0x32d36beaUL, 0x331101ddUL, 0x246be590UL, 0x25a98fa7UL, - 0x27ef31feUL, 0x262d5bc9UL, 0x23624d4cUL, 0x22a0277bUL, 0x20e69922UL, - 0x2124f315UL, 0x2a78b428UL, 0x2bbade1fUL, 0x29fc6046UL, 0x283e0a71UL, - 0x2d711cf4UL, 0x2cb376c3UL, 0x2ef5c89aUL, 0x2f37a2adUL, 0x709a8dc0UL, - 0x7158e7f7UL, 0x731e59aeUL, 0x72dc3399UL, 0x7793251cUL, 0x76514f2bUL, - 0x7417f172UL, 0x75d59b45UL, 0x7e89dc78UL, 0x7f4bb64fUL, 0x7d0d0816UL, - 0x7ccf6221UL, 0x798074a4UL, 0x78421e93UL, 0x7a04a0caUL, 0x7bc6cafdUL, - 0x6cbc2eb0UL, 0x6d7e4487UL, 0x6f38fadeUL, 0x6efa90e9UL, 0x6bb5866cUL, - 0x6a77ec5bUL, 0x68315202UL, 0x69f33835UL, 0x62af7f08UL, 0x636d153fUL, - 0x612bab66UL, 0x60e9c151UL, 0x65a6d7d4UL, 0x6464bde3UL, 0x662203baUL, - 0x67e0698dUL, 0x48d7cb20UL, 0x4915a117UL, 0x4b531f4eUL, 0x4a917579UL, - 0x4fde63fcUL, 0x4e1c09cbUL, 0x4c5ab792UL, 0x4d98dda5UL, 0x46c49a98UL, - 0x4706f0afUL, 0x45404ef6UL, 0x448224c1UL, 0x41cd3244UL, 0x400f5873UL, - 0x4249e62aUL, 0x438b8c1dUL, 0x54f16850UL, 0x55330267UL, 0x5775bc3eUL, - 0x56b7d609UL, 0x53f8c08cUL, 0x523aaabbUL, 0x507c14e2UL, 0x51be7ed5UL, - 0x5ae239e8UL, 0x5b2053dfUL, 0x5966ed86UL, 0x58a487b1UL, 0x5deb9134UL, - 0x5c29fb03UL, 0x5e6f455aUL, 0x5fad2f6dUL, 0xe1351b80UL, 0xe0f771b7UL, - 0xe2b1cfeeUL, 0xe373a5d9UL, 0xe63cb35cUL, 0xe7fed96bUL, 0xe5b86732UL, - 0xe47a0d05UL, 0xef264a38UL, 0xeee4200fUL, 0xeca29e56UL, 0xed60f461UL, - 0xe82fe2e4UL, 0xe9ed88d3UL, 0xebab368aUL, 0xea695cbdUL, 0xfd13b8f0UL, - 0xfcd1d2c7UL, 0xfe976c9eUL, 0xff5506a9UL, 0xfa1a102cUL, 0xfbd87a1bUL, - 0xf99ec442UL, 0xf85cae75UL, 0xf300e948UL, 0xf2c2837fUL, 0xf0843d26UL, - 0xf1465711UL, 0xf4094194UL, 0xf5cb2ba3UL, 0xf78d95faUL, 0xf64fffcdUL, - 0xd9785d60UL, 0xd8ba3757UL, 0xdafc890eUL, 0xdb3ee339UL, 0xde71f5bcUL, - 0xdfb39f8bUL, 0xddf521d2UL, 0xdc374be5UL, 0xd76b0cd8UL, 0xd6a966efUL, - 0xd4efd8b6UL, 0xd52db281UL, 0xd062a404UL, 0xd1a0ce33UL, 0xd3e6706aUL, - 0xd2241a5dUL, 0xc55efe10UL, 0xc49c9427UL, 0xc6da2a7eUL, 0xc7184049UL, - 0xc25756ccUL, 0xc3953cfbUL, 0xc1d382a2UL, 0xc011e895UL, 0xcb4dafa8UL, - 0xca8fc59fUL, 0xc8c97bc6UL, 0xc90b11f1UL, 0xcc440774UL, 0xcd866d43UL, - 0xcfc0d31aUL, 0xce02b92dUL, 0x91af9640UL, 0x906dfc77UL, 0x922b422eUL, - 0x93e92819UL, 0x96a63e9cUL, 0x976454abUL, 0x9522eaf2UL, 0x94e080c5UL, - 0x9fbcc7f8UL, 0x9e7eadcfUL, 0x9c381396UL, 0x9dfa79a1UL, 0x98b56f24UL, - 0x99770513UL, 0x9b31bb4aUL, 0x9af3d17dUL, 0x8d893530UL, 0x8c4b5f07UL, - 0x8e0de15eUL, 0x8fcf8b69UL, 0x8a809decUL, 0x8b42f7dbUL, 0x89044982UL, - 0x88c623b5UL, 0x839a6488UL, 0x82580ebfUL, 0x801eb0e6UL, 0x81dcdad1UL, - 0x8493cc54UL, 0x8551a663UL, 0x8717183aUL, 0x86d5720dUL, 0xa9e2d0a0UL, - 0xa820ba97UL, 0xaa6604ceUL, 0xaba46ef9UL, 0xaeeb787cUL, 0xaf29124bUL, - 0xad6fac12UL, 0xacadc625UL, 0xa7f18118UL, 0xa633eb2fUL, 0xa4755576UL, - 0xa5b73f41UL, 0xa0f829c4UL, 0xa13a43f3UL, 0xa37cfdaaUL, 0xa2be979dUL, - 0xb5c473d0UL, 0xb40619e7UL, 0xb640a7beUL, 0xb782cd89UL, 0xb2cddb0cUL, - 0xb30fb13bUL, 0xb1490f62UL, 0xb08b6555UL, 0xbbd72268UL, 0xba15485fUL, - 0xb853f606UL, 0xb9919c31UL, 0xbcde8ab4UL, 0xbd1ce083UL, 0xbf5a5edaUL, - 0xbe9834edUL - }, - { - 0x00000000UL, 0xb8bc6765UL, 0xaa09c88bUL, 0x12b5afeeUL, 0x8f629757UL, - 0x37def032UL, 0x256b5fdcUL, 0x9dd738b9UL, 0xc5b428efUL, 0x7d084f8aUL, - 0x6fbde064UL, 0xd7018701UL, 0x4ad6bfb8UL, 0xf26ad8ddUL, 0xe0df7733UL, - 0x58631056UL, 0x5019579fUL, 0xe8a530faUL, 0xfa109f14UL, 0x42acf871UL, - 0xdf7bc0c8UL, 0x67c7a7adUL, 0x75720843UL, 0xcdce6f26UL, 0x95ad7f70UL, - 0x2d111815UL, 0x3fa4b7fbUL, 0x8718d09eUL, 0x1acfe827UL, 0xa2738f42UL, - 0xb0c620acUL, 0x087a47c9UL, 0xa032af3eUL, 0x188ec85bUL, 0x0a3b67b5UL, - 0xb28700d0UL, 0x2f503869UL, 0x97ec5f0cUL, 0x8559f0e2UL, 0x3de59787UL, - 0x658687d1UL, 0xdd3ae0b4UL, 0xcf8f4f5aUL, 0x7733283fUL, 0xeae41086UL, - 0x525877e3UL, 0x40edd80dUL, 0xf851bf68UL, 0xf02bf8a1UL, 0x48979fc4UL, - 0x5a22302aUL, 0xe29e574fUL, 0x7f496ff6UL, 0xc7f50893UL, 0xd540a77dUL, - 0x6dfcc018UL, 0x359fd04eUL, 0x8d23b72bUL, 0x9f9618c5UL, 0x272a7fa0UL, - 0xbafd4719UL, 0x0241207cUL, 0x10f48f92UL, 0xa848e8f7UL, 0x9b14583dUL, - 0x23a83f58UL, 0x311d90b6UL, 0x89a1f7d3UL, 0x1476cf6aUL, 0xaccaa80fUL, - 0xbe7f07e1UL, 0x06c36084UL, 0x5ea070d2UL, 0xe61c17b7UL, 0xf4a9b859UL, - 0x4c15df3cUL, 0xd1c2e785UL, 0x697e80e0UL, 0x7bcb2f0eUL, 0xc377486bUL, - 0xcb0d0fa2UL, 0x73b168c7UL, 0x6104c729UL, 0xd9b8a04cUL, 0x446f98f5UL, - 0xfcd3ff90UL, 0xee66507eUL, 0x56da371bUL, 0x0eb9274dUL, 0xb6054028UL, - 0xa4b0efc6UL, 0x1c0c88a3UL, 0x81dbb01aUL, 0x3967d77fUL, 0x2bd27891UL, - 0x936e1ff4UL, 0x3b26f703UL, 0x839a9066UL, 0x912f3f88UL, 0x299358edUL, - 0xb4446054UL, 0x0cf80731UL, 0x1e4da8dfUL, 0xa6f1cfbaUL, 0xfe92dfecUL, - 0x462eb889UL, 0x549b1767UL, 0xec277002UL, 0x71f048bbUL, 0xc94c2fdeUL, - 0xdbf98030UL, 0x6345e755UL, 0x6b3fa09cUL, 0xd383c7f9UL, 0xc1366817UL, - 0x798a0f72UL, 0xe45d37cbUL, 0x5ce150aeUL, 0x4e54ff40UL, 0xf6e89825UL, - 0xae8b8873UL, 0x1637ef16UL, 0x048240f8UL, 0xbc3e279dUL, 0x21e91f24UL, - 0x99557841UL, 0x8be0d7afUL, 0x335cb0caUL, 0xed59b63bUL, 0x55e5d15eUL, - 0x47507eb0UL, 0xffec19d5UL, 0x623b216cUL, 0xda874609UL, 0xc832e9e7UL, - 0x708e8e82UL, 0x28ed9ed4UL, 0x9051f9b1UL, 0x82e4565fUL, 0x3a58313aUL, - 0xa78f0983UL, 0x1f336ee6UL, 0x0d86c108UL, 0xb53aa66dUL, 0xbd40e1a4UL, - 0x05fc86c1UL, 0x1749292fUL, 0xaff54e4aUL, 0x322276f3UL, 0x8a9e1196UL, - 0x982bbe78UL, 0x2097d91dUL, 0x78f4c94bUL, 0xc048ae2eUL, 0xd2fd01c0UL, - 0x6a4166a5UL, 0xf7965e1cUL, 0x4f2a3979UL, 0x5d9f9697UL, 0xe523f1f2UL, - 0x4d6b1905UL, 0xf5d77e60UL, 0xe762d18eUL, 0x5fdeb6ebUL, 0xc2098e52UL, - 0x7ab5e937UL, 0x680046d9UL, 0xd0bc21bcUL, 0x88df31eaUL, 0x3063568fUL, - 0x22d6f961UL, 0x9a6a9e04UL, 0x07bda6bdUL, 0xbf01c1d8UL, 0xadb46e36UL, - 0x15080953UL, 0x1d724e9aUL, 0xa5ce29ffUL, 0xb77b8611UL, 0x0fc7e174UL, - 0x9210d9cdUL, 0x2aacbea8UL, 0x38191146UL, 0x80a57623UL, 0xd8c66675UL, - 0x607a0110UL, 0x72cfaefeUL, 0xca73c99bUL, 0x57a4f122UL, 0xef189647UL, - 0xfdad39a9UL, 0x45115eccUL, 0x764dee06UL, 0xcef18963UL, 0xdc44268dUL, - 0x64f841e8UL, 0xf92f7951UL, 0x41931e34UL, 0x5326b1daUL, 0xeb9ad6bfUL, - 0xb3f9c6e9UL, 0x0b45a18cUL, 0x19f00e62UL, 0xa14c6907UL, 0x3c9b51beUL, - 0x842736dbUL, 0x96929935UL, 0x2e2efe50UL, 0x2654b999UL, 0x9ee8defcUL, - 0x8c5d7112UL, 0x34e11677UL, 0xa9362eceUL, 0x118a49abUL, 0x033fe645UL, - 0xbb838120UL, 0xe3e09176UL, 0x5b5cf613UL, 0x49e959fdUL, 0xf1553e98UL, - 0x6c820621UL, 0xd43e6144UL, 0xc68bceaaUL, 0x7e37a9cfUL, 0xd67f4138UL, - 0x6ec3265dUL, 0x7c7689b3UL, 0xc4caeed6UL, 0x591dd66fUL, 0xe1a1b10aUL, - 0xf3141ee4UL, 0x4ba87981UL, 0x13cb69d7UL, 0xab770eb2UL, 0xb9c2a15cUL, - 0x017ec639UL, 0x9ca9fe80UL, 0x241599e5UL, 0x36a0360bUL, 0x8e1c516eUL, - 0x866616a7UL, 0x3eda71c2UL, 0x2c6fde2cUL, 0x94d3b949UL, 0x090481f0UL, - 0xb1b8e695UL, 0xa30d497bUL, 0x1bb12e1eUL, 0x43d23e48UL, 0xfb6e592dUL, - 0xe9dbf6c3UL, 0x516791a6UL, 0xccb0a91fUL, 0x740cce7aUL, 0x66b96194UL, - 0xde0506f1UL - }, - { - 0x00000000UL, 0x96300777UL, 0x2c610eeeUL, 0xba510999UL, 0x19c46d07UL, - 0x8ff46a70UL, 0x35a563e9UL, 0xa395649eUL, 0x3288db0eUL, 0xa4b8dc79UL, - 0x1ee9d5e0UL, 0x88d9d297UL, 0x2b4cb609UL, 0xbd7cb17eUL, 0x072db8e7UL, - 0x911dbf90UL, 0x6410b71dUL, 0xf220b06aUL, 0x4871b9f3UL, 0xde41be84UL, - 0x7dd4da1aUL, 0xebe4dd6dUL, 0x51b5d4f4UL, 0xc785d383UL, 0x56986c13UL, - 0xc0a86b64UL, 0x7af962fdUL, 0xecc9658aUL, 0x4f5c0114UL, 0xd96c0663UL, - 0x633d0ffaUL, 0xf50d088dUL, 0xc8206e3bUL, 0x5e10694cUL, 0xe44160d5UL, - 0x727167a2UL, 0xd1e4033cUL, 0x47d4044bUL, 0xfd850dd2UL, 0x6bb50aa5UL, - 0xfaa8b535UL, 0x6c98b242UL, 0xd6c9bbdbUL, 0x40f9bcacUL, 0xe36cd832UL, - 0x755cdf45UL, 0xcf0dd6dcUL, 0x593dd1abUL, 0xac30d926UL, 0x3a00de51UL, - 0x8051d7c8UL, 0x1661d0bfUL, 0xb5f4b421UL, 0x23c4b356UL, 0x9995bacfUL, - 0x0fa5bdb8UL, 0x9eb80228UL, 0x0888055fUL, 0xb2d90cc6UL, 0x24e90bb1UL, - 0x877c6f2fUL, 0x114c6858UL, 0xab1d61c1UL, 0x3d2d66b6UL, 0x9041dc76UL, - 0x0671db01UL, 0xbc20d298UL, 0x2a10d5efUL, 0x8985b171UL, 0x1fb5b606UL, - 0xa5e4bf9fUL, 0x33d4b8e8UL, 0xa2c90778UL, 0x34f9000fUL, 0x8ea80996UL, - 0x18980ee1UL, 0xbb0d6a7fUL, 0x2d3d6d08UL, 0x976c6491UL, 0x015c63e6UL, - 0xf4516b6bUL, 0x62616c1cUL, 0xd8306585UL, 0x4e0062f2UL, 0xed95066cUL, - 0x7ba5011bUL, 0xc1f40882UL, 0x57c40ff5UL, 0xc6d9b065UL, 0x50e9b712UL, - 0xeab8be8bUL, 0x7c88b9fcUL, 0xdf1ddd62UL, 0x492dda15UL, 0xf37cd38cUL, - 0x654cd4fbUL, 0x5861b24dUL, 0xce51b53aUL, 0x7400bca3UL, 0xe230bbd4UL, - 0x41a5df4aUL, 0xd795d83dUL, 0x6dc4d1a4UL, 0xfbf4d6d3UL, 0x6ae96943UL, - 0xfcd96e34UL, 0x468867adUL, 0xd0b860daUL, 0x732d0444UL, 0xe51d0333UL, - 0x5f4c0aaaUL, 0xc97c0dddUL, 0x3c710550UL, 0xaa410227UL, 0x10100bbeUL, - 0x86200cc9UL, 0x25b56857UL, 0xb3856f20UL, 0x09d466b9UL, 0x9fe461ceUL, - 0x0ef9de5eUL, 0x98c9d929UL, 0x2298d0b0UL, 0xb4a8d7c7UL, 0x173db359UL, - 0x810db42eUL, 0x3b5cbdb7UL, 0xad6cbac0UL, 0x2083b8edUL, 0xb6b3bf9aUL, - 0x0ce2b603UL, 0x9ad2b174UL, 0x3947d5eaUL, 0xaf77d29dUL, 0x1526db04UL, - 0x8316dc73UL, 0x120b63e3UL, 0x843b6494UL, 0x3e6a6d0dUL, 0xa85a6a7aUL, - 0x0bcf0ee4UL, 0x9dff0993UL, 0x27ae000aUL, 0xb19e077dUL, 0x44930ff0UL, - 0xd2a30887UL, 0x68f2011eUL, 0xfec20669UL, 0x5d5762f7UL, 0xcb676580UL, - 0x71366c19UL, 0xe7066b6eUL, 0x761bd4feUL, 0xe02bd389UL, 0x5a7ada10UL, - 0xcc4add67UL, 0x6fdfb9f9UL, 0xf9efbe8eUL, 0x43beb717UL, 0xd58eb060UL, - 0xe8a3d6d6UL, 0x7e93d1a1UL, 0xc4c2d838UL, 0x52f2df4fUL, 0xf167bbd1UL, - 0x6757bca6UL, 0xdd06b53fUL, 0x4b36b248UL, 0xda2b0dd8UL, 0x4c1b0aafUL, - 0xf64a0336UL, 0x607a0441UL, 0xc3ef60dfUL, 0x55df67a8UL, 0xef8e6e31UL, - 0x79be6946UL, 0x8cb361cbUL, 0x1a8366bcUL, 0xa0d26f25UL, 0x36e26852UL, - 0x95770cccUL, 0x03470bbbUL, 0xb9160222UL, 0x2f260555UL, 0xbe3bbac5UL, - 0x280bbdb2UL, 0x925ab42bUL, 0x046ab35cUL, 0xa7ffd7c2UL, 0x31cfd0b5UL, - 0x8b9ed92cUL, 0x1daede5bUL, 0xb0c2649bUL, 0x26f263ecUL, 0x9ca36a75UL, - 0x0a936d02UL, 0xa906099cUL, 0x3f360eebUL, 0x85670772UL, 0x13570005UL, - 0x824abf95UL, 0x147ab8e2UL, 0xae2bb17bUL, 0x381bb60cUL, 0x9b8ed292UL, - 0x0dbed5e5UL, 0xb7efdc7cUL, 0x21dfdb0bUL, 0xd4d2d386UL, 0x42e2d4f1UL, - 0xf8b3dd68UL, 0x6e83da1fUL, 0xcd16be81UL, 0x5b26b9f6UL, 0xe177b06fUL, - 0x7747b718UL, 0xe65a0888UL, 0x706a0fffUL, 0xca3b0666UL, 0x5c0b0111UL, - 0xff9e658fUL, 0x69ae62f8UL, 0xd3ff6b61UL, 0x45cf6c16UL, 0x78e20aa0UL, - 0xeed20dd7UL, 0x5483044eUL, 0xc2b30339UL, 0x612667a7UL, 0xf71660d0UL, - 0x4d476949UL, 0xdb776e3eUL, 0x4a6ad1aeUL, 0xdc5ad6d9UL, 0x660bdf40UL, - 0xf03bd837UL, 0x53aebca9UL, 0xc59ebbdeUL, 0x7fcfb247UL, 0xe9ffb530UL, - 0x1cf2bdbdUL, 0x8ac2bacaUL, 0x3093b353UL, 0xa6a3b424UL, 0x0536d0baUL, - 0x9306d7cdUL, 0x2957de54UL, 0xbf67d923UL, 0x2e7a66b3UL, 0xb84a61c4UL, - 0x021b685dUL, 0x942b6f2aUL, 0x37be0bb4UL, 0xa18e0cc3UL, 0x1bdf055aUL, - 0x8def022dUL - }, - { - 0x00000000UL, 0x41311b19UL, 0x82623632UL, 0xc3532d2bUL, 0x04c56c64UL, - 0x45f4777dUL, 0x86a75a56UL, 0xc796414fUL, 0x088ad9c8UL, 0x49bbc2d1UL, - 0x8ae8effaUL, 0xcbd9f4e3UL, 0x0c4fb5acUL, 0x4d7eaeb5UL, 0x8e2d839eUL, - 0xcf1c9887UL, 0x5112c24aUL, 0x1023d953UL, 0xd370f478UL, 0x9241ef61UL, - 0x55d7ae2eUL, 0x14e6b537UL, 0xd7b5981cUL, 0x96848305UL, 0x59981b82UL, - 0x18a9009bUL, 0xdbfa2db0UL, 0x9acb36a9UL, 0x5d5d77e6UL, 0x1c6c6cffUL, - 0xdf3f41d4UL, 0x9e0e5acdUL, 0xa2248495UL, 0xe3159f8cUL, 0x2046b2a7UL, - 0x6177a9beUL, 0xa6e1e8f1UL, 0xe7d0f3e8UL, 0x2483dec3UL, 0x65b2c5daUL, - 0xaaae5d5dUL, 0xeb9f4644UL, 0x28cc6b6fUL, 0x69fd7076UL, 0xae6b3139UL, - 0xef5a2a20UL, 0x2c09070bUL, 0x6d381c12UL, 0xf33646dfUL, 0xb2075dc6UL, - 0x715470edUL, 0x30656bf4UL, 0xf7f32abbUL, 0xb6c231a2UL, 0x75911c89UL, - 0x34a00790UL, 0xfbbc9f17UL, 0xba8d840eUL, 0x79dea925UL, 0x38efb23cUL, - 0xff79f373UL, 0xbe48e86aUL, 0x7d1bc541UL, 0x3c2ade58UL, 0x054f79f0UL, - 0x447e62e9UL, 0x872d4fc2UL, 0xc61c54dbUL, 0x018a1594UL, 0x40bb0e8dUL, - 0x83e823a6UL, 0xc2d938bfUL, 0x0dc5a038UL, 0x4cf4bb21UL, 0x8fa7960aUL, - 0xce968d13UL, 0x0900cc5cUL, 0x4831d745UL, 0x8b62fa6eUL, 0xca53e177UL, - 0x545dbbbaUL, 0x156ca0a3UL, 0xd63f8d88UL, 0x970e9691UL, 0x5098d7deUL, - 0x11a9ccc7UL, 0xd2fae1ecUL, 0x93cbfaf5UL, 0x5cd76272UL, 0x1de6796bUL, - 0xdeb55440UL, 0x9f844f59UL, 0x58120e16UL, 0x1923150fUL, 0xda703824UL, - 0x9b41233dUL, 0xa76bfd65UL, 0xe65ae67cUL, 0x2509cb57UL, 0x6438d04eUL, - 0xa3ae9101UL, 0xe29f8a18UL, 0x21cca733UL, 0x60fdbc2aUL, 0xafe124adUL, - 0xeed03fb4UL, 0x2d83129fUL, 0x6cb20986UL, 0xab2448c9UL, 0xea1553d0UL, - 0x29467efbUL, 0x687765e2UL, 0xf6793f2fUL, 0xb7482436UL, 0x741b091dUL, - 0x352a1204UL, 0xf2bc534bUL, 0xb38d4852UL, 0x70de6579UL, 0x31ef7e60UL, - 0xfef3e6e7UL, 0xbfc2fdfeUL, 0x7c91d0d5UL, 0x3da0cbccUL, 0xfa368a83UL, - 0xbb07919aUL, 0x7854bcb1UL, 0x3965a7a8UL, 0x4b98833bUL, 0x0aa99822UL, - 0xc9fab509UL, 0x88cbae10UL, 0x4f5def5fUL, 0x0e6cf446UL, 0xcd3fd96dUL, - 0x8c0ec274UL, 0x43125af3UL, 0x022341eaUL, 0xc1706cc1UL, 0x804177d8UL, - 0x47d73697UL, 0x06e62d8eUL, 0xc5b500a5UL, 0x84841bbcUL, 0x1a8a4171UL, - 0x5bbb5a68UL, 0x98e87743UL, 0xd9d96c5aUL, 0x1e4f2d15UL, 0x5f7e360cUL, - 0x9c2d1b27UL, 0xdd1c003eUL, 0x120098b9UL, 0x533183a0UL, 0x9062ae8bUL, - 0xd153b592UL, 0x16c5f4ddUL, 0x57f4efc4UL, 0x94a7c2efUL, 0xd596d9f6UL, - 0xe9bc07aeUL, 0xa88d1cb7UL, 0x6bde319cUL, 0x2aef2a85UL, 0xed796bcaUL, - 0xac4870d3UL, 0x6f1b5df8UL, 0x2e2a46e1UL, 0xe136de66UL, 0xa007c57fUL, - 0x6354e854UL, 0x2265f34dUL, 0xe5f3b202UL, 0xa4c2a91bUL, 0x67918430UL, - 0x26a09f29UL, 0xb8aec5e4UL, 0xf99fdefdUL, 0x3accf3d6UL, 0x7bfde8cfUL, - 0xbc6ba980UL, 0xfd5ab299UL, 0x3e099fb2UL, 0x7f3884abUL, 0xb0241c2cUL, - 0xf1150735UL, 0x32462a1eUL, 0x73773107UL, 0xb4e17048UL, 0xf5d06b51UL, - 0x3683467aUL, 0x77b25d63UL, 0x4ed7facbUL, 0x0fe6e1d2UL, 0xccb5ccf9UL, - 0x8d84d7e0UL, 0x4a1296afUL, 0x0b238db6UL, 0xc870a09dUL, 0x8941bb84UL, - 0x465d2303UL, 0x076c381aUL, 0xc43f1531UL, 0x850e0e28UL, 0x42984f67UL, - 0x03a9547eUL, 0xc0fa7955UL, 0x81cb624cUL, 0x1fc53881UL, 0x5ef42398UL, - 0x9da70eb3UL, 0xdc9615aaUL, 0x1b0054e5UL, 0x5a314ffcUL, 0x996262d7UL, - 0xd85379ceUL, 0x174fe149UL, 0x567efa50UL, 0x952dd77bUL, 0xd41ccc62UL, - 0x138a8d2dUL, 0x52bb9634UL, 0x91e8bb1fUL, 0xd0d9a006UL, 0xecf37e5eUL, - 0xadc26547UL, 0x6e91486cUL, 0x2fa05375UL, 0xe836123aUL, 0xa9070923UL, - 0x6a542408UL, 0x2b653f11UL, 0xe479a796UL, 0xa548bc8fUL, 0x661b91a4UL, - 0x272a8abdUL, 0xe0bccbf2UL, 0xa18dd0ebUL, 0x62defdc0UL, 0x23efe6d9UL, - 0xbde1bc14UL, 0xfcd0a70dUL, 0x3f838a26UL, 0x7eb2913fUL, 0xb924d070UL, - 0xf815cb69UL, 0x3b46e642UL, 0x7a77fd5bUL, 0xb56b65dcUL, 0xf45a7ec5UL, - 0x370953eeUL, 0x763848f7UL, 0xb1ae09b8UL, 0xf09f12a1UL, 0x33cc3f8aUL, - 0x72fd2493UL - }, - { - 0x00000000UL, 0x376ac201UL, 0x6ed48403UL, 0x59be4602UL, 0xdca80907UL, - 0xebc2cb06UL, 0xb27c8d04UL, 0x85164f05UL, 0xb851130eUL, 0x8f3bd10fUL, - 0xd685970dUL, 0xe1ef550cUL, 0x64f91a09UL, 0x5393d808UL, 0x0a2d9e0aUL, - 0x3d475c0bUL, 0x70a3261cUL, 0x47c9e41dUL, 0x1e77a21fUL, 0x291d601eUL, - 0xac0b2f1bUL, 0x9b61ed1aUL, 0xc2dfab18UL, 0xf5b56919UL, 0xc8f23512UL, - 0xff98f713UL, 0xa626b111UL, 0x914c7310UL, 0x145a3c15UL, 0x2330fe14UL, - 0x7a8eb816UL, 0x4de47a17UL, 0xe0464d38UL, 0xd72c8f39UL, 0x8e92c93bUL, - 0xb9f80b3aUL, 0x3cee443fUL, 0x0b84863eUL, 0x523ac03cUL, 0x6550023dUL, - 0x58175e36UL, 0x6f7d9c37UL, 0x36c3da35UL, 0x01a91834UL, 0x84bf5731UL, - 0xb3d59530UL, 0xea6bd332UL, 0xdd011133UL, 0x90e56b24UL, 0xa78fa925UL, - 0xfe31ef27UL, 0xc95b2d26UL, 0x4c4d6223UL, 0x7b27a022UL, 0x2299e620UL, - 0x15f32421UL, 0x28b4782aUL, 0x1fdeba2bUL, 0x4660fc29UL, 0x710a3e28UL, - 0xf41c712dUL, 0xc376b32cUL, 0x9ac8f52eUL, 0xada2372fUL, 0xc08d9a70UL, - 0xf7e75871UL, 0xae591e73UL, 0x9933dc72UL, 0x1c259377UL, 0x2b4f5176UL, - 0x72f11774UL, 0x459bd575UL, 0x78dc897eUL, 0x4fb64b7fUL, 0x16080d7dUL, - 0x2162cf7cUL, 0xa4748079UL, 0x931e4278UL, 0xcaa0047aUL, 0xfdcac67bUL, - 0xb02ebc6cUL, 0x87447e6dUL, 0xdefa386fUL, 0xe990fa6eUL, 0x6c86b56bUL, - 0x5bec776aUL, 0x02523168UL, 0x3538f369UL, 0x087faf62UL, 0x3f156d63UL, - 0x66ab2b61UL, 0x51c1e960UL, 0xd4d7a665UL, 0xe3bd6464UL, 0xba032266UL, - 0x8d69e067UL, 0x20cbd748UL, 0x17a11549UL, 0x4e1f534bUL, 0x7975914aUL, - 0xfc63de4fUL, 0xcb091c4eUL, 0x92b75a4cUL, 0xa5dd984dUL, 0x989ac446UL, - 0xaff00647UL, 0xf64e4045UL, 0xc1248244UL, 0x4432cd41UL, 0x73580f40UL, - 0x2ae64942UL, 0x1d8c8b43UL, 0x5068f154UL, 0x67023355UL, 0x3ebc7557UL, - 0x09d6b756UL, 0x8cc0f853UL, 0xbbaa3a52UL, 0xe2147c50UL, 0xd57ebe51UL, - 0xe839e25aUL, 0xdf53205bUL, 0x86ed6659UL, 0xb187a458UL, 0x3491eb5dUL, - 0x03fb295cUL, 0x5a456f5eUL, 0x6d2fad5fUL, 0x801b35e1UL, 0xb771f7e0UL, - 0xeecfb1e2UL, 0xd9a573e3UL, 0x5cb33ce6UL, 0x6bd9fee7UL, 0x3267b8e5UL, - 0x050d7ae4UL, 0x384a26efUL, 0x0f20e4eeUL, 0x569ea2ecUL, 0x61f460edUL, - 0xe4e22fe8UL, 0xd388ede9UL, 0x8a36abebUL, 0xbd5c69eaUL, 0xf0b813fdUL, - 0xc7d2d1fcUL, 0x9e6c97feUL, 0xa90655ffUL, 0x2c101afaUL, 0x1b7ad8fbUL, - 0x42c49ef9UL, 0x75ae5cf8UL, 0x48e900f3UL, 0x7f83c2f2UL, 0x263d84f0UL, - 0x115746f1UL, 0x944109f4UL, 0xa32bcbf5UL, 0xfa958df7UL, 0xcdff4ff6UL, - 0x605d78d9UL, 0x5737bad8UL, 0x0e89fcdaUL, 0x39e33edbUL, 0xbcf571deUL, - 0x8b9fb3dfUL, 0xd221f5ddUL, 0xe54b37dcUL, 0xd80c6bd7UL, 0xef66a9d6UL, - 0xb6d8efd4UL, 0x81b22dd5UL, 0x04a462d0UL, 0x33cea0d1UL, 0x6a70e6d3UL, - 0x5d1a24d2UL, 0x10fe5ec5UL, 0x27949cc4UL, 0x7e2adac6UL, 0x494018c7UL, - 0xcc5657c2UL, 0xfb3c95c3UL, 0xa282d3c1UL, 0x95e811c0UL, 0xa8af4dcbUL, - 0x9fc58fcaUL, 0xc67bc9c8UL, 0xf1110bc9UL, 0x740744ccUL, 0x436d86cdUL, - 0x1ad3c0cfUL, 0x2db902ceUL, 0x4096af91UL, 0x77fc6d90UL, 0x2e422b92UL, - 0x1928e993UL, 0x9c3ea696UL, 0xab546497UL, 0xf2ea2295UL, 0xc580e094UL, - 0xf8c7bc9fUL, 0xcfad7e9eUL, 0x9613389cUL, 0xa179fa9dUL, 0x246fb598UL, - 0x13057799UL, 0x4abb319bUL, 0x7dd1f39aUL, 0x3035898dUL, 0x075f4b8cUL, - 0x5ee10d8eUL, 0x698bcf8fUL, 0xec9d808aUL, 0xdbf7428bUL, 0x82490489UL, - 0xb523c688UL, 0x88649a83UL, 0xbf0e5882UL, 0xe6b01e80UL, 0xd1dadc81UL, - 0x54cc9384UL, 0x63a65185UL, 0x3a181787UL, 0x0d72d586UL, 0xa0d0e2a9UL, - 0x97ba20a8UL, 0xce0466aaUL, 0xf96ea4abUL, 0x7c78ebaeUL, 0x4b1229afUL, - 0x12ac6fadUL, 0x25c6adacUL, 0x1881f1a7UL, 0x2feb33a6UL, 0x765575a4UL, - 0x413fb7a5UL, 0xc429f8a0UL, 0xf3433aa1UL, 0xaafd7ca3UL, 0x9d97bea2UL, - 0xd073c4b5UL, 0xe71906b4UL, 0xbea740b6UL, 0x89cd82b7UL, 0x0cdbcdb2UL, - 0x3bb10fb3UL, 0x620f49b1UL, 0x55658bb0UL, 0x6822d7bbUL, 0x5f4815baUL, - 0x06f653b8UL, 0x319c91b9UL, 0xb48adebcUL, 0x83e01cbdUL, 0xda5e5abfUL, - 0xed3498beUL - }, - { - 0x00000000UL, 0x6567bcb8UL, 0x8bc809aaUL, 0xeeafb512UL, 0x5797628fUL, - 0x32f0de37UL, 0xdc5f6b25UL, 0xb938d79dUL, 0xef28b4c5UL, 0x8a4f087dUL, - 0x64e0bd6fUL, 0x018701d7UL, 0xb8bfd64aUL, 0xddd86af2UL, 0x3377dfe0UL, - 0x56106358UL, 0x9f571950UL, 0xfa30a5e8UL, 0x149f10faUL, 0x71f8ac42UL, - 0xc8c07bdfUL, 0xada7c767UL, 0x43087275UL, 0x266fcecdUL, 0x707fad95UL, - 0x1518112dUL, 0xfbb7a43fUL, 0x9ed01887UL, 0x27e8cf1aUL, 0x428f73a2UL, - 0xac20c6b0UL, 0xc9477a08UL, 0x3eaf32a0UL, 0x5bc88e18UL, 0xb5673b0aUL, - 0xd00087b2UL, 0x6938502fUL, 0x0c5fec97UL, 0xe2f05985UL, 0x8797e53dUL, - 0xd1878665UL, 0xb4e03addUL, 0x5a4f8fcfUL, 0x3f283377UL, 0x8610e4eaUL, - 0xe3775852UL, 0x0dd8ed40UL, 0x68bf51f8UL, 0xa1f82bf0UL, 0xc49f9748UL, - 0x2a30225aUL, 0x4f579ee2UL, 0xf66f497fUL, 0x9308f5c7UL, 0x7da740d5UL, - 0x18c0fc6dUL, 0x4ed09f35UL, 0x2bb7238dUL, 0xc518969fUL, 0xa07f2a27UL, - 0x1947fdbaUL, 0x7c204102UL, 0x928ff410UL, 0xf7e848a8UL, 0x3d58149bUL, - 0x583fa823UL, 0xb6901d31UL, 0xd3f7a189UL, 0x6acf7614UL, 0x0fa8caacUL, - 0xe1077fbeUL, 0x8460c306UL, 0xd270a05eUL, 0xb7171ce6UL, 0x59b8a9f4UL, - 0x3cdf154cUL, 0x85e7c2d1UL, 0xe0807e69UL, 0x0e2fcb7bUL, 0x6b4877c3UL, - 0xa20f0dcbUL, 0xc768b173UL, 0x29c70461UL, 0x4ca0b8d9UL, 0xf5986f44UL, - 0x90ffd3fcUL, 0x7e5066eeUL, 0x1b37da56UL, 0x4d27b90eUL, 0x284005b6UL, - 0xc6efb0a4UL, 0xa3880c1cUL, 0x1ab0db81UL, 0x7fd76739UL, 0x9178d22bUL, - 0xf41f6e93UL, 0x03f7263bUL, 0x66909a83UL, 0x883f2f91UL, 0xed589329UL, - 0x546044b4UL, 0x3107f80cUL, 0xdfa84d1eUL, 0xbacff1a6UL, 0xecdf92feUL, - 0x89b82e46UL, 0x67179b54UL, 0x027027ecUL, 0xbb48f071UL, 0xde2f4cc9UL, - 0x3080f9dbUL, 0x55e74563UL, 0x9ca03f6bUL, 0xf9c783d3UL, 0x176836c1UL, - 0x720f8a79UL, 0xcb375de4UL, 0xae50e15cUL, 0x40ff544eUL, 0x2598e8f6UL, - 0x73888baeUL, 0x16ef3716UL, 0xf8408204UL, 0x9d273ebcUL, 0x241fe921UL, - 0x41785599UL, 0xafd7e08bUL, 0xcab05c33UL, 0x3bb659edUL, 0x5ed1e555UL, - 0xb07e5047UL, 0xd519ecffUL, 0x6c213b62UL, 0x094687daUL, 0xe7e932c8UL, - 0x828e8e70UL, 0xd49eed28UL, 0xb1f95190UL, 0x5f56e482UL, 0x3a31583aUL, - 0x83098fa7UL, 0xe66e331fUL, 0x08c1860dUL, 0x6da63ab5UL, 0xa4e140bdUL, - 0xc186fc05UL, 0x2f294917UL, 0x4a4ef5afUL, 0xf3762232UL, 0x96119e8aUL, - 0x78be2b98UL, 0x1dd99720UL, 0x4bc9f478UL, 0x2eae48c0UL, 0xc001fdd2UL, - 0xa566416aUL, 0x1c5e96f7UL, 0x79392a4fUL, 0x97969f5dUL, 0xf2f123e5UL, - 0x05196b4dUL, 0x607ed7f5UL, 0x8ed162e7UL, 0xebb6de5fUL, 0x528e09c2UL, - 0x37e9b57aUL, 0xd9460068UL, 0xbc21bcd0UL, 0xea31df88UL, 0x8f566330UL, - 0x61f9d622UL, 0x049e6a9aUL, 0xbda6bd07UL, 0xd8c101bfUL, 0x366eb4adUL, - 0x53090815UL, 0x9a4e721dUL, 0xff29cea5UL, 0x11867bb7UL, 0x74e1c70fUL, - 0xcdd91092UL, 0xa8beac2aUL, 0x46111938UL, 0x2376a580UL, 0x7566c6d8UL, - 0x10017a60UL, 0xfeaecf72UL, 0x9bc973caUL, 0x22f1a457UL, 0x479618efUL, - 0xa939adfdUL, 0xcc5e1145UL, 0x06ee4d76UL, 0x6389f1ceUL, 0x8d2644dcUL, - 0xe841f864UL, 0x51792ff9UL, 0x341e9341UL, 0xdab12653UL, 0xbfd69aebUL, - 0xe9c6f9b3UL, 0x8ca1450bUL, 0x620ef019UL, 0x07694ca1UL, 0xbe519b3cUL, - 0xdb362784UL, 0x35999296UL, 0x50fe2e2eUL, 0x99b95426UL, 0xfcdee89eUL, - 0x12715d8cUL, 0x7716e134UL, 0xce2e36a9UL, 0xab498a11UL, 0x45e63f03UL, - 0x208183bbUL, 0x7691e0e3UL, 0x13f65c5bUL, 0xfd59e949UL, 0x983e55f1UL, - 0x2106826cUL, 0x44613ed4UL, 0xaace8bc6UL, 0xcfa9377eUL, 0x38417fd6UL, - 0x5d26c36eUL, 0xb389767cUL, 0xd6eecac4UL, 0x6fd61d59UL, 0x0ab1a1e1UL, - 0xe41e14f3UL, 0x8179a84bUL, 0xd769cb13UL, 0xb20e77abUL, 0x5ca1c2b9UL, - 0x39c67e01UL, 0x80fea99cUL, 0xe5991524UL, 0x0b36a036UL, 0x6e511c8eUL, - 0xa7166686UL, 0xc271da3eUL, 0x2cde6f2cUL, 0x49b9d394UL, 0xf0810409UL, - 0x95e6b8b1UL, 0x7b490da3UL, 0x1e2eb11bUL, 0x483ed243UL, 0x2d596efbUL, - 0xc3f6dbe9UL, 0xa6916751UL, 0x1fa9b0ccUL, 0x7ace0c74UL, 0x9461b966UL, - 0xf10605deUL -#endif - } -}; diff --git a/libs/libwebsockets/win32port/zlib/deflate.c b/libs/libwebsockets/win32port/zlib/deflate.c deleted file mode 100644 index fa00181166..0000000000 --- a/libs/libwebsockets/win32port/zlib/deflate.c +++ /dev/null @@ -1,1834 +0,0 @@ -/* deflate.c -- compress data using the deflation algorithm - * Copyright (C) 1995-2010 Jean-loup Gailly and Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -/* - * ALGORITHM - * - * The "deflation" process depends on being able to identify portions - * of the input text which are identical to earlier input (within a - * sliding window trailing behind the input currently being processed). - * - * The most straightforward technique turns out to be the fastest for - * most input files: try all possible matches and select the longest. - * The key feature of this algorithm is that insertions into the string - * dictionary are very simple and thus fast, and deletions are avoided - * completely. Insertions are performed at each input character, whereas - * string matches are performed only when the previous match ends. So it - * is preferable to spend more time in matches to allow very fast string - * insertions and avoid deletions. The matching algorithm for small - * strings is inspired from that of Rabin & Karp. A brute force approach - * is used to find longer strings when a small match has been found. - * A similar algorithm is used in comic (by Jan-Mark Wams) and freeze - * (by Leonid Broukhis). - * A previous version of this file used a more sophisticated algorithm - * (by Fiala and Greene) which is guaranteed to run in linear amortized - * time, but has a larger average cost, uses more memory and is patented. - * However the F&G algorithm may be faster for some highly redundant - * files if the parameter max_chain_length (described below) is too large. - * - * ACKNOWLEDGEMENTS - * - * The idea of lazy evaluation of matches is due to Jan-Mark Wams, and - * I found it in 'freeze' written by Leonid Broukhis. - * Thanks to many people for bug reports and testing. - * - * REFERENCES - * - * Deutsch, L.P.,"DEFLATE Compressed Data Format Specification". - * Available in http://www.ietf.org/rfc/rfc1951.txt - * - * A description of the Rabin and Karp algorithm is given in the book - * "Algorithms" by R. Sedgewick, Addison-Wesley, p252. - * - * Fiala,E.R., and Greene,D.H. - * Data Compression with Finite Windows, Comm.ACM, 32,4 (1989) 490-595 - * - */ - -/* @(#) $Id$ */ - -#include "deflate.h" - -const char deflate_copyright[] = - " deflate 1.2.5 Copyright 1995-2010 Jean-loup Gailly and Mark Adler "; -/* - If you use the zlib library in a product, an acknowledgment is welcome - in the documentation of your product. If for some reason you cannot - include such an acknowledgment, I would appreciate that you keep this - copyright string in the executable of your product. - */ - -/* =========================================================================== - * Function prototypes. - */ -typedef enum { - need_more, /* block not completed, need more input or more output */ - block_done, /* block flush performed */ - finish_started, /* finish started, need only more output at next deflate */ - finish_done /* finish done, accept no more input or output */ -} block_state; - -typedef block_state (*compress_func) OF((deflate_state *s, int flush)); -/* Compression function. Returns the block state after the call. */ - -local void fill_window OF((deflate_state *s)); -local block_state deflate_stored OF((deflate_state *s, int flush)); -local block_state deflate_fast OF((deflate_state *s, int flush)); -#ifndef FASTEST -local block_state deflate_slow OF((deflate_state *s, int flush)); -#endif -local block_state deflate_rle OF((deflate_state *s, int flush)); -local block_state deflate_huff OF((deflate_state *s, int flush)); -local void lm_init OF((deflate_state *s)); -local void putShortMSB OF((deflate_state *s, uInt b)); -local void flush_pending OF((z_streamp strm)); -local int read_buf OF((z_streamp strm, Bytef *buf, unsigned size)); -#ifdef ASMV - void match_init OF((void)); /* asm code initialization */ - uInt longest_match OF((deflate_state *s, IPos cur_match)); -#else -local uInt longest_match OF((deflate_state *s, IPos cur_match)); -#endif - -#ifdef DEBUG -local void check_match OF((deflate_state *s, IPos start, IPos match, - int length)); -#endif - -/* =========================================================================== - * Local data - */ - -#define NIL 0 -/* Tail of hash chains */ - -#ifndef TOO_FAR -# define TOO_FAR 4096 -#endif -/* Matches of length 3 are discarded if their distance exceeds TOO_FAR */ - -/* Values for max_lazy_match, good_match and max_chain_length, depending on - * the desired pack level (0..9). The values given below have been tuned to - * exclude worst case performance for pathological files. Better values may be - * found for specific files. - */ -typedef struct config_s { - ush good_length; /* reduce lazy search above this match length */ - ush max_lazy; /* do not perform lazy search above this match length */ - ush nice_length; /* quit search above this match length */ - ush max_chain; - compress_func func; -} config; - -#ifdef FASTEST -local const config configuration_table[2] = { -/* good lazy nice chain */ -/* 0 */ {0, 0, 0, 0, deflate_stored}, /* store only */ -/* 1 */ {4, 4, 8, 4, deflate_fast}}; /* max speed, no lazy matches */ -#else -local const config configuration_table[10] = { -/* good lazy nice chain */ -/* 0 */ {0, 0, 0, 0, deflate_stored}, /* store only */ -/* 1 */ {4, 4, 8, 4, deflate_fast}, /* max speed, no lazy matches */ -/* 2 */ {4, 5, 16, 8, deflate_fast}, -/* 3 */ {4, 6, 32, 32, deflate_fast}, - -/* 4 */ {4, 4, 16, 16, deflate_slow}, /* lazy matches */ -/* 5 */ {8, 16, 32, 32, deflate_slow}, -/* 6 */ {8, 16, 128, 128, deflate_slow}, -/* 7 */ {8, 32, 128, 256, deflate_slow}, -/* 8 */ {32, 128, 258, 1024, deflate_slow}, -/* 9 */ {32, 258, 258, 4096, deflate_slow}}; /* max compression */ -#endif - -/* Note: the deflate() code requires max_lazy >= MIN_MATCH and max_chain >= 4 - * For deflate_fast() (levels <= 3) good is ignored and lazy has a different - * meaning. - */ - -#define EQUAL 0 -/* result of memcmp for equal strings */ - -#ifndef NO_DUMMY_DECL -struct static_tree_desc_s {int dummy;}; /* for buggy compilers */ -#endif - -/* =========================================================================== - * Update a hash value with the given input byte - * IN assertion: all calls to to UPDATE_HASH are made with consecutive - * input characters, so that a running hash key can be computed from the - * previous key instead of complete recalculation each time. - */ -#define UPDATE_HASH(s,h,c) (h = (((h)<hash_shift) ^ (c)) & s->hash_mask) - - -/* =========================================================================== - * Insert string str in the dictionary and set match_head to the previous head - * of the hash chain (the most recent string with same hash key). Return - * the previous length of the hash chain. - * If this file is compiled with -DFASTEST, the compression level is forced - * to 1, and no hash chains are maintained. - * IN assertion: all calls to to INSERT_STRING are made with consecutive - * input characters and the first MIN_MATCH bytes of str are valid - * (except for the last MIN_MATCH-1 bytes of the input file). - */ -#ifdef FASTEST -#define INSERT_STRING(s, str, match_head) \ - (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \ - match_head = s->head[s->ins_h], \ - s->head[s->ins_h] = (Pos)(str)) -#else -#define INSERT_STRING(s, str, match_head) \ - (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \ - match_head = s->prev[(str) & s->w_mask] = s->head[s->ins_h], \ - s->head[s->ins_h] = (Pos)(str)) -#endif - -/* =========================================================================== - * Initialize the hash table (avoiding 64K overflow for 16 bit systems). - * prev[] will be initialized on the fly. - */ -#define CLEAR_HASH(s) \ - s->head[s->hash_size-1] = NIL; \ - zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head)); - -/* ========================================================================= */ -int ZEXPORT deflateInit_(strm, level, version, stream_size) - z_streamp strm; - int level; - const char *version; - int stream_size; -{ - return deflateInit2_(strm, level, Z_DEFLATED, MAX_WBITS, DEF_MEM_LEVEL, - Z_DEFAULT_STRATEGY, version, stream_size); - /* To do: ignore strm->next_in if we use it as window */ -} - -/* ========================================================================= */ -int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, - version, stream_size) - z_streamp strm; - int level; - int method; - int windowBits; - int memLevel; - int strategy; - const char *version; - int stream_size; -{ - deflate_state *s; - int wrap = 1; - static const char my_version[] = ZLIB_VERSION; - - ushf *overlay; - /* We overlay pending_buf and d_buf+l_buf. This works since the average - * output size for (length,distance) codes is <= 24 bits. - */ - - if (version == Z_NULL || version[0] != my_version[0] || - stream_size != sizeof(z_stream)) { - return Z_VERSION_ERROR; - } - if (strm == Z_NULL) return Z_STREAM_ERROR; - - strm->msg = Z_NULL; - if (strm->zalloc == (alloc_func)0) { - strm->zalloc = zcalloc; - strm->opaque = (voidpf)0; - } - if (strm->zfree == (free_func)0) strm->zfree = zcfree; - -#ifdef FASTEST - if (level != 0) level = 1; -#else - if (level == Z_DEFAULT_COMPRESSION) level = 6; -#endif - - if (windowBits < 0) { /* suppress zlib wrapper */ - wrap = 0; - windowBits = -windowBits; - } -#ifdef GZIP - else if (windowBits > 15) { - wrap = 2; /* write gzip wrapper instead */ - windowBits -= 16; - } -#endif - if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED || - windowBits < 8 || windowBits > 15 || level < 0 || level > 9 || - strategy < 0 || strategy > Z_FIXED) { - return Z_STREAM_ERROR; - } - if (windowBits == 8) windowBits = 9; /* until 256-byte window bug fixed */ - s = (deflate_state *) ZALLOC(strm, 1, sizeof(deflate_state)); - if (s == Z_NULL) return Z_MEM_ERROR; - strm->state = (struct internal_state FAR *)s; - s->strm = strm; - - s->wrap = wrap; - s->gzhead = Z_NULL; - s->w_bits = windowBits; - s->w_size = 1 << s->w_bits; - s->w_mask = s->w_size - 1; - - s->hash_bits = memLevel + 7; - s->hash_size = 1 << s->hash_bits; - s->hash_mask = s->hash_size - 1; - s->hash_shift = ((s->hash_bits+MIN_MATCH-1)/MIN_MATCH); - - s->window = (Bytef *) ZALLOC(strm, s->w_size, 2*sizeof(Byte)); - s->prev = (Posf *) ZALLOC(strm, s->w_size, sizeof(Pos)); - s->head = (Posf *) ZALLOC(strm, s->hash_size, sizeof(Pos)); - - s->high_water = 0; /* nothing written to s->window yet */ - - s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */ - - overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2); - s->pending_buf = (uchf *) overlay; - s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L); - - if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL || - s->pending_buf == Z_NULL) { - s->status = FINISH_STATE; - strm->msg = (char*)ERR_MSG(Z_MEM_ERROR); - deflateEnd (strm); - return Z_MEM_ERROR; - } - s->d_buf = overlay + s->lit_bufsize/sizeof(ush); - s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize; - - s->level = level; - s->strategy = strategy; - s->method = (Byte)method; - - return deflateReset(strm); -} - -/* ========================================================================= */ -int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength) - z_streamp strm; - const Bytef *dictionary; - uInt dictLength; -{ - deflate_state *s; - uInt length = dictLength; - uInt n; - IPos hash_head = 0; - - if (strm == Z_NULL || strm->state == Z_NULL || dictionary == Z_NULL || - strm->state->wrap == 2 || - (strm->state->wrap == 1 && strm->state->status != INIT_STATE)) - return Z_STREAM_ERROR; - - s = strm->state; - if (s->wrap) - strm->adler = adler32(strm->adler, dictionary, dictLength); - - if (length < MIN_MATCH) return Z_OK; - if (length > s->w_size) { - length = s->w_size; - dictionary += dictLength - length; /* use the tail of the dictionary */ - } - zmemcpy(s->window, dictionary, length); - s->strstart = length; - s->block_start = (long)length; - - /* Insert all strings in the hash table (except for the last two bytes). - * s->lookahead stays null, so s->ins_h will be recomputed at the next - * call of fill_window. - */ - s->ins_h = s->window[0]; - UPDATE_HASH(s, s->ins_h, s->window[1]); - for (n = 0; n <= length - MIN_MATCH; n++) { - INSERT_STRING(s, n, hash_head); - } - if (hash_head) hash_head = 0; /* to make compiler happy */ - return Z_OK; -} - -/* ========================================================================= */ -int ZEXPORT deflateReset (strm) - z_streamp strm; -{ - deflate_state *s; - - if (strm == Z_NULL || strm->state == Z_NULL || - strm->zalloc == (alloc_func)0 || strm->zfree == (free_func)0) { - return Z_STREAM_ERROR; - } - - strm->total_in = strm->total_out = 0; - strm->msg = Z_NULL; /* use zfree if we ever allocate msg dynamically */ - strm->data_type = Z_UNKNOWN; - - s = (deflate_state *)strm->state; - s->pending = 0; - s->pending_out = s->pending_buf; - - if (s->wrap < 0) { - s->wrap = -s->wrap; /* was made negative by deflate(..., Z_FINISH); */ - } - s->status = s->wrap ? INIT_STATE : BUSY_STATE; - strm->adler = -#ifdef GZIP - s->wrap == 2 ? crc32(0L, Z_NULL, 0) : -#endif - adler32(0L, Z_NULL, 0); - s->last_flush = Z_NO_FLUSH; - - _tr_init(s); - lm_init(s); - - return Z_OK; -} - -/* ========================================================================= */ -int ZEXPORT deflateSetHeader (strm, head) - z_streamp strm; - gz_headerp head; -{ - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; - if (strm->state->wrap != 2) return Z_STREAM_ERROR; - strm->state->gzhead = head; - return Z_OK; -} - -/* ========================================================================= */ -int ZEXPORT deflatePrime (strm, bits, value) - z_streamp strm; - int bits; - int value; -{ - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; - strm->state->bi_valid = bits; - strm->state->bi_buf = (ush)(value & ((1 << bits) - 1)); - return Z_OK; -} - -/* ========================================================================= */ -int ZEXPORT deflateParams(strm, level, strategy) - z_streamp strm; - int level; - int strategy; -{ - deflate_state *s; - compress_func func; - int err = Z_OK; - - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; - s = strm->state; - -#ifdef FASTEST - if (level != 0) level = 1; -#else - if (level == Z_DEFAULT_COMPRESSION) level = 6; -#endif - if (level < 0 || level > 9 || strategy < 0 || strategy > Z_FIXED) { - return Z_STREAM_ERROR; - } - func = configuration_table[s->level].func; - - if ((strategy != s->strategy || func != configuration_table[level].func) && - strm->total_in != 0) { - /* Flush the last buffer: */ - err = deflate(strm, Z_BLOCK); - } - if (s->level != level) { - s->level = level; - s->max_lazy_match = configuration_table[level].max_lazy; - s->good_match = configuration_table[level].good_length; - s->nice_match = configuration_table[level].nice_length; - s->max_chain_length = configuration_table[level].max_chain; - } - s->strategy = strategy; - return err; -} - -/* ========================================================================= */ -int ZEXPORT deflateTune(strm, good_length, max_lazy, nice_length, max_chain) - z_streamp strm; - int good_length; - int max_lazy; - int nice_length; - int max_chain; -{ - deflate_state *s; - - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; - s = strm->state; - s->good_match = good_length; - s->max_lazy_match = max_lazy; - s->nice_match = nice_length; - s->max_chain_length = max_chain; - return Z_OK; -} - -/* ========================================================================= - * For the default windowBits of 15 and memLevel of 8, this function returns - * a close to exact, as well as small, upper bound on the compressed size. - * They are coded as constants here for a reason--if the #define's are - * changed, then this function needs to be changed as well. The return - * value for 15 and 8 only works for those exact settings. - * - * For any setting other than those defaults for windowBits and memLevel, - * the value returned is a conservative worst case for the maximum expansion - * resulting from using fixed blocks instead of stored blocks, which deflate - * can emit on compressed data for some combinations of the parameters. - * - * This function could be more sophisticated to provide closer upper bounds for - * every combination of windowBits and memLevel. But even the conservative - * upper bound of about 14% expansion does not seem onerous for output buffer - * allocation. - */ -uLong ZEXPORT deflateBound(strm, sourceLen) - z_streamp strm; - uLong sourceLen; -{ - deflate_state *s; - uLong complen, wraplen; - Bytef *str; - - /* conservative upper bound for compressed data */ - complen = sourceLen + - ((sourceLen + 7) >> 3) + ((sourceLen + 63) >> 6) + 5; - - /* if can't get parameters, return conservative bound plus zlib wrapper */ - if (strm == Z_NULL || strm->state == Z_NULL) - return complen + 6; - - /* compute wrapper length */ - s = strm->state; - switch (s->wrap) { - case 0: /* raw deflate */ - wraplen = 0; - break; - case 1: /* zlib wrapper */ - wraplen = 6 + (s->strstart ? 4 : 0); - break; - case 2: /* gzip wrapper */ - wraplen = 18; - if (s->gzhead != Z_NULL) { /* user-supplied gzip header */ - if (s->gzhead->extra != Z_NULL) - wraplen += 2 + s->gzhead->extra_len; - str = s->gzhead->name; - if (str != Z_NULL) - do { - wraplen++; - } while (*str++); - str = s->gzhead->comment; - if (str != Z_NULL) - do { - wraplen++; - } while (*str++); - if (s->gzhead->hcrc) - wraplen += 2; - } - break; - default: /* for compiler happiness */ - wraplen = 6; - } - - /* if not default parameters, return conservative bound */ - if (s->w_bits != 15 || s->hash_bits != 8 + 7) - return complen + wraplen; - - /* default settings: return tight bound for that case */ - return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) + - (sourceLen >> 25) + 13 - 6 + wraplen; -} - -/* ========================================================================= - * Put a short in the pending buffer. The 16-bit value is put in MSB order. - * IN assertion: the stream state is correct and there is enough room in - * pending_buf. - */ -local void putShortMSB (s, b) - deflate_state *s; - uInt b; -{ - put_byte(s, (Byte)(b >> 8)); - put_byte(s, (Byte)(b & 0xff)); -} - -/* ========================================================================= - * Flush as much pending output as possible. All deflate() output goes - * through this function so some applications may wish to modify it - * to avoid allocating a large strm->next_out buffer and copying into it. - * (See also read_buf()). - */ -local void flush_pending(strm) - z_streamp strm; -{ - unsigned len = strm->state->pending; - - if (len > strm->avail_out) len = strm->avail_out; - if (len == 0) return; - - zmemcpy(strm->next_out, strm->state->pending_out, len); - strm->next_out += len; - strm->state->pending_out += len; - strm->total_out += len; - strm->avail_out -= len; - strm->state->pending -= len; - if (strm->state->pending == 0) { - strm->state->pending_out = strm->state->pending_buf; - } -} - -/* ========================================================================= */ -int ZEXPORT deflate (strm, flush) - z_streamp strm; - int flush; -{ - int old_flush; /* value of flush param for previous deflate call */ - deflate_state *s; - - if (strm == Z_NULL || strm->state == Z_NULL || - flush > Z_BLOCK || flush < 0) { - return Z_STREAM_ERROR; - } - s = strm->state; - - if (strm->next_out == Z_NULL || - (strm->next_in == Z_NULL && strm->avail_in != 0) || - (s->status == FINISH_STATE && flush != Z_FINISH)) { - ERR_RETURN(strm, Z_STREAM_ERROR); - } - if (strm->avail_out == 0) ERR_RETURN(strm, Z_BUF_ERROR); - - s->strm = strm; /* just in case */ - old_flush = s->last_flush; - s->last_flush = flush; - - /* Write the header */ - if (s->status == INIT_STATE) { -#ifdef GZIP - if (s->wrap == 2) { - strm->adler = crc32(0L, Z_NULL, 0); - put_byte(s, 31); - put_byte(s, 139); - put_byte(s, 8); - if (s->gzhead == Z_NULL) { - put_byte(s, 0); - put_byte(s, 0); - put_byte(s, 0); - put_byte(s, 0); - put_byte(s, 0); - put_byte(s, s->level == 9 ? 2 : - (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ? - 4 : 0)); - put_byte(s, OS_CODE); - s->status = BUSY_STATE; - } - else { - put_byte(s, (s->gzhead->text ? 1 : 0) + - (s->gzhead->hcrc ? 2 : 0) + - (s->gzhead->extra == Z_NULL ? 0 : 4) + - (s->gzhead->name == Z_NULL ? 0 : 8) + - (s->gzhead->comment == Z_NULL ? 0 : 16) - ); - put_byte(s, (Byte)(s->gzhead->time & 0xff)); - put_byte(s, (Byte)((s->gzhead->time >> 8) & 0xff)); - put_byte(s, (Byte)((s->gzhead->time >> 16) & 0xff)); - put_byte(s, (Byte)((s->gzhead->time >> 24) & 0xff)); - put_byte(s, s->level == 9 ? 2 : - (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2 ? - 4 : 0)); - put_byte(s, s->gzhead->os & 0xff); - if (s->gzhead->extra != Z_NULL) { - put_byte(s, s->gzhead->extra_len & 0xff); - put_byte(s, (s->gzhead->extra_len >> 8) & 0xff); - } - if (s->gzhead->hcrc) - strm->adler = crc32(strm->adler, s->pending_buf, - s->pending); - s->gzindex = 0; - s->status = EXTRA_STATE; - } - } - else -#endif - { - uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8; - uInt level_flags; - - if (s->strategy >= Z_HUFFMAN_ONLY || s->level < 2) - level_flags = 0; - else if (s->level < 6) - level_flags = 1; - else if (s->level == 6) - level_flags = 2; - else - level_flags = 3; - header |= (level_flags << 6); - if (s->strstart != 0) header |= PRESET_DICT; - header += 31 - (header % 31); - - s->status = BUSY_STATE; - putShortMSB(s, header); - - /* Save the adler32 of the preset dictionary: */ - if (s->strstart != 0) { - putShortMSB(s, (uInt)(strm->adler >> 16)); - putShortMSB(s, (uInt)(strm->adler & 0xffff)); - } - strm->adler = adler32(0L, Z_NULL, 0); - } - } -#ifdef GZIP - if (s->status == EXTRA_STATE) { - if (s->gzhead->extra != Z_NULL) { - uInt beg = s->pending; /* start of bytes to update crc */ - - while (s->gzindex < (s->gzhead->extra_len & 0xffff)) { - if (s->pending == s->pending_buf_size) { - if (s->gzhead->hcrc && s->pending > beg) - strm->adler = crc32(strm->adler, s->pending_buf + beg, - s->pending - beg); - flush_pending(strm); - beg = s->pending; - if (s->pending == s->pending_buf_size) - break; - } - put_byte(s, s->gzhead->extra[s->gzindex]); - s->gzindex++; - } - if (s->gzhead->hcrc && s->pending > beg) - strm->adler = crc32(strm->adler, s->pending_buf + beg, - s->pending - beg); - if (s->gzindex == s->gzhead->extra_len) { - s->gzindex = 0; - s->status = NAME_STATE; - } - } - else - s->status = NAME_STATE; - } - if (s->status == NAME_STATE) { - if (s->gzhead->name != Z_NULL) { - uInt beg = s->pending; /* start of bytes to update crc */ - int val; - - do { - if (s->pending == s->pending_buf_size) { - if (s->gzhead->hcrc && s->pending > beg) - strm->adler = crc32(strm->adler, s->pending_buf + beg, - s->pending - beg); - flush_pending(strm); - beg = s->pending; - if (s->pending == s->pending_buf_size) { - val = 1; - break; - } - } - val = s->gzhead->name[s->gzindex++]; - put_byte(s, val); - } while (val != 0); - if (s->gzhead->hcrc && s->pending > beg) - strm->adler = crc32(strm->adler, s->pending_buf + beg, - s->pending - beg); - if (val == 0) { - s->gzindex = 0; - s->status = COMMENT_STATE; - } - } - else - s->status = COMMENT_STATE; - } - if (s->status == COMMENT_STATE) { - if (s->gzhead->comment != Z_NULL) { - uInt beg = s->pending; /* start of bytes to update crc */ - int val; - - do { - if (s->pending == s->pending_buf_size) { - if (s->gzhead->hcrc && s->pending > beg) - strm->adler = crc32(strm->adler, s->pending_buf + beg, - s->pending - beg); - flush_pending(strm); - beg = s->pending; - if (s->pending == s->pending_buf_size) { - val = 1; - break; - } - } - val = s->gzhead->comment[s->gzindex++]; - put_byte(s, val); - } while (val != 0); - if (s->gzhead->hcrc && s->pending > beg) - strm->adler = crc32(strm->adler, s->pending_buf + beg, - s->pending - beg); - if (val == 0) - s->status = HCRC_STATE; - } - else - s->status = HCRC_STATE; - } - if (s->status == HCRC_STATE) { - if (s->gzhead->hcrc) { - if (s->pending + 2 > s->pending_buf_size) - flush_pending(strm); - if (s->pending + 2 <= s->pending_buf_size) { - put_byte(s, (Byte)(strm->adler & 0xff)); - put_byte(s, (Byte)((strm->adler >> 8) & 0xff)); - strm->adler = crc32(0L, Z_NULL, 0); - s->status = BUSY_STATE; - } - } - else - s->status = BUSY_STATE; - } -#endif - - /* Flush as much pending output as possible */ - if (s->pending != 0) { - flush_pending(strm); - if (strm->avail_out == 0) { - /* Since avail_out is 0, deflate will be called again with - * more output space, but possibly with both pending and - * avail_in equal to zero. There won't be anything to do, - * but this is not an error situation so make sure we - * return OK instead of BUF_ERROR at next call of deflate: - */ - s->last_flush = -1; - return Z_OK; - } - - /* Make sure there is something to do and avoid duplicate consecutive - * flushes. For repeated and useless calls with Z_FINISH, we keep - * returning Z_STREAM_END instead of Z_BUF_ERROR. - */ - } else if (strm->avail_in == 0 && flush <= old_flush && - flush != Z_FINISH) { - ERR_RETURN(strm, Z_BUF_ERROR); - } - - /* User must not provide more input after the first FINISH: */ - if (s->status == FINISH_STATE && strm->avail_in != 0) { - ERR_RETURN(strm, Z_BUF_ERROR); - } - - /* Start a new block or continue the current one. - */ - if (strm->avail_in != 0 || s->lookahead != 0 || - (flush != Z_NO_FLUSH && s->status != FINISH_STATE)) { - block_state bstate; - - bstate = s->strategy == Z_HUFFMAN_ONLY ? deflate_huff(s, flush) : - (s->strategy == Z_RLE ? deflate_rle(s, flush) : - (*(configuration_table[s->level].func))(s, flush)); - - if (bstate == finish_started || bstate == finish_done) { - s->status = FINISH_STATE; - } - if (bstate == need_more || bstate == finish_started) { - if (strm->avail_out == 0) { - s->last_flush = -1; /* avoid BUF_ERROR next call, see above */ - } - return Z_OK; - /* If flush != Z_NO_FLUSH && avail_out == 0, the next call - * of deflate should use the same flush parameter to make sure - * that the flush is complete. So we don't have to output an - * empty block here, this will be done at next call. This also - * ensures that for a very small output buffer, we emit at most - * one empty block. - */ - } - if (bstate == block_done) { - if (flush == Z_PARTIAL_FLUSH) { - _tr_align(s); - } else if (flush != Z_BLOCK) { /* FULL_FLUSH or SYNC_FLUSH */ - _tr_stored_block(s, (char*)0, 0L, 0); - /* For a full flush, this empty block will be recognized - * as a special marker by inflate_sync(). - */ - if (flush == Z_FULL_FLUSH) { - CLEAR_HASH(s); /* forget history */ - if (s->lookahead == 0) { - s->strstart = 0; - s->block_start = 0L; - } - } - } - flush_pending(strm); - if (strm->avail_out == 0) { - s->last_flush = -1; /* avoid BUF_ERROR at next call, see above */ - return Z_OK; - } - } - } - Assert(strm->avail_out > 0, "bug2"); - - if (flush != Z_FINISH) return Z_OK; - if (s->wrap <= 0) return Z_STREAM_END; - - /* Write the trailer */ -#ifdef GZIP - if (s->wrap == 2) { - put_byte(s, (Byte)(strm->adler & 0xff)); - put_byte(s, (Byte)((strm->adler >> 8) & 0xff)); - put_byte(s, (Byte)((strm->adler >> 16) & 0xff)); - put_byte(s, (Byte)((strm->adler >> 24) & 0xff)); - put_byte(s, (Byte)(strm->total_in & 0xff)); - put_byte(s, (Byte)((strm->total_in >> 8) & 0xff)); - put_byte(s, (Byte)((strm->total_in >> 16) & 0xff)); - put_byte(s, (Byte)((strm->total_in >> 24) & 0xff)); - } - else -#endif - { - putShortMSB(s, (uInt)(strm->adler >> 16)); - putShortMSB(s, (uInt)(strm->adler & 0xffff)); - } - flush_pending(strm); - /* If avail_out is zero, the application will call deflate again - * to flush the rest. - */ - if (s->wrap > 0) s->wrap = -s->wrap; /* write the trailer only once! */ - return s->pending != 0 ? Z_OK : Z_STREAM_END; -} - -/* ========================================================================= */ -int ZEXPORT deflateEnd (strm) - z_streamp strm; -{ - int status; - - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; - - status = strm->state->status; - if (status != INIT_STATE && - status != EXTRA_STATE && - status != NAME_STATE && - status != COMMENT_STATE && - status != HCRC_STATE && - status != BUSY_STATE && - status != FINISH_STATE) { - return Z_STREAM_ERROR; - } - - /* Deallocate in reverse order of allocations: */ - TRY_FREE(strm, strm->state->pending_buf); - TRY_FREE(strm, strm->state->head); - TRY_FREE(strm, strm->state->prev); - TRY_FREE(strm, strm->state->window); - - ZFREE(strm, strm->state); - strm->state = Z_NULL; - - return status == BUSY_STATE ? Z_DATA_ERROR : Z_OK; -} - -/* ========================================================================= - * Copy the source state to the destination state. - * To simplify the source, this is not supported for 16-bit MSDOS (which - * doesn't have enough memory anyway to duplicate compression states). - */ -int ZEXPORT deflateCopy (dest, source) - z_streamp dest; - z_streamp source; -{ -#ifdef MAXSEG_64K - return Z_STREAM_ERROR; -#else - deflate_state *ds; - deflate_state *ss; - ushf *overlay; - - - if (source == Z_NULL || dest == Z_NULL || source->state == Z_NULL) { - return Z_STREAM_ERROR; - } - - ss = source->state; - - zmemcpy(dest, source, sizeof(z_stream)); - - ds = (deflate_state *) ZALLOC(dest, 1, sizeof(deflate_state)); - if (ds == Z_NULL) return Z_MEM_ERROR; - dest->state = (struct internal_state FAR *) ds; - zmemcpy(ds, ss, sizeof(deflate_state)); - ds->strm = dest; - - ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte)); - ds->prev = (Posf *) ZALLOC(dest, ds->w_size, sizeof(Pos)); - ds->head = (Posf *) ZALLOC(dest, ds->hash_size, sizeof(Pos)); - overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2); - ds->pending_buf = (uchf *) overlay; - - if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL || - ds->pending_buf == Z_NULL) { - deflateEnd (dest); - return Z_MEM_ERROR; - } - /* following zmemcpy do not work for 16-bit MSDOS */ - zmemcpy(ds->window, ss->window, ds->w_size * 2 * sizeof(Byte)); - zmemcpy(ds->prev, ss->prev, ds->w_size * sizeof(Pos)); - zmemcpy(ds->head, ss->head, ds->hash_size * sizeof(Pos)); - zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size); - - ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf); - ds->d_buf = overlay + ds->lit_bufsize/sizeof(ush); - ds->l_buf = ds->pending_buf + (1+sizeof(ush))*ds->lit_bufsize; - - ds->l_desc.dyn_tree = ds->dyn_ltree; - ds->d_desc.dyn_tree = ds->dyn_dtree; - ds->bl_desc.dyn_tree = ds->bl_tree; - - return Z_OK; -#endif /* MAXSEG_64K */ -} - -/* =========================================================================== - * Read a new buffer from the current input stream, update the adler32 - * and total number of bytes read. All deflate() input goes through - * this function so some applications may wish to modify it to avoid - * allocating a large strm->next_in buffer and copying from it. - * (See also flush_pending()). - */ -local int read_buf(strm, buf, size) - z_streamp strm; - Bytef *buf; - unsigned size; -{ - unsigned len = strm->avail_in; - - if (len > size) len = size; - if (len == 0) return 0; - - strm->avail_in -= len; - - if (strm->state->wrap == 1) { - strm->adler = adler32(strm->adler, strm->next_in, len); - } -#ifdef GZIP - else if (strm->state->wrap == 2) { - strm->adler = crc32(strm->adler, strm->next_in, len); - } -#endif - zmemcpy(buf, strm->next_in, len); - strm->next_in += len; - strm->total_in += len; - - return (int)len; -} - -/* =========================================================================== - * Initialize the "longest match" routines for a new zlib stream - */ -local void lm_init (s) - deflate_state *s; -{ - s->window_size = (ulg)2L*s->w_size; - - CLEAR_HASH(s); - - /* Set the default configuration parameters: - */ - s->max_lazy_match = configuration_table[s->level].max_lazy; - s->good_match = configuration_table[s->level].good_length; - s->nice_match = configuration_table[s->level].nice_length; - s->max_chain_length = configuration_table[s->level].max_chain; - - s->strstart = 0; - s->block_start = 0L; - s->lookahead = 0; - s->match_length = s->prev_length = MIN_MATCH-1; - s->match_available = 0; - s->ins_h = 0; -#ifndef FASTEST -#ifdef ASMV - match_init(); /* initialize the asm code */ -#endif -#endif -} - -#ifndef FASTEST -/* =========================================================================== - * Set match_start to the longest match starting at the given string and - * return its length. Matches shorter or equal to prev_length are discarded, - * in which case the result is equal to prev_length and match_start is - * garbage. - * IN assertions: cur_match is the head of the hash chain for the current - * string (strstart) and its distance is <= MAX_DIST, and prev_length >= 1 - * OUT assertion: the match length is not greater than s->lookahead. - */ -#ifndef ASMV -/* For 80x86 and 680x0, an optimized version will be provided in match.asm or - * match.S. The code will be functionally equivalent. - */ -local uInt longest_match(s, cur_match) - deflate_state *s; - IPos cur_match; /* current match */ -{ - unsigned chain_length = s->max_chain_length;/* max hash chain length */ - register Bytef *scan = s->window + s->strstart; /* current string */ - register Bytef *match; /* matched string */ - register int len; /* length of current match */ - int best_len = s->prev_length; /* best match length so far */ - int nice_match = s->nice_match; /* stop if match long enough */ - IPos limit = s->strstart > (IPos)MAX_DIST(s) ? - s->strstart - (IPos)MAX_DIST(s) : NIL; - /* Stop when cur_match becomes <= limit. To simplify the code, - * we prevent matches with the string of window index 0. - */ - Posf *prev = s->prev; - uInt wmask = s->w_mask; - -#ifdef UNALIGNED_OK - /* Compare two bytes at a time. Note: this is not always beneficial. - * Try with and without -DUNALIGNED_OK to check. - */ - register Bytef *strend = s->window + s->strstart + MAX_MATCH - 1; - register ush scan_start = *(ushf*)scan; - register ush scan_end = *(ushf*)(scan+best_len-1); -#else - register Bytef *strend = s->window + s->strstart + MAX_MATCH; - register Byte scan_end1 = scan[best_len-1]; - register Byte scan_end = scan[best_len]; -#endif - - /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16. - * It is easy to get rid of this optimization if necessary. - */ - Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever"); - - /* Do not waste too much time if we already have a good match: */ - if (s->prev_length >= s->good_match) { - chain_length >>= 2; - } - /* Do not look for matches beyond the end of the input. This is necessary - * to make deflate deterministic. - */ - if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead; - - Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead"); - - do { - Assert(cur_match < s->strstart, "no future"); - match = s->window + cur_match; - - /* Skip to next match if the match length cannot increase - * or if the match length is less than 2. Note that the checks below - * for insufficient lookahead only occur occasionally for performance - * reasons. Therefore uninitialized memory will be accessed, and - * conditional jumps will be made that depend on those values. - * However the length of the match is limited to the lookahead, so - * the output of deflate is not affected by the uninitialized values. - */ -#if (defined(UNALIGNED_OK) && MAX_MATCH == 258) - /* This code assumes sizeof(unsigned short) == 2. Do not use - * UNALIGNED_OK if your compiler uses a different size. - */ - if (*(ushf*)(match+best_len-1) != scan_end || - *(ushf*)match != scan_start) continue; - - /* It is not necessary to compare scan[2] and match[2] since they are - * always equal when the other bytes match, given that the hash keys - * are equal and that HASH_BITS >= 8. Compare 2 bytes at a time at - * strstart+3, +5, ... up to strstart+257. We check for insufficient - * lookahead only every 4th comparison; the 128th check will be made - * at strstart+257. If MAX_MATCH-2 is not a multiple of 8, it is - * necessary to put more guard bytes at the end of the window, or - * to check more often for insufficient lookahead. - */ - Assert(scan[2] == match[2], "scan[2]?"); - scan++, match++; - do { - } while (*(ushf*)(scan+=2) == *(ushf*)(match+=2) && - *(ushf*)(scan+=2) == *(ushf*)(match+=2) && - *(ushf*)(scan+=2) == *(ushf*)(match+=2) && - *(ushf*)(scan+=2) == *(ushf*)(match+=2) && - scan < strend); - /* The funny "do {}" generates better code on most compilers */ - - /* Here, scan <= window+strstart+257 */ - Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan"); - if (*scan == *match) scan++; - - len = (MAX_MATCH - 1) - (int)(strend-scan); - scan = strend - (MAX_MATCH-1); - -#else /* UNALIGNED_OK */ - - if (match[best_len] != scan_end || - match[best_len-1] != scan_end1 || - *match != *scan || - *++match != scan[1]) continue; - - /* The check at best_len-1 can be removed because it will be made - * again later. (This heuristic is not always a win.) - * It is not necessary to compare scan[2] and match[2] since they - * are always equal when the other bytes match, given that - * the hash keys are equal and that HASH_BITS >= 8. - */ - scan += 2, match++; - Assert(*scan == *match, "match[2]?"); - - /* We check for insufficient lookahead only every 8th comparison; - * the 256th check will be made at strstart+258. - */ - do { - } while (*++scan == *++match && *++scan == *++match && - *++scan == *++match && *++scan == *++match && - *++scan == *++match && *++scan == *++match && - *++scan == *++match && *++scan == *++match && - scan < strend); - - Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan"); - - len = MAX_MATCH - (int)(strend - scan); - scan = strend - MAX_MATCH; - -#endif /* UNALIGNED_OK */ - - if (len > best_len) { - s->match_start = cur_match; - best_len = len; - if (len >= nice_match) break; -#ifdef UNALIGNED_OK - scan_end = *(ushf*)(scan+best_len-1); -#else - scan_end1 = scan[best_len-1]; - scan_end = scan[best_len]; -#endif - } - } while ((cur_match = prev[cur_match & wmask]) > limit - && --chain_length != 0); - - if ((uInt)best_len <= s->lookahead) return (uInt)best_len; - return s->lookahead; -} -#endif /* ASMV */ - -#else /* FASTEST */ - -/* --------------------------------------------------------------------------- - * Optimized version for FASTEST only - */ -local uInt longest_match(s, cur_match) - deflate_state *s; - IPos cur_match; /* current match */ -{ - register Bytef *scan = s->window + s->strstart; /* current string */ - register Bytef *match; /* matched string */ - register int len; /* length of current match */ - register Bytef *strend = s->window + s->strstart + MAX_MATCH; - - /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16. - * It is easy to get rid of this optimization if necessary. - */ - Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever"); - - Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead"); - - Assert(cur_match < s->strstart, "no future"); - - match = s->window + cur_match; - - /* Return failure if the match length is less than 2: - */ - if (match[0] != scan[0] || match[1] != scan[1]) return MIN_MATCH-1; - - /* The check at best_len-1 can be removed because it will be made - * again later. (This heuristic is not always a win.) - * It is not necessary to compare scan[2] and match[2] since they - * are always equal when the other bytes match, given that - * the hash keys are equal and that HASH_BITS >= 8. - */ - scan += 2, match += 2; - Assert(*scan == *match, "match[2]?"); - - /* We check for insufficient lookahead only every 8th comparison; - * the 256th check will be made at strstart+258. - */ - do { - } while (*++scan == *++match && *++scan == *++match && - *++scan == *++match && *++scan == *++match && - *++scan == *++match && *++scan == *++match && - *++scan == *++match && *++scan == *++match && - scan < strend); - - Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan"); - - len = MAX_MATCH - (int)(strend - scan); - - if (len < MIN_MATCH) return MIN_MATCH - 1; - - s->match_start = cur_match; - return (uInt)len <= s->lookahead ? (uInt)len : s->lookahead; -} - -#endif /* FASTEST */ - -#ifdef DEBUG -/* =========================================================================== - * Check that the match at match_start is indeed a match. - */ -local void check_match(s, start, match, length) - deflate_state *s; - IPos start, match; - int length; -{ - /* check that the match is indeed a match */ - if (zmemcmp(s->window + match, - s->window + start, length) != EQUAL) { - fprintf(stderr, " start %u, match %u, length %d\n", - start, match, length); - do { - fprintf(stderr, "%c%c", s->window[match++], s->window[start++]); - } while (--length != 0); - z_error("invalid match"); - } - if (z_verbose > 1) { - fprintf(stderr,"\\[%d,%d]", start-match, length); - do { putc(s->window[start++], stderr); } while (--length != 0); - } -} -#else -# define check_match(s, start, match, length) -#endif /* DEBUG */ - -/* =========================================================================== - * Fill the window when the lookahead becomes insufficient. - * Updates strstart and lookahead. - * - * IN assertion: lookahead < MIN_LOOKAHEAD - * OUT assertions: strstart <= window_size-MIN_LOOKAHEAD - * At least one byte has been read, or avail_in == 0; reads are - * performed for at least two bytes (required for the zip translate_eol - * option -- not supported here). - */ -local void fill_window(s) - deflate_state *s; -{ - register unsigned n, m; - register Posf *p; - unsigned more; /* Amount of free space at the end of the window. */ - uInt wsize = s->w_size; - - do { - more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart); - - /* Deal with !@#$% 64K limit: */ - if (sizeof(int) <= 2) { - if (more == 0 && s->strstart == 0 && s->lookahead == 0) { - more = wsize; - - } else if (more == (unsigned)(-1)) { - /* Very unlikely, but possible on 16 bit machine if - * strstart == 0 && lookahead == 1 (input done a byte at time) - */ - more--; - } - } - - /* If the window is almost full and there is insufficient lookahead, - * move the upper half to the lower one to make room in the upper half. - */ - if (s->strstart >= wsize+MAX_DIST(s)) { - - zmemcpy(s->window, s->window+wsize, (unsigned)wsize); - s->match_start -= wsize; - s->strstart -= wsize; /* we now have strstart >= MAX_DIST */ - s->block_start -= (long) wsize; - - /* Slide the hash table (could be avoided with 32 bit values - at the expense of memory usage). We slide even when level == 0 - to keep the hash table consistent if we switch back to level > 0 - later. (Using level 0 permanently is not an optimal usage of - zlib, so we don't care about this pathological case.) - */ - n = s->hash_size; - p = &s->head[n]; - do { - m = *--p; - *p = (Pos)(m >= wsize ? m-wsize : NIL); - } while (--n); - - n = wsize; -#ifndef FASTEST - p = &s->prev[n]; - do { - m = *--p; - *p = (Pos)(m >= wsize ? m-wsize : NIL); - /* If n is not on any hash chain, prev[n] is garbage but - * its value will never be used. - */ - } while (--n); -#endif - more += wsize; - } - if (s->strm->avail_in == 0) return; - - /* If there was no sliding: - * strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 && - * more == window_size - lookahead - strstart - * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1) - * => more >= window_size - 2*WSIZE + 2 - * In the BIG_MEM or MMAP case (not yet supported), - * window_size == input_size + MIN_LOOKAHEAD && - * strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD. - * Otherwise, window_size == 2*WSIZE so more >= 2. - * If there was sliding, more >= WSIZE. So in all cases, more >= 2. - */ - Assert(more >= 2, "more < 2"); - - n = read_buf(s->strm, s->window + s->strstart + s->lookahead, more); - s->lookahead += n; - - /* Initialize the hash value now that we have some input: */ - if (s->lookahead >= MIN_MATCH) { - s->ins_h = s->window[s->strstart]; - UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]); -#if MIN_MATCH != 3 - Call UPDATE_HASH() MIN_MATCH-3 more times -#endif - } - /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage, - * but this is not important since only literal bytes will be emitted. - */ - - } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0); - - /* If the WIN_INIT bytes after the end of the current data have never been - * written, then zero those bytes in order to avoid memory check reports of - * the use of uninitialized (or uninitialised as Julian writes) bytes by - * the longest match routines. Update the high water mark for the next - * time through here. WIN_INIT is set to MAX_MATCH since the longest match - * routines allow scanning to strstart + MAX_MATCH, ignoring lookahead. - */ - if (s->high_water < s->window_size) { - ulg curr = s->strstart + (ulg)(s->lookahead); - ulg init; - - if (s->high_water < curr) { - /* Previous high water mark below current data -- zero WIN_INIT - * bytes or up to end of window, whichever is less. - */ - init = s->window_size - curr; - if (init > WIN_INIT) - init = WIN_INIT; - zmemzero(s->window + curr, (unsigned)init); - s->high_water = curr + init; - } - else if (s->high_water < (ulg)curr + WIN_INIT) { - /* High water mark at or above current data, but below current data - * plus WIN_INIT -- zero out to current data plus WIN_INIT, or up - * to end of window, whichever is less. - */ - init = (ulg)curr + WIN_INIT - s->high_water; - if (init > s->window_size - s->high_water) - init = s->window_size - s->high_water; - zmemzero(s->window + s->high_water, (unsigned)init); - s->high_water += init; - } - } -} - -/* =========================================================================== - * Flush the current block, with given end-of-file flag. - * IN assertion: strstart is set to the end of the current match. - */ -#define FLUSH_BLOCK_ONLY(s, last) { \ - _tr_flush_block(s, (s->block_start >= 0L ? \ - (charf *)&s->window[(unsigned)s->block_start] : \ - (charf *)Z_NULL), \ - (ulg)((long)s->strstart - s->block_start), \ - (last)); \ - s->block_start = s->strstart; \ - flush_pending(s->strm); \ - Tracev((stderr,"[FLUSH]")); \ -} - -/* Same but force premature exit if necessary. */ -#define FLUSH_BLOCK(s, last) { \ - FLUSH_BLOCK_ONLY(s, last); \ - if (s->strm->avail_out == 0) return (last) ? finish_started : need_more; \ -} - -/* =========================================================================== - * Copy without compression as much as possible from the input stream, return - * the current block state. - * This function does not insert new strings in the dictionary since - * uncompressible data is probably not useful. This function is used - * only for the level=0 compression option. - * NOTE: this function should be optimized to avoid extra copying from - * window to pending_buf. - */ -local block_state deflate_stored(s, flush) - deflate_state *s; - int flush; -{ - /* Stored blocks are limited to 0xffff bytes, pending_buf is limited - * to pending_buf_size, and each stored block has a 5 byte header: - */ - ulg max_block_size = 0xffff; - ulg max_start; - - if (max_block_size > s->pending_buf_size - 5) { - max_block_size = s->pending_buf_size - 5; - } - - /* Copy as much as possible from input to output: */ - for (;;) { - /* Fill the window as much as possible: */ - if (s->lookahead <= 1) { - - Assert(s->strstart < s->w_size+MAX_DIST(s) || - s->block_start >= (long)s->w_size, "slide too late"); - - fill_window(s); - if (s->lookahead == 0 && flush == Z_NO_FLUSH) return need_more; - - if (s->lookahead == 0) break; /* flush the current block */ - } - Assert(s->block_start >= 0L, "block gone"); - - s->strstart += s->lookahead; - s->lookahead = 0; - - /* Emit a stored block if pending_buf will be full: */ - max_start = s->block_start + max_block_size; - if (s->strstart == 0 || (ulg)s->strstart >= max_start) { - /* strstart == 0 is possible when wraparound on 16-bit machine */ - s->lookahead = (uInt)(s->strstart - max_start); - s->strstart = (uInt)max_start; - FLUSH_BLOCK(s, 0); - } - /* Flush if we may have to slide, otherwise block_start may become - * negative and the data will be gone: - */ - if (s->strstart - (uInt)s->block_start >= MAX_DIST(s)) { - FLUSH_BLOCK(s, 0); - } - } - FLUSH_BLOCK(s, flush == Z_FINISH); - return flush == Z_FINISH ? finish_done : block_done; -} - -/* =========================================================================== - * Compress as much as possible from the input stream, return the current - * block state. - * This function does not perform lazy evaluation of matches and inserts - * new strings in the dictionary only for unmatched strings or for short - * matches. It is used only for the fast compression options. - */ -local block_state deflate_fast(s, flush) - deflate_state *s; - int flush; -{ - IPos hash_head; /* head of the hash chain */ - int bflush; /* set if current block must be flushed */ - - for (;;) { - /* Make sure that we always have enough lookahead, except - * at the end of the input file. We need MAX_MATCH bytes - * for the next match, plus MIN_MATCH bytes to insert the - * string following the next match. - */ - if (s->lookahead < MIN_LOOKAHEAD) { - fill_window(s); - if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) { - return need_more; - } - if (s->lookahead == 0) break; /* flush the current block */ - } - - /* Insert the string window[strstart .. strstart+2] in the - * dictionary, and set hash_head to the head of the hash chain: - */ - hash_head = NIL; - if (s->lookahead >= MIN_MATCH) { - INSERT_STRING(s, s->strstart, hash_head); - } - - /* Find the longest match, discarding those <= prev_length. - * At this point we have always match_length < MIN_MATCH - */ - if (hash_head != NIL && s->strstart - hash_head <= MAX_DIST(s)) { - /* To simplify the code, we prevent matches with the string - * of window index 0 (in particular we have to avoid a match - * of the string with itself at the start of the input file). - */ - s->match_length = longest_match (s, hash_head); - /* longest_match() sets match_start */ - } - if (s->match_length >= MIN_MATCH) { - check_match(s, s->strstart, s->match_start, s->match_length); - - _tr_tally_dist(s, s->strstart - s->match_start, - s->match_length - MIN_MATCH, bflush); - - s->lookahead -= s->match_length; - - /* Insert new strings in the hash table only if the match length - * is not too large. This saves time but degrades compression. - */ -#ifndef FASTEST - if (s->match_length <= s->max_insert_length && - s->lookahead >= MIN_MATCH) { - s->match_length--; /* string at strstart already in table */ - do { - s->strstart++; - INSERT_STRING(s, s->strstart, hash_head); - /* strstart never exceeds WSIZE-MAX_MATCH, so there are - * always MIN_MATCH bytes ahead. - */ - } while (--s->match_length != 0); - s->strstart++; - } else -#endif - { - s->strstart += s->match_length; - s->match_length = 0; - s->ins_h = s->window[s->strstart]; - UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]); -#if MIN_MATCH != 3 - Call UPDATE_HASH() MIN_MATCH-3 more times -#endif - /* If lookahead < MIN_MATCH, ins_h is garbage, but it does not - * matter since it will be recomputed at next deflate call. - */ - } - } else { - /* No match, output a literal byte */ - Tracevv((stderr,"%c", s->window[s->strstart])); - _tr_tally_lit (s, s->window[s->strstart], bflush); - s->lookahead--; - s->strstart++; - } - if (bflush) FLUSH_BLOCK(s, 0); - } - FLUSH_BLOCK(s, flush == Z_FINISH); - return flush == Z_FINISH ? finish_done : block_done; -} - -#ifndef FASTEST -/* =========================================================================== - * Same as above, but achieves better compression. We use a lazy - * evaluation for matches: a match is finally adopted only if there is - * no better match at the next window position. - */ -local block_state deflate_slow(s, flush) - deflate_state *s; - int flush; -{ - IPos hash_head; /* head of hash chain */ - int bflush; /* set if current block must be flushed */ - - /* Process the input block. */ - for (;;) { - /* Make sure that we always have enough lookahead, except - * at the end of the input file. We need MAX_MATCH bytes - * for the next match, plus MIN_MATCH bytes to insert the - * string following the next match. - */ - if (s->lookahead < MIN_LOOKAHEAD) { - fill_window(s); - if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) { - return need_more; - } - if (s->lookahead == 0) break; /* flush the current block */ - } - - /* Insert the string window[strstart .. strstart+2] in the - * dictionary, and set hash_head to the head of the hash chain: - */ - hash_head = NIL; - if (s->lookahead >= MIN_MATCH) { - INSERT_STRING(s, s->strstart, hash_head); - } - - /* Find the longest match, discarding those <= prev_length. - */ - s->prev_length = s->match_length, s->prev_match = s->match_start; - s->match_length = MIN_MATCH-1; - - if (hash_head != NIL && s->prev_length < s->max_lazy_match && - s->strstart - hash_head <= MAX_DIST(s)) { - /* To simplify the code, we prevent matches with the string - * of window index 0 (in particular we have to avoid a match - * of the string with itself at the start of the input file). - */ - s->match_length = longest_match (s, hash_head); - /* longest_match() sets match_start */ - - if (s->match_length <= 5 && (s->strategy == Z_FILTERED -#if TOO_FAR <= 32767 - || (s->match_length == MIN_MATCH && - s->strstart - s->match_start > TOO_FAR) -#endif - )) { - - /* If prev_match is also MIN_MATCH, match_start is garbage - * but we will ignore the current match anyway. - */ - s->match_length = MIN_MATCH-1; - } - } - /* If there was a match at the previous step and the current - * match is not better, output the previous match: - */ - if (s->prev_length >= MIN_MATCH && s->match_length <= s->prev_length) { - uInt max_insert = s->strstart + s->lookahead - MIN_MATCH; - /* Do not insert strings in hash table beyond this. */ - - check_match(s, s->strstart-1, s->prev_match, s->prev_length); - - _tr_tally_dist(s, s->strstart -1 - s->prev_match, - s->prev_length - MIN_MATCH, bflush); - - /* Insert in hash table all strings up to the end of the match. - * strstart-1 and strstart are already inserted. If there is not - * enough lookahead, the last two strings are not inserted in - * the hash table. - */ - s->lookahead -= s->prev_length-1; - s->prev_length -= 2; - do { - if (++s->strstart <= max_insert) { - INSERT_STRING(s, s->strstart, hash_head); - } - } while (--s->prev_length != 0); - s->match_available = 0; - s->match_length = MIN_MATCH-1; - s->strstart++; - - if (bflush) FLUSH_BLOCK(s, 0); - - } else if (s->match_available) { - /* If there was no match at the previous position, output a - * single literal. If there was a match but the current match - * is longer, truncate the previous match to a single literal. - */ - Tracevv((stderr,"%c", s->window[s->strstart-1])); - _tr_tally_lit(s, s->window[s->strstart-1], bflush); - if (bflush) { - FLUSH_BLOCK_ONLY(s, 0); - } - s->strstart++; - s->lookahead--; - if (s->strm->avail_out == 0) return need_more; - } else { - /* There is no previous match to compare with, wait for - * the next step to decide. - */ - s->match_available = 1; - s->strstart++; - s->lookahead--; - } - } - Assert (flush != Z_NO_FLUSH, "no flush?"); - if (s->match_available) { - Tracevv((stderr,"%c", s->window[s->strstart-1])); - _tr_tally_lit(s, s->window[s->strstart-1], bflush); - s->match_available = 0; - } - FLUSH_BLOCK(s, flush == Z_FINISH); - return flush == Z_FINISH ? finish_done : block_done; -} -#endif /* FASTEST */ - -/* =========================================================================== - * For Z_RLE, simply look for runs of bytes, generate matches only of distance - * one. Do not maintain a hash table. (It will be regenerated if this run of - * deflate switches away from Z_RLE.) - */ -local block_state deflate_rle(s, flush) - deflate_state *s; - int flush; -{ - int bflush; /* set if current block must be flushed */ - uInt prev; /* byte at distance one to match */ - Bytef *scan, *strend; /* scan goes up to strend for length of run */ - - for (;;) { - /* Make sure that we always have enough lookahead, except - * at the end of the input file. We need MAX_MATCH bytes - * for the longest encodable run. - */ - if (s->lookahead < MAX_MATCH) { - fill_window(s); - if (s->lookahead < MAX_MATCH && flush == Z_NO_FLUSH) { - return need_more; - } - if (s->lookahead == 0) break; /* flush the current block */ - } - - /* See how many times the previous byte repeats */ - s->match_length = 0; - if (s->lookahead >= MIN_MATCH && s->strstart > 0) { - scan = s->window + s->strstart - 1; - prev = *scan; - if (prev == *++scan && prev == *++scan && prev == *++scan) { - strend = s->window + s->strstart + MAX_MATCH; - do { - } while (prev == *++scan && prev == *++scan && - prev == *++scan && prev == *++scan && - prev == *++scan && prev == *++scan && - prev == *++scan && prev == *++scan && - scan < strend); - s->match_length = MAX_MATCH - (int)(strend - scan); - if (s->match_length > s->lookahead) - s->match_length = s->lookahead; - } - } - - /* Emit match if have run of MIN_MATCH or longer, else emit literal */ - if (s->match_length >= MIN_MATCH) { - check_match(s, s->strstart, s->strstart - 1, s->match_length); - - _tr_tally_dist(s, 1, s->match_length - MIN_MATCH, bflush); - - s->lookahead -= s->match_length; - s->strstart += s->match_length; - s->match_length = 0; - } else { - /* No match, output a literal byte */ - Tracevv((stderr,"%c", s->window[s->strstart])); - _tr_tally_lit (s, s->window[s->strstart], bflush); - s->lookahead--; - s->strstart++; - } - if (bflush) FLUSH_BLOCK(s, 0); - } - FLUSH_BLOCK(s, flush == Z_FINISH); - return flush == Z_FINISH ? finish_done : block_done; -} - -/* =========================================================================== - * For Z_HUFFMAN_ONLY, do not look for matches. Do not maintain a hash table. - * (It will be regenerated if this run of deflate switches away from Huffman.) - */ -local block_state deflate_huff(s, flush) - deflate_state *s; - int flush; -{ - int bflush; /* set if current block must be flushed */ - - for (;;) { - /* Make sure that we have a literal to write. */ - if (s->lookahead == 0) { - fill_window(s); - if (s->lookahead == 0) { - if (flush == Z_NO_FLUSH) - return need_more; - break; /* flush the current block */ - } - } - - /* Output a literal byte */ - s->match_length = 0; - Tracevv((stderr,"%c", s->window[s->strstart])); - _tr_tally_lit (s, s->window[s->strstart], bflush); - s->lookahead--; - s->strstart++; - if (bflush) FLUSH_BLOCK(s, 0); - } - FLUSH_BLOCK(s, flush == Z_FINISH); - return flush == Z_FINISH ? finish_done : block_done; -} diff --git a/libs/libwebsockets/win32port/zlib/deflate.h b/libs/libwebsockets/win32port/zlib/deflate.h deleted file mode 100644 index e9044c1da2..0000000000 --- a/libs/libwebsockets/win32port/zlib/deflate.h +++ /dev/null @@ -1,342 +0,0 @@ -/* deflate.h -- internal compression state - * Copyright (C) 1995-2010 Jean-loup Gailly - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -/* WARNING: this file should *not* be used by applications. It is - part of the implementation of the compression library and is - subject to change. Applications should only use zlib.h. - */ - -/* @(#) $Id$ */ - -#ifndef DEFLATE_H -#define DEFLATE_H - -#include "zutil.h" - -/* define NO_GZIP when compiling if you want to disable gzip header and - trailer creation by deflate(). NO_GZIP would be used to avoid linking in - the crc code when it is not needed. For shared libraries, gzip encoding - should be left enabled. */ -#ifndef NO_GZIP -# define GZIP -#endif - -/* =========================================================================== - * Internal compression state. - */ - -#define LENGTH_CODES 29 -/* number of length codes, not counting the special END_BLOCK code */ - -#define LITERALS 256 -/* number of literal bytes 0..255 */ - -#define L_CODES (LITERALS+1+LENGTH_CODES) -/* number of Literal or Length codes, including the END_BLOCK code */ - -#define D_CODES 30 -/* number of distance codes */ - -#define BL_CODES 19 -/* number of codes used to transfer the bit lengths */ - -#define HEAP_SIZE (2*L_CODES+1) -/* maximum heap size */ - -#define MAX_BITS 15 -/* All codes must not exceed MAX_BITS bits */ - -#define INIT_STATE 42 -#define EXTRA_STATE 69 -#define NAME_STATE 73 -#define COMMENT_STATE 91 -#define HCRC_STATE 103 -#define BUSY_STATE 113 -#define FINISH_STATE 666 -/* Stream status */ - - -/* Data structure describing a single value and its code string. */ -typedef struct ct_data_s { - union { - ush freq; /* frequency count */ - ush code; /* bit string */ - } fc; - union { - ush dad; /* father node in Huffman tree */ - ush len; /* length of bit string */ - } dl; -} FAR ct_data; - -#define Freq fc.freq -#define Code fc.code -#define Dad dl.dad -#define Len dl.len - -typedef struct static_tree_desc_s static_tree_desc; - -typedef struct tree_desc_s { - ct_data *dyn_tree; /* the dynamic tree */ - int max_code; /* largest code with non zero frequency */ - static_tree_desc *stat_desc; /* the corresponding static tree */ -} FAR tree_desc; - -typedef ush Pos; -typedef Pos FAR Posf; -typedef unsigned IPos; - -/* A Pos is an index in the character window. We use short instead of int to - * save space in the various tables. IPos is used only for parameter passing. - */ - -typedef struct internal_state { - z_streamp strm; /* pointer back to this zlib stream */ - int status; /* as the name implies */ - Bytef *pending_buf; /* output still pending */ - ulg pending_buf_size; /* size of pending_buf */ - Bytef *pending_out; /* next pending byte to output to the stream */ - uInt pending; /* nb of bytes in the pending buffer */ - int wrap; /* bit 0 true for zlib, bit 1 true for gzip */ - gz_headerp gzhead; /* gzip header information to write */ - uInt gzindex; /* where in extra, name, or comment */ - Byte method; /* STORED (for zip only) or DEFLATED */ - int last_flush; /* value of flush param for previous deflate call */ - - /* used by deflate.c: */ - - uInt w_size; /* LZ77 window size (32K by default) */ - uInt w_bits; /* log2(w_size) (8..16) */ - uInt w_mask; /* w_size - 1 */ - - Bytef *window; - /* Sliding window. Input bytes are read into the second half of the window, - * and move to the first half later to keep a dictionary of at least wSize - * bytes. With this organization, matches are limited to a distance of - * wSize-MAX_MATCH bytes, but this ensures that IO is always - * performed with a length multiple of the block size. Also, it limits - * the window size to 64K, which is quite useful on MSDOS. - * To do: use the user input buffer as sliding window. - */ - - ulg window_size; - /* Actual size of window: 2*wSize, except when the user input buffer - * is directly used as sliding window. - */ - - Posf *prev; - /* Link to older string with same hash index. To limit the size of this - * array to 64K, this link is maintained only for the last 32K strings. - * An index in this array is thus a window index modulo 32K. - */ - - Posf *head; /* Heads of the hash chains or NIL. */ - - uInt ins_h; /* hash index of string to be inserted */ - uInt hash_size; /* number of elements in hash table */ - uInt hash_bits; /* log2(hash_size) */ - uInt hash_mask; /* hash_size-1 */ - - uInt hash_shift; - /* Number of bits by which ins_h must be shifted at each input - * step. It must be such that after MIN_MATCH steps, the oldest - * byte no longer takes part in the hash key, that is: - * hash_shift * MIN_MATCH >= hash_bits - */ - - long block_start; - /* Window position at the beginning of the current output block. Gets - * negative when the window is moved backwards. - */ - - uInt match_length; /* length of best match */ - IPos prev_match; /* previous match */ - int match_available; /* set if previous match exists */ - uInt strstart; /* start of string to insert */ - uInt match_start; /* start of matching string */ - uInt lookahead; /* number of valid bytes ahead in window */ - - uInt prev_length; - /* Length of the best match at previous step. Matches not greater than this - * are discarded. This is used in the lazy match evaluation. - */ - - uInt max_chain_length; - /* To speed up deflation, hash chains are never searched beyond this - * length. A higher limit improves compression ratio but degrades the - * speed. - */ - - uInt max_lazy_match; - /* Attempt to find a better match only when the current match is strictly - * smaller than this value. This mechanism is used only for compression - * levels >= 4. - */ -# define max_insert_length max_lazy_match - /* Insert new strings in the hash table only if the match length is not - * greater than this length. This saves time but degrades compression. - * max_insert_length is used only for compression levels <= 3. - */ - - int level; /* compression level (1..9) */ - int strategy; /* favor or force Huffman coding*/ - - uInt good_match; - /* Use a faster search when the previous match is longer than this */ - - int nice_match; /* Stop searching when current match exceeds this */ - - /* used by trees.c: */ - /* Didn't use ct_data typedef below to supress compiler warning */ - struct ct_data_s dyn_ltree[HEAP_SIZE]; /* literal and length tree */ - struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */ - struct ct_data_s bl_tree[2*BL_CODES+1]; /* Huffman tree for bit lengths */ - - struct tree_desc_s l_desc; /* desc. for literal tree */ - struct tree_desc_s d_desc; /* desc. for distance tree */ - struct tree_desc_s bl_desc; /* desc. for bit length tree */ - - ush bl_count[MAX_BITS+1]; - /* number of codes at each bit length for an optimal tree */ - - int heap[2*L_CODES+1]; /* heap used to build the Huffman trees */ - int heap_len; /* number of elements in the heap */ - int heap_max; /* element of largest frequency */ - /* The sons of heap[n] are heap[2*n] and heap[2*n+1]. heap[0] is not used. - * The same heap array is used to build all trees. - */ - - uch depth[2*L_CODES+1]; - /* Depth of each subtree used as tie breaker for trees of equal frequency - */ - - uchf *l_buf; /* buffer for literals or lengths */ - - uInt lit_bufsize; - /* Size of match buffer for literals/lengths. There are 4 reasons for - * limiting lit_bufsize to 64K: - * - frequencies can be kept in 16 bit counters - * - if compression is not successful for the first block, all input - * data is still in the window so we can still emit a stored block even - * when input comes from standard input. (This can also be done for - * all blocks if lit_bufsize is not greater than 32K.) - * - if compression is not successful for a file smaller than 64K, we can - * even emit a stored file instead of a stored block (saving 5 bytes). - * This is applicable only for zip (not gzip or zlib). - * - creating new Huffman trees less frequently may not provide fast - * adaptation to changes in the input data statistics. (Take for - * example a binary file with poorly compressible code followed by - * a highly compressible string table.) Smaller buffer sizes give - * fast adaptation but have of course the overhead of transmitting - * trees more frequently. - * - I can't count above 4 - */ - - uInt last_lit; /* running index in l_buf */ - - ushf *d_buf; - /* Buffer for distances. To simplify the code, d_buf and l_buf have - * the same number of elements. To use different lengths, an extra flag - * array would be necessary. - */ - - ulg opt_len; /* bit length of current block with optimal trees */ - ulg static_len; /* bit length of current block with static trees */ - uInt matches; /* number of string matches in current block */ - int last_eob_len; /* bit length of EOB code for last block */ - -#ifdef DEBUG - ulg compressed_len; /* total bit length of compressed file mod 2^32 */ - ulg bits_sent; /* bit length of compressed data sent mod 2^32 */ -#endif - - ush bi_buf; - /* Output buffer. bits are inserted starting at the bottom (least - * significant bits). - */ - int bi_valid; - /* Number of valid bits in bi_buf. All bits above the last valid bit - * are always zero. - */ - - ulg high_water; - /* High water mark offset in window for initialized bytes -- bytes above - * this are set to zero in order to avoid memory check warnings when - * longest match routines access bytes past the input. This is then - * updated to the new high water mark. - */ - -} FAR deflate_state; - -/* Output a byte on the stream. - * IN assertion: there is enough room in pending_buf. - */ -#define put_byte(s, c) {s->pending_buf[s->pending++] = (c);} - - -#define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1) -/* Minimum amount of lookahead, except at the end of the input file. - * See deflate.c for comments about the MIN_MATCH+1. - */ - -#define MAX_DIST(s) ((s)->w_size-MIN_LOOKAHEAD) -/* In order to simplify the code, particularly on 16 bit machines, match - * distances are limited to MAX_DIST instead of WSIZE. - */ - -#define WIN_INIT MAX_MATCH -/* Number of bytes after end of data in window to initialize in order to avoid - memory checker errors from longest match routines */ - - /* in trees.c */ -void ZLIB_INTERNAL _tr_init OF((deflate_state *s)); -int ZLIB_INTERNAL _tr_tally OF((deflate_state *s, unsigned dist, unsigned lc)); -void ZLIB_INTERNAL _tr_flush_block OF((deflate_state *s, charf *buf, - ulg stored_len, int last)); -void ZLIB_INTERNAL _tr_align OF((deflate_state *s)); -void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf, - ulg stored_len, int last)); - -#define d_code(dist) \ - ((dist) < 256 ? _dist_code[dist] : _dist_code[256+((dist)>>7)]) -/* Mapping from a distance to a distance code. dist is the distance - 1 and - * must not have side effects. _dist_code[256] and _dist_code[257] are never - * used. - */ - -#ifndef DEBUG -/* Inline versions of _tr_tally for speed: */ - -#if defined(GEN_TREES_H) || !defined(STDC) - extern uch ZLIB_INTERNAL _length_code[]; - extern uch ZLIB_INTERNAL _dist_code[]; -#else - extern const uch ZLIB_INTERNAL _length_code[]; - extern const uch ZLIB_INTERNAL _dist_code[]; -#endif - -# define _tr_tally_lit(s, c, flush) \ - { uch cc = (c); \ - s->d_buf[s->last_lit] = 0; \ - s->l_buf[s->last_lit++] = cc; \ - s->dyn_ltree[cc].Freq++; \ - flush = (s->last_lit == s->lit_bufsize-1); \ - } -# define _tr_tally_dist(s, distance, length, flush) \ - { uch len = (length); \ - ush dist = (distance); \ - s->d_buf[s->last_lit] = dist; \ - s->l_buf[s->last_lit++] = len; \ - dist--; \ - s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \ - s->dyn_dtree[d_code(dist)].Freq++; \ - flush = (s->last_lit == s->lit_bufsize-1); \ - } -#else -# define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c) -# define _tr_tally_dist(s, distance, length, flush) \ - flush = _tr_tally(s, distance, length) -#endif - -#endif /* DEFLATE_H */ diff --git a/libs/libwebsockets/win32port/zlib/gzclose.c b/libs/libwebsockets/win32port/zlib/gzclose.c deleted file mode 100755 index cbf0db663b..0000000000 --- a/libs/libwebsockets/win32port/zlib/gzclose.c +++ /dev/null @@ -1,25 +0,0 @@ -/* gzclose.c -- zlib gzclose() function - * Copyright (C) 2004, 2010 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -#include "gzguts.h" - -/* gzclose() is in a separate file so that it is linked in only if it is used. - That way the other gzclose functions can be used instead to avoid linking in - unneeded compression or decompression routines. */ -int ZEXPORT gzclose(file) - gzFile file; -{ -#ifndef NO_GZCOMPRESS - gz_statep state; - - if (file == NULL) - return Z_STREAM_ERROR; - state = (gz_statep)file; - - return state->mode == GZ_READ ? gzclose_r(file) : gzclose_w(file); -#else - return gzclose_r(file); -#endif -} diff --git a/libs/libwebsockets/win32port/zlib/gzguts.h b/libs/libwebsockets/win32port/zlib/gzguts.h deleted file mode 100755 index 7ff93a8dd8..0000000000 --- a/libs/libwebsockets/win32port/zlib/gzguts.h +++ /dev/null @@ -1,132 +0,0 @@ -/* gzguts.h -- zlib internal header definitions for gz* operations - * Copyright (C) 2004, 2005, 2010 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -#ifdef _LARGEFILE64_SOURCE -# ifndef _LARGEFILE_SOURCE -# define _LARGEFILE_SOURCE 1 -# endif -# ifdef _FILE_OFFSET_BITS -# undef _FILE_OFFSET_BITS -# endif -#endif - -#if ((__GNUC__-0) * 10 + __GNUC_MINOR__-0 >= 33) && !defined(NO_VIZ) -# define ZLIB_INTERNAL __attribute__((visibility ("hidden"))) -#else -# define ZLIB_INTERNAL -#endif - -#include -#include "zlib.h" -#ifdef STDC -# include -# include -# include -#endif -#include - -#ifdef NO_DEFLATE /* for compatibility with old definition */ -# define NO_GZCOMPRESS -#endif - -#ifdef _MSC_VER -# include -# define vsnprintf _vsnprintf -#endif - -#ifndef local -# define local static -#endif -/* compile with -Dlocal if your debugger can't find static symbols */ - -/* gz* functions always use library allocation functions */ -#ifndef STDC - extern voidp malloc OF((uInt size)); - extern void free OF((voidpf ptr)); -#endif - -/* get errno and strerror definition */ -#if defined UNDER_CE -# include -# define zstrerror() gz_strwinerror((DWORD)GetLastError()) -#else -# ifdef STDC -# include -# define zstrerror() strerror(errno) -# else -# define zstrerror() "stdio error (consult errno)" -# endif -#endif - -/* provide prototypes for these when building zlib without LFS */ -#if !defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0 - ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); - ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int)); - ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile)); - ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile)); -#endif - -/* default i/o buffer size -- double this for output when reading */ -#define GZBUFSIZE 8192 - -/* gzip modes, also provide a little integrity check on the passed structure */ -#define GZ_NONE 0 -#define GZ_READ 7247 -#define GZ_WRITE 31153 -#define GZ_APPEND 1 /* mode set to GZ_WRITE after the file is opened */ - -/* values for gz_state how */ -#define LOOK 0 /* look for a gzip header */ -#define COPY 1 /* copy input directly */ -#define GZIP 2 /* decompress a gzip stream */ - -/* internal gzip file state data structure */ -typedef struct { - /* used for both reading and writing */ - int mode; /* see gzip modes above */ - int fd; /* file descriptor */ - char *path; /* path or fd for error messages */ - z_off64_t pos; /* current position in uncompressed data */ - unsigned size; /* buffer size, zero if not allocated yet */ - unsigned want; /* requested buffer size, default is GZBUFSIZE */ - unsigned char *in; /* input buffer */ - unsigned char *out; /* output buffer (double-sized when reading) */ - unsigned char *next; /* next output data to deliver or write */ - /* just for reading */ - unsigned have; /* amount of output data unused at next */ - int eof; /* true if end of input file reached */ - z_off64_t start; /* where the gzip data started, for rewinding */ - z_off64_t raw; /* where the raw data started, for seeking */ - int how; /* 0: get header, 1: copy, 2: decompress */ - int direct; /* true if last read direct, false if gzip */ - /* just for writing */ - int level; /* compression level */ - int strategy; /* compression strategy */ - /* seek request */ - z_off64_t skip; /* amount to skip (already rewound if backwards) */ - int seek; /* true if seek request pending */ - /* error information */ - int err; /* error code */ - char *msg; /* error message */ - /* zlib inflate or deflate stream */ - z_stream strm; /* stream structure in-place (not a pointer) */ -} gz_state; -typedef gz_state FAR *gz_statep; - -/* shared functions */ -void ZLIB_INTERNAL gz_error OF((gz_statep, int, const char *)); -#if defined UNDER_CE -char ZLIB_INTERNAL *gz_strwinerror OF((DWORD error)); -#endif - -/* GT_OFF(x), where x is an unsigned value, is true if x > maximum z_off64_t - value -- needed when comparing unsigned to z_off64_t, which is signed - (possible z_off64_t types off_t, off64_t, and long are all signed) */ -#ifdef INT_MAX -# define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > INT_MAX) -#else -unsigned ZLIB_INTERNAL gz_intmax OF((void)); -# define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > gz_intmax()) -#endif diff --git a/libs/libwebsockets/win32port/zlib/gzio.c b/libs/libwebsockets/win32port/zlib/gzio.c deleted file mode 100644 index 26f2da1e97..0000000000 --- a/libs/libwebsockets/win32port/zlib/gzio.c +++ /dev/null @@ -1,1005 +0,0 @@ -/* gzio.c -- IO on .gz files - * Copyright (C) 1995-2003 Jean-loup Gailly. - * For conditions of distribution and use, see copyright notice in zlib.h - * - * Compile this file with -DNO_GZCOMPRESS to avoid the compression code. - */ - -/* @(#) $Id$ */ - -#include - -#include "zutil.h" - -#ifdef NO_DEFLATE /* for compatiblity with old definition */ -# define NO_GZCOMPRESS -#endif - -#ifndef NO_DUMMY_DECL -struct internal_state {int dummy;}; /* for buggy compilers */ -#endif - -#ifndef Z_BUFSIZE -# ifdef MAXSEG_64K -# define Z_BUFSIZE 4096 /* minimize memory usage for 16-bit DOS */ -# else -# define Z_BUFSIZE 16384 -# endif -#endif -#ifndef Z_PRINTF_BUFSIZE -# define Z_PRINTF_BUFSIZE 4096 -#endif - -#ifdef __MVS__ -# pragma map (fdopen , "\174\174FDOPEN") - FILE *fdopen(int, const char *); -#endif - -#ifndef STDC -extern voidp malloc OF((uInt size)); -extern void free OF((voidpf ptr)); -#endif - -#define ALLOC(size) malloc(size) -#define TRYFREE(p) {if (p) free(p);} - -static int const gz_magic[2] = {0x1f, 0x8b}; /* gzip magic header */ - -/* gzip flag byte */ -#define ASCII_FLAG 0x01 /* bit 0 set: file probably ascii text */ -#define HEAD_CRC 0x02 /* bit 1 set: header CRC present */ -#define EXTRA_FIELD 0x04 /* bit 2 set: extra field present */ -#define ORIG_NAME 0x08 /* bit 3 set: original file name present */ -#define COMMENT 0x10 /* bit 4 set: file comment present */ -#define RESERVED 0xE0 /* bits 5..7: reserved */ - -typedef struct gz_stream { - z_stream stream; - int z_err; /* error code for last stream operation */ - int z_eof; /* set if end of input file */ - FILE *file; /* .gz file */ - Byte *inbuf; /* input buffer */ - Byte *outbuf; /* output buffer */ - uLong crc; /* crc32 of uncompressed data */ - char *msg; /* error message */ - char *path; /* path name for debugging only */ - int transparent; /* 1 if input file is not a .gz file */ - char mode; /* 'w' or 'r' */ - z_off_t start; /* start of compressed data in file (header skipped) */ - z_off_t in; /* bytes into deflate or inflate */ - z_off_t out; /* bytes out of deflate or inflate */ - int back; /* one character push-back */ - int last; /* true if push-back is last character */ -} gz_stream; - - -local gzFile gz_open OF((const char *path, const char *mode, int fd)); -local int do_flush OF((gzFile file, int flush)); -local int get_byte OF((gz_stream *s)); -local void check_header OF((gz_stream *s)); -local int destroy OF((gz_stream *s)); -local void putLong OF((FILE *file, uLong x)); -local uLong getLong OF((gz_stream *s)); - -/* =========================================================================== - Opens a gzip (.gz) file for reading or writing. The mode parameter - is as in fopen ("rb" or "wb"). The file is given either by file descriptor - or path name (if fd == -1). - gz_open returns NULL if the file could not be opened or if there was - insufficient memory to allocate the (de)compression state; errno - can be checked to distinguish the two cases (if errno is zero, the - zlib error is Z_MEM_ERROR). -*/ -local gzFile gz_open (path, mode, fd) - const char *path; - const char *mode; - int fd; -{ - int err; - int level = Z_DEFAULT_COMPRESSION; /* compression level */ - int strategy = Z_DEFAULT_STRATEGY; /* compression strategy */ - char *p = (char*)mode; - gz_stream *s; - char fmode[80]; /* copy of mode, without the compression level */ - char *m = fmode; - - if (!path || !mode) return Z_NULL; - - s = (gz_stream *)ALLOC(sizeof(gz_stream)); - if (!s) return Z_NULL; - - s->stream.zalloc = (alloc_func)0; - s->stream.zfree = (free_func)0; - s->stream.opaque = (voidpf)0; - s->stream.next_in = s->inbuf = Z_NULL; - s->stream.next_out = s->outbuf = Z_NULL; - s->stream.avail_in = s->stream.avail_out = 0; - s->file = NULL; - s->z_err = Z_OK; - s->z_eof = 0; - s->in = 0; - s->out = 0; - s->back = EOF; - s->crc = crc32(0L, Z_NULL, 0); - s->msg = NULL; - s->transparent = 0; - - s->path = (char*)ALLOC(strlen(path)+1); - if (s->path == NULL) { - return destroy(s), (gzFile)Z_NULL; - } - strcpy(s->path, path); /* do this early for debugging */ - - s->mode = '\0'; - do { - if (*p == 'r') s->mode = 'r'; - if (*p == 'w' || *p == 'a') s->mode = 'w'; - if (*p >= '0' && *p <= '9') { - level = *p - '0'; - } else if (*p == 'f') { - strategy = Z_FILTERED; - } else if (*p == 'h') { - strategy = Z_HUFFMAN_ONLY; - } else if (*p == 'R') { - strategy = Z_RLE; - } else { - *m++ = *p; /* copy the mode */ - } - } while (*p++ && m != fmode + sizeof(fmode)); - if (s->mode == '\0') return destroy(s), (gzFile)Z_NULL; - - if (s->mode == 'w') { -#ifdef NO_GZCOMPRESS - err = Z_STREAM_ERROR; -#else - err = deflateInit2(&(s->stream), level, - Z_DEFLATED, -MAX_WBITS, DEF_MEM_LEVEL, strategy); - /* windowBits is passed < 0 to suppress zlib header */ - - s->stream.next_out = s->outbuf = (Byte*)ALLOC(Z_BUFSIZE); -#endif - if (err != Z_OK || s->outbuf == Z_NULL) { - return destroy(s), (gzFile)Z_NULL; - } - } else { - s->stream.next_in = s->inbuf = (Byte*)ALLOC(Z_BUFSIZE); - - err = inflateInit2(&(s->stream), -MAX_WBITS); - /* windowBits is passed < 0 to tell that there is no zlib header. - * Note that in this case inflate *requires* an extra "dummy" byte - * after the compressed stream in order to complete decompression and - * return Z_STREAM_END. Here the gzip CRC32 ensures that 4 bytes are - * present after the compressed stream. - */ - if (err != Z_OK || s->inbuf == Z_NULL) { - return destroy(s), (gzFile)Z_NULL; - } - } - s->stream.avail_out = Z_BUFSIZE; - - errno = 0; - s->file = fd < 0 ? F_OPEN(path, fmode) : (FILE*)fdopen(fd, fmode); - - if (s->file == NULL) { - return destroy(s), (gzFile)Z_NULL; - } - if (s->mode == 'w') { - /* Write a very simple .gz header: - */ - fprintf(s->file, "%c%c%c%c%c%c%c%c%c%c", gz_magic[0], gz_magic[1], - Z_DEFLATED, 0 /*flags*/, 0,0,0,0 /*time*/, 0 /*xflags*/, OS_CODE); - s->start = 10L; - /* We use 10L instead of ftell(s->file) to because ftell causes an - * fflush on some systems. This version of the library doesn't use - * start anyway in write mode, so this initialization is not - * necessary. - */ - } else { - check_header(s); /* skip the .gz header */ - s->start = ftell(s->file) - s->stream.avail_in; - } - - return (gzFile)s; -} - -/* =========================================================================== - Opens a gzip (.gz) file for reading or writing. -*/ -gzFile ZEXPORT gzopen (path, mode) - const char *path; - const char *mode; -{ - return gz_open (path, mode, -1); -} - -/* =========================================================================== - Associate a gzFile with the file descriptor fd. fd is not dup'ed here - to mimic the behavio(u)r of fdopen. -*/ -gzFile ZEXPORT gzdopen (fd, mode) - int fd; - const char *mode; -{ - char name[20]; - - if (fd < 0) return (gzFile)Z_NULL; - sprintf(name, "", fd); /* for debugging */ - - return gz_open (name, mode, fd); -} - -/* =========================================================================== - * Update the compression level and strategy - */ -int ZEXPORT gzsetparams (file, level, strategy) - gzFile file; - int level; - int strategy; -{ - gz_stream *s = (gz_stream*)file; - - if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR; - - /* Make room to allow flushing */ - if (s->stream.avail_out == 0) { - - s->stream.next_out = s->outbuf; - if (fwrite(s->outbuf, 1, Z_BUFSIZE, s->file) != Z_BUFSIZE) { - s->z_err = Z_ERRNO; - } - s->stream.avail_out = Z_BUFSIZE; - } - - return deflateParams (&(s->stream), level, strategy); -} - -/* =========================================================================== - Read a byte from a gz_stream; update next_in and avail_in. Return EOF - for end of file. - IN assertion: the stream s has been sucessfully opened for reading. -*/ -local int get_byte(s) - gz_stream *s; -{ - if (s->z_eof) return EOF; - if (s->stream.avail_in == 0) { - errno = 0; - s->stream.avail_in = fread(s->inbuf, 1, Z_BUFSIZE, s->file); - if (s->stream.avail_in == 0) { - s->z_eof = 1; - if (ferror(s->file)) s->z_err = Z_ERRNO; - return EOF; - } - s->stream.next_in = s->inbuf; - } - s->stream.avail_in--; - return *(s->stream.next_in)++; -} - -/* =========================================================================== - Check the gzip header of a gz_stream opened for reading. Set the stream - mode to transparent if the gzip magic header is not present; set s->err - to Z_DATA_ERROR if the magic header is present but the rest of the header - is incorrect. - IN assertion: the stream s has already been created sucessfully; - s->stream.avail_in is zero for the first time, but may be non-zero - for concatenated .gz files. -*/ -local void check_header(s) - gz_stream *s; -{ - int method; /* method byte */ - int flags; /* flags byte */ - uInt len; - int c; - - /* Assure two bytes in the buffer so we can peek ahead -- handle case - where first byte of header is at the end of the buffer after the last - gzip segment */ - len = s->stream.avail_in; - if (len < 2) { - if (len) s->inbuf[0] = s->stream.next_in[0]; - errno = 0; - len = fread(s->inbuf + len, 1, Z_BUFSIZE >> len, s->file); - if (len == 0 && ferror(s->file)) s->z_err = Z_ERRNO; - s->stream.avail_in += len; - s->stream.next_in = s->inbuf; - if (s->stream.avail_in < 2) { - s->transparent = s->stream.avail_in; - return; - } - } - - /* Peek ahead to check the gzip magic header */ - if (s->stream.next_in[0] != gz_magic[0] || - s->stream.next_in[1] != gz_magic[1]) { - s->transparent = 1; - return; - } - s->stream.avail_in -= 2; - s->stream.next_in += 2; - - /* Check the rest of the gzip header */ - method = get_byte(s); - flags = get_byte(s); - if (method != Z_DEFLATED || (flags & RESERVED) != 0) { - s->z_err = Z_DATA_ERROR; - return; - } - - /* Discard time, xflags and OS code: */ - for (len = 0; len < 6; len++) (void)get_byte(s); - - if ((flags & EXTRA_FIELD) != 0) { /* skip the extra field */ - len = (uInt)get_byte(s); - len += ((uInt)get_byte(s))<<8; - /* len is garbage if EOF but the loop below will quit anyway */ - while (len-- != 0 && get_byte(s) != EOF) ; - } - if ((flags & ORIG_NAME) != 0) { /* skip the original file name */ - while ((c = get_byte(s)) != 0 && c != EOF) ; - } - if ((flags & COMMENT) != 0) { /* skip the .gz file comment */ - while ((c = get_byte(s)) != 0 && c != EOF) ; - } - if ((flags & HEAD_CRC) != 0) { /* skip the header crc */ - for (len = 0; len < 2; len++) (void)get_byte(s); - } - s->z_err = s->z_eof ? Z_DATA_ERROR : Z_OK; -} - - /* =========================================================================== - * Cleanup then free the given gz_stream. Return a zlib error code. - Try freeing in the reverse order of allocations. - */ -local int destroy (s) - gz_stream *s; -{ - int err = Z_OK; - - if (!s) return Z_STREAM_ERROR; - - TRYFREE(s->msg); - - if (s->stream.state != NULL) { - if (s->mode == 'w') { -#ifdef NO_GZCOMPRESS - err = Z_STREAM_ERROR; -#else - err = deflateEnd(&(s->stream)); -#endif - } else if (s->mode == 'r') { - err = inflateEnd(&(s->stream)); - } - } - if (s->file != NULL && fclose(s->file)) { -#ifdef ESPIPE - if (errno != ESPIPE) /* fclose is broken for pipes in HP/UX */ -#endif - err = Z_ERRNO; - } - if (s->z_err < 0) err = s->z_err; - - TRYFREE(s->inbuf); - TRYFREE(s->outbuf); - TRYFREE(s->path); - TRYFREE(s); - return err; -} - -/* =========================================================================== - Reads the given number of uncompressed bytes from the compressed file. - gzread returns the number of bytes actually read (0 for end of file). -*/ -int ZEXPORT gzread (file, buf, len) - gzFile file; - voidp buf; - unsigned len; -{ - gz_stream *s = (gz_stream*)file; - Bytef *start = (Bytef*)buf; /* starting point for crc computation */ - Byte *next_out; /* == stream.next_out but not forced far (for MSDOS) */ - - if (s == NULL || s->mode != 'r') return Z_STREAM_ERROR; - - if (s->z_err == Z_DATA_ERROR || s->z_err == Z_ERRNO) return -1; - if (s->z_err == Z_STREAM_END) return 0; /* EOF */ - - next_out = (Byte*)buf; - s->stream.next_out = (Bytef*)buf; - s->stream.avail_out = len; - - if (s->stream.avail_out && s->back != EOF) { - *next_out++ = s->back; - s->stream.next_out++; - s->stream.avail_out--; - s->back = EOF; - s->out++; - if (s->last) { - s->z_err = Z_STREAM_END; - return 1; - } - } - - while (s->stream.avail_out != 0) { - - if (s->transparent) { - /* Copy first the lookahead bytes: */ - uInt n = s->stream.avail_in; - if (n > s->stream.avail_out) n = s->stream.avail_out; - if (n > 0) { - zmemcpy(s->stream.next_out, s->stream.next_in, n); - next_out += n; - s->stream.next_out = next_out; - s->stream.next_in += n; - s->stream.avail_out -= n; - s->stream.avail_in -= n; - } - if (s->stream.avail_out > 0) { - s->stream.avail_out -= fread(next_out, 1, s->stream.avail_out, - s->file); - } - len -= s->stream.avail_out; - s->in += len; - s->out += len; - if (len == 0) s->z_eof = 1; - return (int)len; - } - if (s->stream.avail_in == 0 && !s->z_eof) { - - errno = 0; - s->stream.avail_in = fread(s->inbuf, 1, Z_BUFSIZE, s->file); - if (s->stream.avail_in == 0) { - s->z_eof = 1; - if (ferror(s->file)) { - s->z_err = Z_ERRNO; - break; - } - } - s->stream.next_in = s->inbuf; - } - s->in += s->stream.avail_in; - s->out += s->stream.avail_out; - s->z_err = inflate(&(s->stream), Z_NO_FLUSH); - s->in -= s->stream.avail_in; - s->out -= s->stream.avail_out; - - if (s->z_err == Z_STREAM_END) { - /* Check CRC and original size */ - s->crc = crc32(s->crc, start, (uInt)(s->stream.next_out - start)); - start = s->stream.next_out; - - if (getLong(s) != s->crc) { - s->z_err = Z_DATA_ERROR; - } else { - (void)getLong(s); - /* The uncompressed length returned by above getlong() may be - * different from s->out in case of concatenated .gz files. - * Check for such files: - */ - check_header(s); - if (s->z_err == Z_OK) { - inflateReset(&(s->stream)); - s->crc = crc32(0L, Z_NULL, 0); - } - } - } - if (s->z_err != Z_OK || s->z_eof) break; - } - s->crc = crc32(s->crc, start, (uInt)(s->stream.next_out - start)); - - return (int)(len - s->stream.avail_out); -} - - -/* =========================================================================== - Reads one byte from the compressed file. gzgetc returns this byte - or -1 in case of end of file or error. -*/ -int ZEXPORT gzgetc(file) - gzFile file; -{ - unsigned char c; - - return gzread(file, &c, 1) == 1 ? c : -1; -} - - -/* =========================================================================== - Push one byte back onto the stream. -*/ -int ZEXPORT gzungetc(c, file) - int c; - gzFile file; -{ - gz_stream *s = (gz_stream*)file; - - if (s == NULL || s->mode != 'r' || c == EOF || s->back != EOF) return EOF; - s->back = c; - s->out--; - s->last = (s->z_err == Z_STREAM_END); - if (s->last) s->z_err = Z_OK; - s->z_eof = 0; - return c; -} - - -/* =========================================================================== - Reads bytes from the compressed file until len-1 characters are - read, or a newline character is read and transferred to buf, or an - end-of-file condition is encountered. The string is then terminated - with a null character. - gzgets returns buf, or Z_NULL in case of error. - - The current implementation is not optimized at all. -*/ -char * ZEXPORT gzgets(file, buf, len) - gzFile file; - char *buf; - int len; -{ - char *b = buf; - if (buf == Z_NULL || len <= 0) return Z_NULL; - - while (--len > 0 && gzread(file, buf, 1) == 1 && *buf++ != '\n') ; - *buf = '\0'; - return b == buf && len > 0 ? Z_NULL : b; -} - - -#ifndef NO_GZCOMPRESS -/* =========================================================================== - Writes the given number of uncompressed bytes into the compressed file. - gzwrite returns the number of bytes actually written (0 in case of error). -*/ -int ZEXPORT gzwrite (file, buf, len) - gzFile file; - voidpc buf; - unsigned len; -{ - gz_stream *s = (gz_stream*)file; - - if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR; - - s->stream.next_in = (Bytef*)buf; - s->stream.avail_in = len; - - while (s->stream.avail_in != 0) { - - if (s->stream.avail_out == 0) { - - s->stream.next_out = s->outbuf; - if (fwrite(s->outbuf, 1, Z_BUFSIZE, s->file) != Z_BUFSIZE) { - s->z_err = Z_ERRNO; - break; - } - s->stream.avail_out = Z_BUFSIZE; - } - s->in += s->stream.avail_in; - s->out += s->stream.avail_out; - s->z_err = deflate(&(s->stream), Z_NO_FLUSH); - s->in -= s->stream.avail_in; - s->out -= s->stream.avail_out; - if (s->z_err != Z_OK) break; - } - s->crc = crc32(s->crc, (const Bytef *)buf, len); - - return (int)(len - s->stream.avail_in); -} - - -/* =========================================================================== - Converts, formats, and writes the args to the compressed file under - control of the format string, as in fprintf. gzprintf returns the number of - uncompressed bytes actually written (0 in case of error). -*/ -#ifdef STDC -#include - -int ZEXPORTVA gzprintf (gzFile file, const char *format, /* args */ ...) -{ - char buf[Z_PRINTF_BUFSIZE]; - va_list va; - int len; - - buf[sizeof(buf) - 1] = 0; - va_start(va, format); -#ifdef NO_vsnprintf -# ifdef HAS_vsprintf_void - (void)vsprintf(buf, format, va); - va_end(va); - for (len = 0; len < sizeof(buf); len++) - if (buf[len] == 0) break; -# else - len = vsprintf(buf, format, va); - va_end(va); -# endif -#else -# ifdef HAS_vsnprintf_void - (void)vsnprintf(buf, sizeof(buf), format, va); - va_end(va); - len = strlen(buf); -# else - len = vsnprintf(buf, sizeof(buf), format, va); - va_end(va); -# endif -#endif - if (len <= 0 || len >= (int)sizeof(buf) || buf[sizeof(buf) - 1] != 0) - return 0; - return gzwrite(file, buf, (unsigned)len); -} -#else /* not ANSI C */ - -int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, - a11, a12, a13, a14, a15, a16, a17, a18, a19, a20) - gzFile file; - const char *format; - int a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, - a11, a12, a13, a14, a15, a16, a17, a18, a19, a20; -{ - char buf[Z_PRINTF_BUFSIZE]; - int len; - - buf[sizeof(buf) - 1] = 0; -#ifdef NO_snprintf -# ifdef HAS_sprintf_void - sprintf(buf, format, a1, a2, a3, a4, a5, a6, a7, a8, - a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); - for (len = 0; len < sizeof(buf); len++) - if (buf[len] == 0) break; -# else - len = sprintf(buf, format, a1, a2, a3, a4, a5, a6, a7, a8, - a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); -# endif -#else -# ifdef HAS_snprintf_void - snprintf(buf, sizeof(buf), format, a1, a2, a3, a4, a5, a6, a7, a8, - a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); - len = strlen(buf); -# else - len = snprintf(buf, sizeof(buf), format, a1, a2, a3, a4, a5, a6, a7, a8, - a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); -# endif -#endif - if (len <= 0 || len >= sizeof(buf) || buf[sizeof(buf) - 1] != 0) - return 0; - return gzwrite(file, buf, len); -} -#endif - -/* =========================================================================== - Writes c, converted to an unsigned char, into the compressed file. - gzputc returns the value that was written, or -1 in case of error. -*/ -int ZEXPORT gzputc(file, c) - gzFile file; - int c; -{ - unsigned char cc = (unsigned char) c; /* required for big endian systems */ - - return gzwrite(file, &cc, 1) == 1 ? (int)cc : -1; -} - - -/* =========================================================================== - Writes the given null-terminated string to the compressed file, excluding - the terminating null character. - gzputs returns the number of characters written, or -1 in case of error. -*/ -int ZEXPORT gzputs(file, s) - gzFile file; - const char *s; -{ - return gzwrite(file, (char*)s, (unsigned)strlen(s)); -} - - -/* =========================================================================== - Flushes all pending output into the compressed file. The parameter - flush is as in the deflate() function. -*/ -local int do_flush (file, flush) - gzFile file; - int flush; -{ - uInt len; - int done = 0; - gz_stream *s = (gz_stream*)file; - - if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR; - - s->stream.avail_in = 0; /* should be zero already anyway */ - - for (;;) { - len = Z_BUFSIZE - s->stream.avail_out; - - if (len != 0) { - if ((uInt)fwrite(s->outbuf, 1, len, s->file) != len) { - s->z_err = Z_ERRNO; - return Z_ERRNO; - } - s->stream.next_out = s->outbuf; - s->stream.avail_out = Z_BUFSIZE; - } - if (done) break; - s->out += s->stream.avail_out; - s->z_err = deflate(&(s->stream), flush); - s->out -= s->stream.avail_out; - - /* Ignore the second of two consecutive flushes: */ - if (len == 0 && s->z_err == Z_BUF_ERROR) s->z_err = Z_OK; - - /* deflate has finished flushing only when it hasn't used up - * all the available space in the output buffer: - */ - done = (s->stream.avail_out != 0 || s->z_err == Z_STREAM_END); - - if (s->z_err != Z_OK && s->z_err != Z_STREAM_END) break; - } - return s->z_err == Z_STREAM_END ? Z_OK : s->z_err; -} - -int ZEXPORT gzflush (file, flush) - gzFile file; - int flush; -{ - gz_stream *s = (gz_stream*)file; - int err = do_flush (file, flush); - - if (err) return err; - fflush(s->file); - return s->z_err == Z_STREAM_END ? Z_OK : s->z_err; -} -#endif /* NO_GZCOMPRESS */ - -/* =========================================================================== - Sets the starting position for the next gzread or gzwrite on the given - compressed file. The offset represents a number of bytes in the - gzseek returns the resulting offset location as measured in bytes from - the beginning of the uncompressed stream, or -1 in case of error. - SEEK_END is not implemented, returns error. - In this version of the library, gzseek can be extremely slow. -*/ -z_off_t ZEXPORT gzseek (file, offset, whence) - gzFile file; - z_off_t offset; - int whence; -{ - gz_stream *s = (gz_stream*)file; - - if (s == NULL || whence == SEEK_END || - s->z_err == Z_ERRNO || s->z_err == Z_DATA_ERROR) { - return -1L; - } - - if (s->mode == 'w') { -#ifdef NO_GZCOMPRESS - return -1L; -#else - if (whence == SEEK_SET) { - offset -= s->in; - } - if (offset < 0) return -1L; - - /* At this point, offset is the number of zero bytes to write. */ - if (s->inbuf == Z_NULL) { - s->inbuf = (Byte*)ALLOC(Z_BUFSIZE); /* for seeking */ - if (s->inbuf == Z_NULL) return -1L; - zmemzero(s->inbuf, Z_BUFSIZE); - } - while (offset > 0) { - uInt size = Z_BUFSIZE; - if (offset < Z_BUFSIZE) size = (uInt)offset; - - size = gzwrite(file, s->inbuf, size); - if (size == 0) return -1L; - - offset -= size; - } - return s->in; -#endif - } - /* Rest of function is for reading only */ - - /* compute absolute position */ - if (whence == SEEK_CUR) { - offset += s->out; - } - if (offset < 0) return -1L; - - if (s->transparent) { - /* map to fseek */ - s->back = EOF; - s->stream.avail_in = 0; - s->stream.next_in = s->inbuf; - if (fseek(s->file, offset, SEEK_SET) < 0) return -1L; - - s->in = s->out = offset; - return offset; - } - - /* For a negative seek, rewind and use positive seek */ - if (offset >= s->out) { - offset -= s->out; - } else if (gzrewind(file) < 0) { - return -1L; - } - /* offset is now the number of bytes to skip. */ - - if (offset != 0 && s->outbuf == Z_NULL) { - s->outbuf = (Byte*)ALLOC(Z_BUFSIZE); - if (s->outbuf == Z_NULL) return -1L; - } - if (offset && s->back != EOF) { - s->back = EOF; - s->out++; - offset--; - if (s->last) s->z_err = Z_STREAM_END; - } - while (offset > 0) { - int size = Z_BUFSIZE; - if (offset < Z_BUFSIZE) size = (int)offset; - - size = gzread(file, s->outbuf, (uInt)size); - if (size <= 0) return -1L; - offset -= size; - } - return s->out; -} - -/* =========================================================================== - Rewinds input file. -*/ -int ZEXPORT gzrewind (file) - gzFile file; -{ - gz_stream *s = (gz_stream*)file; - - if (s == NULL || s->mode != 'r') return -1; - - s->z_err = Z_OK; - s->z_eof = 0; - s->back = EOF; - s->stream.avail_in = 0; - s->stream.next_in = s->inbuf; - s->crc = crc32(0L, Z_NULL, 0); - if (!s->transparent) (void)inflateReset(&s->stream); - s->in = 0; - s->out = 0; - return fseek(s->file, s->start, SEEK_SET); -} - -/* =========================================================================== - Returns the starting position for the next gzread or gzwrite on the - given compressed file. This position represents a number of bytes in the - uncompressed data stream. -*/ -z_off_t ZEXPORT gztell (file) - gzFile file; -{ - return gzseek(file, 0L, SEEK_CUR); -} - -/* =========================================================================== - Returns 1 when EOF has previously been detected reading the given - input stream, otherwise zero. -*/ -int ZEXPORT gzeof (file) - gzFile file; -{ - gz_stream *s = (gz_stream*)file; - - /* With concatenated compressed files that can have embedded - * crc trailers, z_eof is no longer the only/best indicator of EOF - * on a gz_stream. Handle end-of-stream error explicitly here. - */ - if (s == NULL || s->mode != 'r') return 0; - if (s->z_eof) return 1; - return s->z_err == Z_STREAM_END; -} - -/* =========================================================================== - Outputs a long in LSB order to the given file -*/ -local void putLong (file, x) - FILE *file; - uLong x; -{ - int n; - for (n = 0; n < 4; n++) { - fputc((int)(x & 0xff), file); - x >>= 8; - } -} - -/* =========================================================================== - Reads a long in LSB order from the given gz_stream. Sets z_err in case - of error. -*/ -local uLong getLong (s) - gz_stream *s; -{ - uLong x = (uLong)get_byte(s); - int c; - - x += ((uLong)get_byte(s))<<8; - x += ((uLong)get_byte(s))<<16; - c = get_byte(s); - if (c == EOF) s->z_err = Z_DATA_ERROR; - x += ((uLong)c)<<24; - return x; -} - -/* =========================================================================== - Flushes all pending output if necessary, closes the compressed file - and deallocates all the (de)compression state. -*/ -int ZEXPORT gzclose (file) - gzFile file; -{ - int err; - gz_stream *s = (gz_stream*)file; - - if (s == NULL) return Z_STREAM_ERROR; - - if (s->mode == 'w') { -#ifdef NO_GZCOMPRESS - return Z_STREAM_ERROR; -#else - err = do_flush (file, Z_FINISH); - if (err != Z_OK) return destroy((gz_stream*)file); - - putLong (s->file, s->crc); - putLong (s->file, (uLong)(s->in & 0xffffffff)); -#endif - } - return destroy((gz_stream*)file); -} - -/* =========================================================================== - Returns the error message for the last error which occured on the - given compressed file. errnum is set to zlib error number. If an - error occured in the file system and not in the compression library, - errnum is set to Z_ERRNO and the application may consult errno - to get the exact error code. -*/ -const char * ZEXPORT gzerror (file, errnum) - gzFile file; - int *errnum; -{ - char *m; - gz_stream *s = (gz_stream*)file; - - if (s == NULL) { - *errnum = Z_STREAM_ERROR; - return (const char*)ERR_MSG(Z_STREAM_ERROR); - } - *errnum = s->z_err; - if (*errnum == Z_OK) return (const char*)""; - - m = (char*)(*errnum == Z_ERRNO ? zstrerror(errno) : s->stream.msg); - - if (m == NULL || *m == '\0') m = (char*)ERR_MSG(s->z_err); - - TRYFREE(s->msg); - s->msg = (char*)ALLOC(strlen(s->path) + strlen(m) + 3); - if (s->msg == Z_NULL) return (const char*)ERR_MSG(Z_MEM_ERROR); - strcpy(s->msg, s->path); - strcat(s->msg, ": "); - strcat(s->msg, m); - return (const char*)s->msg; -} - -/* =========================================================================== - Clear the error and end-of-file flags, and do the same for the real file. -*/ -void ZEXPORT gzclearerr (file) - gzFile file; -{ - gz_stream *s = (gz_stream*)file; - - if (s == NULL) return; - if (s->z_err != Z_STREAM_END) s->z_err = Z_OK; - s->z_eof = 0; - clearerr(s->file); -} diff --git a/libs/libwebsockets/win32port/zlib/gzlib.c b/libs/libwebsockets/win32port/zlib/gzlib.c deleted file mode 100755 index 65efced42a..0000000000 --- a/libs/libwebsockets/win32port/zlib/gzlib.c +++ /dev/null @@ -1,537 +0,0 @@ -/* gzlib.c -- zlib functions common to reading and writing gzip files - * Copyright (C) 2004, 2010 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -#include "gzguts.h" - -#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0 -# define LSEEK lseek64 -#else -# define LSEEK lseek -#endif - -/* Local functions */ -local void gz_reset OF((gz_statep)); -local gzFile gz_open OF((const char *, int, const char *)); - -#if defined UNDER_CE - -/* Map the Windows error number in ERROR to a locale-dependent error message - string and return a pointer to it. Typically, the values for ERROR come - from GetLastError. - - The string pointed to shall not be modified by the application, but may be - overwritten by a subsequent call to gz_strwinerror - - The gz_strwinerror function does not change the current setting of - GetLastError. */ -char ZLIB_INTERNAL *gz_strwinerror (error) - DWORD error; -{ - static char buf[1024]; - - wchar_t *msgbuf; - DWORD lasterr = GetLastError(); - DWORD chars = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM - | FORMAT_MESSAGE_ALLOCATE_BUFFER, - NULL, - error, - 0, /* Default language */ - (LPVOID)&msgbuf, - 0, - NULL); - if (chars != 0) { - /* If there is an \r\n appended, zap it. */ - if (chars >= 2 - && msgbuf[chars - 2] == '\r' && msgbuf[chars - 1] == '\n') { - chars -= 2; - msgbuf[chars] = 0; - } - - if (chars > sizeof (buf) - 1) { - chars = sizeof (buf) - 1; - msgbuf[chars] = 0; - } - - wcstombs(buf, msgbuf, chars + 1); - LocalFree(msgbuf); - } - else { - sprintf(buf, "unknown win32 error (%ld)", error); - } - - SetLastError(lasterr); - return buf; -} - -#endif /* UNDER_CE */ - -/* Reset gzip file state */ -local void gz_reset(state) - gz_statep state; -{ - if (state->mode == GZ_READ) { /* for reading ... */ - state->have = 0; /* no output data available */ - state->eof = 0; /* not at end of file */ - state->how = LOOK; /* look for gzip header */ - state->direct = 1; /* default for empty file */ - } - state->seek = 0; /* no seek request pending */ - gz_error(state, Z_OK, NULL); /* clear error */ - state->pos = 0; /* no uncompressed data yet */ - state->strm.avail_in = 0; /* no input data yet */ -} - -/* Open a gzip file either by name or file descriptor. */ -local gzFile gz_open(path, fd, mode) - const char *path; - int fd; - const char *mode; -{ - gz_statep state; - - /* allocate gzFile structure to return */ - state = malloc(sizeof(gz_state)); - if (state == NULL) - return NULL; - state->size = 0; /* no buffers allocated yet */ - state->want = GZBUFSIZE; /* requested buffer size */ - state->msg = NULL; /* no error message yet */ - - /* interpret mode */ - state->mode = GZ_NONE; - state->level = Z_DEFAULT_COMPRESSION; - state->strategy = Z_DEFAULT_STRATEGY; - while (*mode) { - if (*mode >= '0' && *mode <= '9') - state->level = *mode - '0'; - else - switch (*mode) { - case 'r': - state->mode = GZ_READ; - break; -#ifndef NO_GZCOMPRESS - case 'w': - state->mode = GZ_WRITE; - break; - case 'a': - state->mode = GZ_APPEND; - break; -#endif - case '+': /* can't read and write at the same time */ - free(state); - return NULL; - case 'b': /* ignore -- will request binary anyway */ - break; - case 'f': - state->strategy = Z_FILTERED; - break; - case 'h': - state->strategy = Z_HUFFMAN_ONLY; - break; - case 'R': - state->strategy = Z_RLE; - break; - case 'F': - state->strategy = Z_FIXED; - default: /* could consider as an error, but just ignore */ - ; - } - mode++; - } - - /* must provide an "r", "w", or "a" */ - if (state->mode == GZ_NONE) { - free(state); - return NULL; - } - - /* save the path name for error messages */ - state->path = malloc(strlen(path) + 1); - if (state->path == NULL) { - free(state); - return NULL; - } - strcpy(state->path, path); - - /* open the file with the appropriate mode (or just use fd) */ - state->fd = fd != -1 ? fd : - open(path, -#ifdef O_LARGEFILE - O_LARGEFILE | -#endif -#ifdef O_BINARY - O_BINARY | -#endif - (state->mode == GZ_READ ? - O_RDONLY : - (O_WRONLY | O_CREAT | ( - state->mode == GZ_WRITE ? - O_TRUNC : - O_APPEND))), - 0666); - if (state->fd == -1) { - free(state->path); - free(state); - return NULL; - } - if (state->mode == GZ_APPEND) - state->mode = GZ_WRITE; /* simplify later checks */ - - /* save the current position for rewinding (only if reading) */ - if (state->mode == GZ_READ) { - state->start = LSEEK(state->fd, 0, SEEK_CUR); - if (state->start == -1) state->start = 0; - } - - /* initialize stream */ - gz_reset(state); - - /* return stream */ - return (gzFile)state; -} - -/* -- see zlib.h -- */ -gzFile ZEXPORT gzopen(path, mode) - const char *path; - const char *mode; -{ - return gz_open(path, -1, mode); -} - -/* -- see zlib.h -- */ -gzFile ZEXPORT gzopen64(path, mode) - const char *path; - const char *mode; -{ - return gz_open(path, -1, mode); -} - -/* -- see zlib.h -- */ -gzFile ZEXPORT gzdopen(fd, mode) - int fd; - const char *mode; -{ - char *path; /* identifier for error messages */ - gzFile gz; - - if (fd == -1 || (path = malloc(7 + 3 * sizeof(int))) == NULL) - return NULL; - sprintf(path, "", fd); /* for debugging */ - gz = gz_open(path, fd, mode); - free(path); - return gz; -} - -/* -- see zlib.h -- */ -int ZEXPORT gzbuffer(file, size) - gzFile file; - unsigned size; -{ - gz_statep state; - - /* get internal structure and check integrity */ - if (file == NULL) - return -1; - state = (gz_statep)file; - if (state->mode != GZ_READ && state->mode != GZ_WRITE) - return -1; - - /* make sure we haven't already allocated memory */ - if (state->size != 0) - return -1; - - /* check and set requested size */ - if (size == 0) - return -1; - state->want = size; - return 0; -} - -/* -- see zlib.h -- */ -int ZEXPORT gzrewind(file) - gzFile file; -{ - gz_statep state; - - /* get internal structure */ - if (file == NULL) - return -1; - state = (gz_statep)file; - - /* check that we're reading and that there's no error */ - if (state->mode != GZ_READ || state->err != Z_OK) - return -1; - - /* back up and start over */ - if (LSEEK(state->fd, state->start, SEEK_SET) == -1) - return -1; - gz_reset(state); - return 0; -} - -/* -- see zlib.h -- */ -z_off64_t ZEXPORT gzseek64(file, offset, whence) - gzFile file; - z_off64_t offset; - int whence; -{ - unsigned n; - z_off64_t ret; - gz_statep state; - - /* get internal structure and check integrity */ - if (file == NULL) - return -1; - state = (gz_statep)file; - if (state->mode != GZ_READ && state->mode != GZ_WRITE) - return -1; - - /* check that there's no error */ - if (state->err != Z_OK) - return -1; - - /* can only seek from start or relative to current position */ - if (whence != SEEK_SET && whence != SEEK_CUR) - return -1; - - /* normalize offset to a SEEK_CUR specification */ - if (whence == SEEK_SET) - offset -= state->pos; - else if (state->seek) - offset += state->skip; - state->seek = 0; - - /* if within raw area while reading, just go there */ - if (state->mode == GZ_READ && state->how == COPY && - state->pos + offset >= state->raw) { - ret = LSEEK(state->fd, offset - state->have, SEEK_CUR); - if (ret == -1) - return -1; - state->have = 0; - state->eof = 0; - state->seek = 0; - gz_error(state, Z_OK, NULL); - state->strm.avail_in = 0; - state->pos += offset; - return state->pos; - } - - /* calculate skip amount, rewinding if needed for back seek when reading */ - if (offset < 0) { - if (state->mode != GZ_READ) /* writing -- can't go backwards */ - return -1; - offset += state->pos; - if (offset < 0) /* before start of file! */ - return -1; - if (gzrewind(file) == -1) /* rewind, then skip to offset */ - return -1; - } - - /* if reading, skip what's in output buffer (one less gzgetc() check) */ - if (state->mode == GZ_READ) { - n = GT_OFF(state->have) || (z_off64_t)state->have > offset ? - (unsigned)offset : state->have; - state->have -= n; - state->next += n; - state->pos += n; - offset -= n; - } - - /* request skip (if not zero) */ - if (offset) { - state->seek = 1; - state->skip = offset; - } - return state->pos + offset; -} - -/* -- see zlib.h -- */ -z_off_t ZEXPORT gzseek(file, offset, whence) - gzFile file; - z_off_t offset; - int whence; -{ - z_off64_t ret; - - ret = gzseek64(file, (z_off64_t)offset, whence); - return ret == (z_off_t)ret ? (z_off_t)ret : -1; -} - -/* -- see zlib.h -- */ -z_off64_t ZEXPORT gztell64(file) - gzFile file; -{ - gz_statep state; - - /* get internal structure and check integrity */ - if (file == NULL) - return -1; - state = (gz_statep)file; - if (state->mode != GZ_READ && state->mode != GZ_WRITE) - return -1; - - /* return position */ - return state->pos + (state->seek ? state->skip : 0); -} - -/* -- see zlib.h -- */ -z_off_t ZEXPORT gztell(file) - gzFile file; -{ - z_off64_t ret; - - ret = gztell64(file); - return ret == (z_off_t)ret ? (z_off_t)ret : -1; -} - -/* -- see zlib.h -- */ -z_off64_t ZEXPORT gzoffset64(file) - gzFile file; -{ - z_off64_t offset; - gz_statep state; - - /* get internal structure and check integrity */ - if (file == NULL) - return -1; - state = (gz_statep)file; - if (state->mode != GZ_READ && state->mode != GZ_WRITE) - return -1; - - /* compute and return effective offset in file */ - offset = LSEEK(state->fd, 0, SEEK_CUR); - if (offset == -1) - return -1; - if (state->mode == GZ_READ) /* reading */ - offset -= state->strm.avail_in; /* don't count buffered input */ - return offset; -} - -/* -- see zlib.h -- */ -z_off_t ZEXPORT gzoffset(file) - gzFile file; -{ - z_off64_t ret; - - ret = gzoffset64(file); - return ret == (z_off_t)ret ? (z_off_t)ret : -1; -} - -/* -- see zlib.h -- */ -int ZEXPORT gzeof(file) - gzFile file; -{ - gz_statep state; - - /* get internal structure and check integrity */ - if (file == NULL) - return 0; - state = (gz_statep)file; - if (state->mode != GZ_READ && state->mode != GZ_WRITE) - return 0; - - /* return end-of-file state */ - return state->mode == GZ_READ ? - (state->eof && state->strm.avail_in == 0 && state->have == 0) : 0; -} - -/* -- see zlib.h -- */ -const char * ZEXPORT gzerror(file, errnum) - gzFile file; - int *errnum; -{ - gz_statep state; - - /* get internal structure and check integrity */ - if (file == NULL) - return NULL; - state = (gz_statep)file; - if (state->mode != GZ_READ && state->mode != GZ_WRITE) - return NULL; - - /* return error information */ - if (errnum != NULL) - *errnum = state->err; - return state->msg == NULL ? "" : state->msg; -} - -/* -- see zlib.h -- */ -void ZEXPORT gzclearerr(file) - gzFile file; -{ - gz_statep state; - - /* get internal structure and check integrity */ - if (file == NULL) - return; - state = (gz_statep)file; - if (state->mode != GZ_READ && state->mode != GZ_WRITE) - return; - - /* clear error and end-of-file */ - if (state->mode == GZ_READ) - state->eof = 0; - gz_error(state, Z_OK, NULL); -} - -/* Create an error message in allocated memory and set state->err and - state->msg accordingly. Free any previous error message already there. Do - not try to free or allocate space if the error is Z_MEM_ERROR (out of - memory). Simply save the error message as a static string. If there is an - allocation failure constructing the error message, then convert the error to - out of memory. */ -void ZLIB_INTERNAL gz_error(state, err, msg) - gz_statep state; - int err; - const char *msg; -{ - /* free previously allocated message and clear */ - if (state->msg != NULL) { - if (state->err != Z_MEM_ERROR) - free(state->msg); - state->msg = NULL; - } - - /* set error code, and if no message, then done */ - state->err = err; - if (msg == NULL) - return; - - /* for an out of memory error, save as static string */ - if (err == Z_MEM_ERROR) { - state->msg = (char *)msg; - return; - } - - /* construct error message with path */ - if ((state->msg = malloc(strlen(state->path) + strlen(msg) + 3)) == NULL) { - state->err = Z_MEM_ERROR; - state->msg = (char *)"out of memory"; - return; - } - strcpy(state->msg, state->path); - strcat(state->msg, ": "); - strcat(state->msg, msg); - return; -} - -#ifndef INT_MAX -/* portably return maximum value for an int (when limits.h presumed not - available) -- we need to do this to cover cases where 2's complement not - used, since C standard permits 1's complement and sign-bit representations, - otherwise we could just use ((unsigned)-1) >> 1 */ -unsigned ZLIB_INTERNAL gz_intmax() -{ - unsigned p, q; - - p = 1; - do { - q = p; - p <<= 1; - p++; - } while (p > q); - return q >> 1; -} -#endif diff --git a/libs/libwebsockets/win32port/zlib/gzread.c b/libs/libwebsockets/win32port/zlib/gzread.c deleted file mode 100755 index 0f8649b32f..0000000000 --- a/libs/libwebsockets/win32port/zlib/gzread.c +++ /dev/null @@ -1,653 +0,0 @@ -/* gzread.c -- zlib functions for reading gzip files - * Copyright (C) 2004, 2005, 2010 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -#include "gzguts.h" - -/* Local functions */ -local int gz_load OF((gz_statep, unsigned char *, unsigned, unsigned *)); -local int gz_avail OF((gz_statep)); -local int gz_next4 OF((gz_statep, unsigned long *)); -local int gz_head OF((gz_statep)); -local int gz_decomp OF((gz_statep)); -local int gz_make OF((gz_statep)); -local int gz_skip OF((gz_statep, z_off64_t)); - -/* Use read() to load a buffer -- return -1 on error, otherwise 0. Read from - state->fd, and update state->eof, state->err, and state->msg as appropriate. - This function needs to loop on read(), since read() is not guaranteed to - read the number of bytes requested, depending on the type of descriptor. */ -local int gz_load(state, buf, len, have) - gz_statep state; - unsigned char *buf; - unsigned len; - unsigned *have; -{ - int ret; - - *have = 0; - do { - ret = read(state->fd, buf + *have, len - *have); - if (ret <= 0) - break; - *have += ret; - } while (*have < len); - if (ret < 0) { - gz_error(state, Z_ERRNO, zstrerror()); - return -1; - } - if (ret == 0) - state->eof = 1; - return 0; -} - -/* Load up input buffer and set eof flag if last data loaded -- return -1 on - error, 0 otherwise. Note that the eof flag is set when the end of the input - file is reached, even though there may be unused data in the buffer. Once - that data has been used, no more attempts will be made to read the file. - gz_avail() assumes that strm->avail_in == 0. */ -local int gz_avail(state) - gz_statep state; -{ - z_streamp strm = &(state->strm); - - if (state->err != Z_OK) - return -1; - if (state->eof == 0) { - if (gz_load(state, state->in, state->size, - (unsigned *)&(strm->avail_in)) == -1) - return -1; - strm->next_in = state->in; - } - return 0; -} - -/* Get next byte from input, or -1 if end or error. */ -#define NEXT() ((strm->avail_in == 0 && gz_avail(state) == -1) ? -1 : \ - (strm->avail_in == 0 ? -1 : \ - (strm->avail_in--, *(strm->next_in)++))) - -/* Get a four-byte little-endian integer and return 0 on success and the value - in *ret. Otherwise -1 is returned and *ret is not modified. */ -local int gz_next4(state, ret) - gz_statep state; - unsigned long *ret; -{ - int ch; - unsigned long val; - z_streamp strm = &(state->strm); - - val = NEXT(); - val += (unsigned)NEXT() << 8; - val += (unsigned long)NEXT() << 16; - ch = NEXT(); - if (ch == -1) - return -1; - val += (unsigned long)ch << 24; - *ret = val; - return 0; -} - -/* Look for gzip header, set up for inflate or copy. state->have must be zero. - If this is the first time in, allocate required memory. state->how will be - left unchanged if there is no more input data available, will be set to COPY - if there is no gzip header and direct copying will be performed, or it will - be set to GZIP for decompression, and the gzip header will be skipped so - that the next available input data is the raw deflate stream. If direct - copying, then leftover input data from the input buffer will be copied to - the output buffer. In that case, all further file reads will be directly to - either the output buffer or a user buffer. If decompressing, the inflate - state and the check value will be initialized. gz_head() will return 0 on - success or -1 on failure. Failures may include read errors or gzip header - errors. */ -local int gz_head(state) - gz_statep state; -{ - z_streamp strm = &(state->strm); - int flags; - unsigned len; - - /* allocate read buffers and inflate memory */ - if (state->size == 0) { - /* allocate buffers */ - state->in = malloc(state->want); - state->out = malloc(state->want << 1); - if (state->in == NULL || state->out == NULL) { - if (state->out != NULL) - free(state->out); - if (state->in != NULL) - free(state->in); - gz_error(state, Z_MEM_ERROR, "out of memory"); - return -1; - } - state->size = state->want; - - /* allocate inflate memory */ - state->strm.zalloc = Z_NULL; - state->strm.zfree = Z_NULL; - state->strm.opaque = Z_NULL; - state->strm.avail_in = 0; - state->strm.next_in = Z_NULL; - if (inflateInit2(&(state->strm), -15) != Z_OK) { /* raw inflate */ - free(state->out); - free(state->in); - state->size = 0; - gz_error(state, Z_MEM_ERROR, "out of memory"); - return -1; - } - } - - /* get some data in the input buffer */ - if (strm->avail_in == 0) { - if (gz_avail(state) == -1) - return -1; - if (strm->avail_in == 0) - return 0; - } - - /* look for the gzip magic header bytes 31 and 139 */ - if (strm->next_in[0] == 31) { - strm->avail_in--; - strm->next_in++; - if (strm->avail_in == 0 && gz_avail(state) == -1) - return -1; - if (strm->avail_in && strm->next_in[0] == 139) { - /* we have a gzip header, woo hoo! */ - strm->avail_in--; - strm->next_in++; - - /* skip rest of header */ - if (NEXT() != 8) { /* compression method */ - gz_error(state, Z_DATA_ERROR, "unknown compression method"); - return -1; - } - flags = NEXT(); - if (flags & 0xe0) { /* reserved flag bits */ - gz_error(state, Z_DATA_ERROR, "unknown header flags set"); - return -1; - } - NEXT(); /* modification time */ - NEXT(); - NEXT(); - NEXT(); - NEXT(); /* extra flags */ - NEXT(); /* operating system */ - if (flags & 4) { /* extra field */ - len = (unsigned)NEXT(); - len += (unsigned)NEXT() << 8; - while (len--) - if (NEXT() < 0) - break; - } - if (flags & 8) /* file name */ - while (NEXT() > 0) - ; - if (flags & 16) /* comment */ - while (NEXT() > 0) - ; - if (flags & 2) { /* header crc */ - NEXT(); - NEXT(); - } - /* an unexpected end of file is not checked for here -- it will be - noticed on the first request for uncompressed data */ - - /* set up for decompression */ - inflateReset(strm); - strm->adler = crc32(0L, Z_NULL, 0); - state->how = GZIP; - state->direct = 0; - return 0; - } - else { - /* not a gzip file -- save first byte (31) and fall to raw i/o */ - state->out[0] = 31; - state->have = 1; - } - } - - /* doing raw i/o, save start of raw data for seeking, copy any leftover - input to output -- this assumes that the output buffer is larger than - the input buffer, which also assures space for gzungetc() */ - state->raw = state->pos; - state->next = state->out; - if (strm->avail_in) { - memcpy(state->next + state->have, strm->next_in, strm->avail_in); - state->have += strm->avail_in; - strm->avail_in = 0; - } - state->how = COPY; - state->direct = 1; - return 0; -} - -/* Decompress from input to the provided next_out and avail_out in the state. - If the end of the compressed data is reached, then verify the gzip trailer - check value and length (modulo 2^32). state->have and state->next are set - to point to the just decompressed data, and the crc is updated. If the - trailer is verified, state->how is reset to LOOK to look for the next gzip - stream or raw data, once state->have is depleted. Returns 0 on success, -1 - on failure. Failures may include invalid compressed data or a failed gzip - trailer verification. */ -local int gz_decomp(state) - gz_statep state; -{ - int ret; - unsigned had; - unsigned long crc, len; - z_streamp strm = &(state->strm); - - /* fill output buffer up to end of deflate stream */ - had = strm->avail_out; - do { - /* get more input for inflate() */ - if (strm->avail_in == 0 && gz_avail(state) == -1) - return -1; - if (strm->avail_in == 0) { - gz_error(state, Z_DATA_ERROR, "unexpected end of file"); - return -1; - } - - /* decompress and handle errors */ - ret = inflate(strm, Z_NO_FLUSH); - if (ret == Z_STREAM_ERROR || ret == Z_NEED_DICT) { - gz_error(state, Z_STREAM_ERROR, - "internal error: inflate stream corrupt"); - return -1; - } - if (ret == Z_MEM_ERROR) { - gz_error(state, Z_MEM_ERROR, "out of memory"); - return -1; - } - if (ret == Z_DATA_ERROR) { /* deflate stream invalid */ - gz_error(state, Z_DATA_ERROR, - strm->msg == NULL ? "compressed data error" : strm->msg); - return -1; - } - } while (strm->avail_out && ret != Z_STREAM_END); - - /* update available output and crc check value */ - state->have = had - strm->avail_out; - state->next = strm->next_out - state->have; - strm->adler = crc32(strm->adler, state->next, state->have); - - /* check gzip trailer if at end of deflate stream */ - if (ret == Z_STREAM_END) { - if (gz_next4(state, &crc) == -1 || gz_next4(state, &len) == -1) { - gz_error(state, Z_DATA_ERROR, "unexpected end of file"); - return -1; - } - if (crc != strm->adler) { - gz_error(state, Z_DATA_ERROR, "incorrect data check"); - return -1; - } - if (len != (strm->total_out & 0xffffffffL)) { - gz_error(state, Z_DATA_ERROR, "incorrect length check"); - return -1; - } - state->how = LOOK; /* ready for next stream, once have is 0 (leave - state->direct unchanged to remember how) */ - } - - /* good decompression */ - return 0; -} - -/* Make data and put in the output buffer. Assumes that state->have == 0. - Data is either copied from the input file or decompressed from the input - file depending on state->how. If state->how is LOOK, then a gzip header is - looked for (and skipped if found) to determine wither to copy or decompress. - Returns -1 on error, otherwise 0. gz_make() will leave state->have as COPY - or GZIP unless the end of the input file has been reached and all data has - been processed. */ -local int gz_make(state) - gz_statep state; -{ - z_streamp strm = &(state->strm); - - if (state->how == LOOK) { /* look for gzip header */ - if (gz_head(state) == -1) - return -1; - if (state->have) /* got some data from gz_head() */ - return 0; - } - if (state->how == COPY) { /* straight copy */ - if (gz_load(state, state->out, state->size << 1, &(state->have)) == -1) - return -1; - state->next = state->out; - } - else if (state->how == GZIP) { /* decompress */ - strm->avail_out = state->size << 1; - strm->next_out = state->out; - if (gz_decomp(state) == -1) - return -1; - } - return 0; -} - -/* Skip len uncompressed bytes of output. Return -1 on error, 0 on success. */ -local int gz_skip(state, len) - gz_statep state; - z_off64_t len; -{ - unsigned n; - - /* skip over len bytes or reach end-of-file, whichever comes first */ - while (len) - /* skip over whatever is in output buffer */ - if (state->have) { - n = GT_OFF(state->have) || (z_off64_t)state->have > len ? - (unsigned)len : state->have; - state->have -= n; - state->next += n; - state->pos += n; - len -= n; - } - - /* output buffer empty -- return if we're at the end of the input */ - else if (state->eof && state->strm.avail_in == 0) - break; - - /* need more data to skip -- load up output buffer */ - else { - /* get more output, looking for header if required */ - if (gz_make(state) == -1) - return -1; - } - return 0; -} - -/* -- see zlib.h -- */ -int ZEXPORT gzread(file, buf, len) - gzFile file; - voidp buf; - unsigned len; -{ - unsigned got, n; - gz_statep state; - z_streamp strm; - - /* get internal structure */ - if (file == NULL) - return -1; - state = (gz_statep)file; - strm = &(state->strm); - - /* check that we're reading and that there's no error */ - if (state->mode != GZ_READ || state->err != Z_OK) - return -1; - - /* since an int is returned, make sure len fits in one, otherwise return - with an error (this avoids the flaw in the interface) */ - if ((int)len < 0) { - gz_error(state, Z_BUF_ERROR, "requested length does not fit in int"); - return -1; - } - - /* if len is zero, avoid unnecessary operations */ - if (len == 0) - return 0; - - /* process a skip request */ - if (state->seek) { - state->seek = 0; - if (gz_skip(state, state->skip) == -1) - return -1; - } - - /* get len bytes to buf, or less than len if at the end */ - got = 0; - do { - /* first just try copying data from the output buffer */ - if (state->have) { - n = state->have > len ? len : state->have; - memcpy(buf, state->next, n); - state->next += n; - state->have -= n; - } - - /* output buffer empty -- return if we're at the end of the input */ - else if (state->eof && strm->avail_in == 0) - break; - - /* need output data -- for small len or new stream load up our output - buffer */ - else if (state->how == LOOK || len < (state->size << 1)) { - /* get more output, looking for header if required */ - if (gz_make(state) == -1) - return -1; - continue; /* no progress yet -- go back to memcpy() above */ - /* the copy above assures that we will leave with space in the - output buffer, allowing at least one gzungetc() to succeed */ - } - - /* large len -- read directly into user buffer */ - else if (state->how == COPY) { /* read directly */ - if (gz_load(state, buf, len, &n) == -1) - return -1; - } - - /* large len -- decompress directly into user buffer */ - else { /* state->how == GZIP */ - strm->avail_out = len; - strm->next_out = buf; - if (gz_decomp(state) == -1) - return -1; - n = state->have; - state->have = 0; - } - - /* update progress */ - len -= n; - buf = (char *)buf + n; - got += n; - state->pos += n; - } while (len); - - /* return number of bytes read into user buffer (will fit in int) */ - return (int)got; -} - -/* -- see zlib.h -- */ -int ZEXPORT gzgetc(file) - gzFile file; -{ - int ret; - unsigned char buf[1]; - gz_statep state; - - /* get internal structure */ - if (file == NULL) - return -1; - state = (gz_statep)file; - - /* check that we're reading and that there's no error */ - if (state->mode != GZ_READ || state->err != Z_OK) - return -1; - - /* try output buffer (no need to check for skip request) */ - if (state->have) { - state->have--; - state->pos++; - return *(state->next)++; - } - - /* nothing there -- try gzread() */ - ret = gzread(file, buf, 1); - return ret < 1 ? -1 : buf[0]; -} - -/* -- see zlib.h -- */ -int ZEXPORT gzungetc(c, file) - int c; - gzFile file; -{ - gz_statep state; - - /* get internal structure */ - if (file == NULL) - return -1; - state = (gz_statep)file; - - /* check that we're reading and that there's no error */ - if (state->mode != GZ_READ || state->err != Z_OK) - return -1; - - /* process a skip request */ - if (state->seek) { - state->seek = 0; - if (gz_skip(state, state->skip) == -1) - return -1; - } - - /* can't push EOF */ - if (c < 0) - return -1; - - /* if output buffer empty, put byte at end (allows more pushing) */ - if (state->have == 0) { - state->have = 1; - state->next = state->out + (state->size << 1) - 1; - state->next[0] = c; - state->pos--; - return c; - } - - /* if no room, give up (must have already done a gzungetc()) */ - if (state->have == (state->size << 1)) { - gz_error(state, Z_BUF_ERROR, "out of room to push characters"); - return -1; - } - - /* slide output data if needed and insert byte before existing data */ - if (state->next == state->out) { - unsigned char *src = state->out + state->have; - unsigned char *dest = state->out + (state->size << 1); - while (src > state->out) - *--dest = *--src; - state->next = dest; - } - state->have++; - state->next--; - state->next[0] = c; - state->pos--; - return c; -} - -/* -- see zlib.h -- */ -char * ZEXPORT gzgets(file, buf, len) - gzFile file; - char *buf; - int len; -{ - unsigned left, n; - char *str; - unsigned char *eol; - gz_statep state; - - /* check parameters and get internal structure */ - if (file == NULL || buf == NULL || len < 1) - return NULL; - state = (gz_statep)file; - - /* check that we're reading and that there's no error */ - if (state->mode != GZ_READ || state->err != Z_OK) - return NULL; - - /* process a skip request */ - if (state->seek) { - state->seek = 0; - if (gz_skip(state, state->skip) == -1) - return NULL; - } - - /* copy output bytes up to new line or len - 1, whichever comes first -- - append a terminating zero to the string (we don't check for a zero in - the contents, let the user worry about that) */ - str = buf; - left = (unsigned)len - 1; - if (left) do { - /* assure that something is in the output buffer */ - if (state->have == 0) { - if (gz_make(state) == -1) - return NULL; /* error */ - if (state->have == 0) { /* end of file */ - if (buf == str) /* got bupkus */ - return NULL; - break; /* got something -- return it */ - } - } - - /* look for end-of-line in current output buffer */ - n = state->have > left ? left : state->have; - eol = memchr(state->next, '\n', n); - if (eol != NULL) - n = (unsigned)(eol - state->next) + 1; - - /* copy through end-of-line, or remainder if not found */ - memcpy(buf, state->next, n); - state->have -= n; - state->next += n; - state->pos += n; - left -= n; - buf += n; - } while (left && eol == NULL); - - /* found end-of-line or out of space -- terminate string and return it */ - buf[0] = 0; - return str; -} - -/* -- see zlib.h -- */ -int ZEXPORT gzdirect(file) - gzFile file; -{ - gz_statep state; - - /* get internal structure */ - if (file == NULL) - return 0; - state = (gz_statep)file; - - /* check that we're reading */ - if (state->mode != GZ_READ) - return 0; - - /* if the state is not known, but we can find out, then do so (this is - mainly for right after a gzopen() or gzdopen()) */ - if (state->how == LOOK && state->have == 0) - (void)gz_head(state); - - /* return 1 if reading direct, 0 if decompressing a gzip stream */ - return state->direct; -} - -/* -- see zlib.h -- */ -int ZEXPORT gzclose_r(file) - gzFile file; -{ - int ret; - gz_statep state; - - /* get internal structure */ - if (file == NULL) - return Z_STREAM_ERROR; - state = (gz_statep)file; - - /* check that we're reading */ - if (state->mode != GZ_READ) - return Z_STREAM_ERROR; - - /* free memory and close file */ - if (state->size) { - inflateEnd(&(state->strm)); - free(state->out); - free(state->in); - } - gz_error(state, Z_OK, NULL); - free(state->path); - ret = close(state->fd); - free(state); - return ret ? Z_ERRNO : Z_OK; -} diff --git a/libs/libwebsockets/win32port/zlib/gzwrite.c b/libs/libwebsockets/win32port/zlib/gzwrite.c deleted file mode 100755 index e2bcf9d2b8..0000000000 --- a/libs/libwebsockets/win32port/zlib/gzwrite.c +++ /dev/null @@ -1,531 +0,0 @@ -/* gzwrite.c -- zlib functions for writing gzip files - * Copyright (C) 2004, 2005, 2010 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -#include "gzguts.h" - -/* Local functions */ -local int gz_init OF((gz_statep)); -local int gz_comp OF((gz_statep, int)); -local int gz_zero OF((gz_statep, z_off64_t)); - -/* Initialize state for writing a gzip file. Mark initialization by setting - state->size to non-zero. Return -1 on failure or 0 on success. */ -local int gz_init(state) - gz_statep state; -{ - int ret; - z_streamp strm = &(state->strm); - - /* allocate input and output buffers */ - state->in = malloc(state->want); - state->out = malloc(state->want); - if (state->in == NULL || state->out == NULL) { - if (state->out != NULL) - free(state->out); - if (state->in != NULL) - free(state->in); - gz_error(state, Z_MEM_ERROR, "out of memory"); - return -1; - } - - /* allocate deflate memory, set up for gzip compression */ - strm->zalloc = Z_NULL; - strm->zfree = Z_NULL; - strm->opaque = Z_NULL; - ret = deflateInit2(strm, state->level, Z_DEFLATED, - 15 + 16, 8, state->strategy); - if (ret != Z_OK) { - free(state->in); - gz_error(state, Z_MEM_ERROR, "out of memory"); - return -1; - } - - /* mark state as initialized */ - state->size = state->want; - - /* initialize write buffer */ - strm->avail_out = state->size; - strm->next_out = state->out; - state->next = strm->next_out; - return 0; -} - -/* Compress whatever is at avail_in and next_in and write to the output file. - Return -1 if there is an error writing to the output file, otherwise 0. - flush is assumed to be a valid deflate() flush value. If flush is Z_FINISH, - then the deflate() state is reset to start a new gzip stream. */ -local int gz_comp(state, flush) - gz_statep state; - int flush; -{ - int ret, got; - unsigned have; - z_streamp strm = &(state->strm); - - /* allocate memory if this is the first time through */ - if (state->size == 0 && gz_init(state) == -1) - return -1; - - /* run deflate() on provided input until it produces no more output */ - ret = Z_OK; - do { - /* write out current buffer contents if full, or if flushing, but if - doing Z_FINISH then don't write until we get to Z_STREAM_END */ - if (strm->avail_out == 0 || (flush != Z_NO_FLUSH && - (flush != Z_FINISH || ret == Z_STREAM_END))) { - have = (unsigned)(strm->next_out - state->next); - if (have && ((got = write(state->fd, state->next, have)) < 0 || - (unsigned)got != have)) { - gz_error(state, Z_ERRNO, zstrerror()); - return -1; - } - if (strm->avail_out == 0) { - strm->avail_out = state->size; - strm->next_out = state->out; - } - state->next = strm->next_out; - } - - /* compress */ - have = strm->avail_out; - ret = deflate(strm, flush); - if (ret == Z_STREAM_ERROR) { - gz_error(state, Z_STREAM_ERROR, - "internal error: deflate stream corrupt"); - return -1; - } - have -= strm->avail_out; - } while (have); - - /* if that completed a deflate stream, allow another to start */ - if (flush == Z_FINISH) - deflateReset(strm); - - /* all done, no errors */ - return 0; -} - -/* Compress len zeros to output. Return -1 on error, 0 on success. */ -local int gz_zero(state, len) - gz_statep state; - z_off64_t len; -{ - int first; - unsigned n; - z_streamp strm = &(state->strm); - - /* consume whatever's left in the input buffer */ - if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1) - return -1; - - /* compress len zeros (len guaranteed > 0) */ - first = 1; - while (len) { - n = GT_OFF(state->size) || (z_off64_t)state->size > len ? - (unsigned)len : state->size; - if (first) { - memset(state->in, 0, n); - first = 0; - } - strm->avail_in = n; - strm->next_in = state->in; - state->pos += n; - if (gz_comp(state, Z_NO_FLUSH) == -1) - return -1; - len -= n; - } - return 0; -} - -/* -- see zlib.h -- */ -int ZEXPORT gzwrite(file, buf, len) - gzFile file; - voidpc buf; - unsigned len; -{ - unsigned put = len; - unsigned n; - gz_statep state; - z_streamp strm; - - /* get internal structure */ - if (file == NULL) - return 0; - state = (gz_statep)file; - strm = &(state->strm); - - /* check that we're writing and that there's no error */ - if (state->mode != GZ_WRITE || state->err != Z_OK) - return 0; - - /* since an int is returned, make sure len fits in one, otherwise return - with an error (this avoids the flaw in the interface) */ - if ((int)len < 0) { - gz_error(state, Z_BUF_ERROR, "requested length does not fit in int"); - return 0; - } - - /* if len is zero, avoid unnecessary operations */ - if (len == 0) - return 0; - - /* allocate memory if this is the first time through */ - if (state->size == 0 && gz_init(state) == -1) - return 0; - - /* check for seek request */ - if (state->seek) { - state->seek = 0; - if (gz_zero(state, state->skip) == -1) - return 0; - } - - /* for small len, copy to input buffer, otherwise compress directly */ - if (len < state->size) { - /* copy to input buffer, compress when full */ - do { - if (strm->avail_in == 0) - strm->next_in = state->in; - n = state->size - strm->avail_in; - if (n > len) - n = len; - memcpy(strm->next_in + strm->avail_in, buf, n); - strm->avail_in += n; - state->pos += n; - buf = (char *)buf + n; - len -= n; - if (len && gz_comp(state, Z_NO_FLUSH) == -1) - return 0; - } while (len); - } - else { - /* consume whatever's left in the input buffer */ - if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1) - return 0; - - /* directly compress user buffer to file */ - strm->avail_in = len; - strm->next_in = (voidp)buf; - state->pos += len; - if (gz_comp(state, Z_NO_FLUSH) == -1) - return 0; - } - - /* input was all buffered or compressed (put will fit in int) */ - return (int)put; -} - -/* -- see zlib.h -- */ -int ZEXPORT gzputc(file, c) - gzFile file; - int c; -{ - unsigned char buf[1]; - gz_statep state; - z_streamp strm; - - /* get internal structure */ - if (file == NULL) - return -1; - state = (gz_statep)file; - strm = &(state->strm); - - /* check that we're writing and that there's no error */ - if (state->mode != GZ_WRITE || state->err != Z_OK) - return -1; - - /* check for seek request */ - if (state->seek) { - state->seek = 0; - if (gz_zero(state, state->skip) == -1) - return -1; - } - - /* try writing to input buffer for speed (state->size == 0 if buffer not - initialized) */ - if (strm->avail_in < state->size) { - if (strm->avail_in == 0) - strm->next_in = state->in; - strm->next_in[strm->avail_in++] = c; - state->pos++; - return c; - } - - /* no room in buffer or not initialized, use gz_write() */ - buf[0] = c; - if (gzwrite(file, buf, 1) != 1) - return -1; - return c; -} - -/* -- see zlib.h -- */ -int ZEXPORT gzputs(file, str) - gzFile file; - const char *str; -{ - int ret; - unsigned len; - - /* write string */ - len = (unsigned)strlen(str); - ret = gzwrite(file, str, len); - return ret == 0 && len != 0 ? -1 : ret; -} - -#ifdef STDC -#include - -/* -- see zlib.h -- */ -int ZEXPORTVA gzprintf (gzFile file, const char *format, ...) -{ - int size, len; - gz_statep state; - z_streamp strm; - va_list va; - - /* get internal structure */ - if (file == NULL) - return -1; - state = (gz_statep)file; - strm = &(state->strm); - - /* check that we're writing and that there's no error */ - if (state->mode != GZ_WRITE || state->err != Z_OK) - return 0; - - /* make sure we have some buffer space */ - if (state->size == 0 && gz_init(state) == -1) - return 0; - - /* check for seek request */ - if (state->seek) { - state->seek = 0; - if (gz_zero(state, state->skip) == -1) - return 0; - } - - /* consume whatever's left in the input buffer */ - if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1) - return 0; - - /* do the printf() into the input buffer, put length in len */ - size = (int)(state->size); - state->in[size - 1] = 0; - va_start(va, format); -#ifdef NO_vsnprintf -# ifdef HAS_vsprintf_void - (void)vsprintf(state->in, format, va); - va_end(va); - for (len = 0; len < size; len++) - if (state->in[len] == 0) break; -# else - len = vsprintf(state->in, format, va); - va_end(va); -# endif -#else -# ifdef HAS_vsnprintf_void - (void)vsnprintf(state->in, size, format, va); - va_end(va); - len = strlen(state->in); -# else - len = vsnprintf((char *)(state->in), size, format, va); - va_end(va); -# endif -#endif - - /* check that printf() results fit in buffer */ - if (len <= 0 || len >= (int)size || state->in[size - 1] != 0) - return 0; - - /* update buffer and position, defer compression until needed */ - strm->avail_in = (unsigned)len; - strm->next_in = state->in; - state->pos += len; - return len; -} - -#else /* !STDC */ - -/* -- see zlib.h -- */ -int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, - a11, a12, a13, a14, a15, a16, a17, a18, a19, a20) - gzFile file; - const char *format; - int a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, - a11, a12, a13, a14, a15, a16, a17, a18, a19, a20; -{ - int size, len; - gz_statep state; - z_streamp strm; - - /* get internal structure */ - if (file == NULL) - return -1; - state = (gz_statep)file; - strm = &(state->strm); - - /* check that we're writing and that there's no error */ - if (state->mode != GZ_WRITE || state->err != Z_OK) - return 0; - - /* make sure we have some buffer space */ - if (state->size == 0 && gz_init(state) == -1) - return 0; - - /* check for seek request */ - if (state->seek) { - state->seek = 0; - if (gz_zero(state, state->skip) == -1) - return 0; - } - - /* consume whatever's left in the input buffer */ - if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1) - return 0; - - /* do the printf() into the input buffer, put length in len */ - size = (int)(state->size); - state->in[size - 1] = 0; -#ifdef NO_snprintf -# ifdef HAS_sprintf_void - sprintf(state->in, format, a1, a2, a3, a4, a5, a6, a7, a8, - a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); - for (len = 0; len < size; len++) - if (state->in[len] == 0) break; -# else - len = sprintf(state->in, format, a1, a2, a3, a4, a5, a6, a7, a8, - a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); -# endif -#else -# ifdef HAS_snprintf_void - snprintf(state->in, size, format, a1, a2, a3, a4, a5, a6, a7, a8, - a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); - len = strlen(state->in); -# else - len = snprintf(state->in, size, format, a1, a2, a3, a4, a5, a6, a7, a8, - a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); -# endif -#endif - - /* check that printf() results fit in buffer */ - if (len <= 0 || len >= (int)size || state->in[size - 1] != 0) - return 0; - - /* update buffer and position, defer compression until needed */ - strm->avail_in = (unsigned)len; - strm->next_in = state->in; - state->pos += len; - return len; -} - -#endif - -/* -- see zlib.h -- */ -int ZEXPORT gzflush(file, flush) - gzFile file; - int flush; -{ - gz_statep state; - - /* get internal structure */ - if (file == NULL) - return -1; - state = (gz_statep)file; - - /* check that we're writing and that there's no error */ - if (state->mode != GZ_WRITE || state->err != Z_OK) - return Z_STREAM_ERROR; - - /* check flush parameter */ - if (flush < 0 || flush > Z_FINISH) - return Z_STREAM_ERROR; - - /* check for seek request */ - if (state->seek) { - state->seek = 0; - if (gz_zero(state, state->skip) == -1) - return -1; - } - - /* compress remaining data with requested flush */ - gz_comp(state, flush); - return state->err; -} - -/* -- see zlib.h -- */ -int ZEXPORT gzsetparams(file, level, strategy) - gzFile file; - int level; - int strategy; -{ - gz_statep state; - z_streamp strm; - - /* get internal structure */ - if (file == NULL) - return Z_STREAM_ERROR; - state = (gz_statep)file; - strm = &(state->strm); - - /* check that we're writing and that there's no error */ - if (state->mode != GZ_WRITE || state->err != Z_OK) - return Z_STREAM_ERROR; - - /* if no change is requested, then do nothing */ - if (level == state->level && strategy == state->strategy) - return Z_OK; - - /* check for seek request */ - if (state->seek) { - state->seek = 0; - if (gz_zero(state, state->skip) == -1) - return -1; - } - - /* change compression parameters for subsequent input */ - if (state->size) { - /* flush previous input with previous parameters before changing */ - if (strm->avail_in && gz_comp(state, Z_PARTIAL_FLUSH) == -1) - return state->err; - deflateParams(strm, level, strategy); - } - state->level = level; - state->strategy = strategy; - return Z_OK; -} - -/* -- see zlib.h -- */ -int ZEXPORT gzclose_w(file) - gzFile file; -{ - int ret = 0; - gz_statep state; - - /* get internal structure */ - if (file == NULL) - return Z_STREAM_ERROR; - state = (gz_statep)file; - - /* check that we're writing */ - if (state->mode != GZ_WRITE) - return Z_STREAM_ERROR; - - /* check for seek request */ - if (state->seek) { - state->seek = 0; - ret += gz_zero(state, state->skip); - } - - /* flush, free memory, and close file */ - ret += gz_comp(state, Z_FINISH); - (void)deflateEnd(&(state->strm)); - free(state->out); - free(state->in); - gz_error(state, Z_OK, NULL); - free(state->path); - ret += close(state->fd); - free(state); - return ret ? Z_ERRNO : Z_OK; -} diff --git a/libs/libwebsockets/win32port/zlib/infback.c b/libs/libwebsockets/win32port/zlib/infback.c deleted file mode 100644 index 14770c5635..0000000000 --- a/libs/libwebsockets/win32port/zlib/infback.c +++ /dev/null @@ -1,632 +0,0 @@ -/* infback.c -- inflate using a call-back interface - * Copyright (C) 1995-2009 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -/* - This code is largely copied from inflate.c. Normally either infback.o or - inflate.o would be linked into an application--not both. The interface - with inffast.c is retained so that optimized assembler-coded versions of - inflate_fast() can be used with either inflate.c or infback.c. - */ - -#include "zutil.h" -#include "inftrees.h" -#include "inflate.h" -#include "inffast.h" - -/* function prototypes */ -local void fixedtables OF((struct inflate_state FAR *state)); - -/* - strm provides memory allocation functions in zalloc and zfree, or - Z_NULL to use the library memory allocation functions. - - windowBits is in the range 8..15, and window is a user-supplied - window and output buffer that is 2**windowBits bytes. - */ -int ZEXPORT inflateBackInit_(strm, windowBits, window, version, stream_size) -z_streamp strm; -int windowBits; -unsigned char FAR *window; -const char *version; -int stream_size; -{ - struct inflate_state FAR *state; - - if (version == Z_NULL || version[0] != ZLIB_VERSION[0] || - stream_size != (int)(sizeof(z_stream))) - return Z_VERSION_ERROR; - if (strm == Z_NULL || window == Z_NULL || - windowBits < 8 || windowBits > 15) - return Z_STREAM_ERROR; - strm->msg = Z_NULL; /* in case we return an error */ - if (strm->zalloc == (alloc_func)0) { - strm->zalloc = zcalloc; - strm->opaque = (voidpf)0; - } - if (strm->zfree == (free_func)0) strm->zfree = zcfree; - state = (struct inflate_state FAR *)ZALLOC(strm, 1, - sizeof(struct inflate_state)); - if (state == Z_NULL) return Z_MEM_ERROR; - Tracev((stderr, "inflate: allocated\n")); - strm->state = (struct internal_state FAR *)state; - state->dmax = 32768U; - state->wbits = windowBits; - state->wsize = 1U << windowBits; - state->window = window; - state->wnext = 0; - state->whave = 0; - return Z_OK; -} - -/* - Return state with length and distance decoding tables and index sizes set to - fixed code decoding. Normally this returns fixed tables from inffixed.h. - If BUILDFIXED is defined, then instead this routine builds the tables the - first time it's called, and returns those tables the first time and - thereafter. This reduces the size of the code by about 2K bytes, in - exchange for a little execution time. However, BUILDFIXED should not be - used for threaded applications, since the rewriting of the tables and virgin - may not be thread-safe. - */ -local void fixedtables(state) -struct inflate_state FAR *state; -{ -#ifdef BUILDFIXED - static int virgin = 1; - static code *lenfix, *distfix; - static code fixed[544]; - - /* build fixed huffman tables if first call (may not be thread safe) */ - if (virgin) { - unsigned sym, bits; - static code *next; - - /* literal/length table */ - sym = 0; - while (sym < 144) state->lens[sym++] = 8; - while (sym < 256) state->lens[sym++] = 9; - while (sym < 280) state->lens[sym++] = 7; - while (sym < 288) state->lens[sym++] = 8; - next = fixed; - lenfix = next; - bits = 9; - inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work); - - /* distance table */ - sym = 0; - while (sym < 32) state->lens[sym++] = 5; - distfix = next; - bits = 5; - inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work); - - /* do this just once */ - virgin = 0; - } -#else /* !BUILDFIXED */ -# include "inffixed.h" -#endif /* BUILDFIXED */ - state->lencode = lenfix; - state->lenbits = 9; - state->distcode = distfix; - state->distbits = 5; -} - -/* Macros for inflateBack(): */ - -/* Load returned state from inflate_fast() */ -#define LOAD() \ - do { \ - put = strm->next_out; \ - left = strm->avail_out; \ - next = strm->next_in; \ - have = strm->avail_in; \ - hold = state->hold; \ - bits = state->bits; \ - } while (0) - -/* Set state from registers for inflate_fast() */ -#define RESTORE() \ - do { \ - strm->next_out = put; \ - strm->avail_out = left; \ - strm->next_in = next; \ - strm->avail_in = have; \ - state->hold = hold; \ - state->bits = bits; \ - } while (0) - -/* Clear the input bit accumulator */ -#define INITBITS() \ - do { \ - hold = 0; \ - bits = 0; \ - } while (0) - -/* Assure that some input is available. If input is requested, but denied, - then return a Z_BUF_ERROR from inflateBack(). */ -#define PULL() \ - do { \ - if (have == 0) { \ - have = in(in_desc, &next); \ - if (have == 0) { \ - next = Z_NULL; \ - ret = Z_BUF_ERROR; \ - goto inf_leave; \ - } \ - } \ - } while (0) - -/* Get a byte of input into the bit accumulator, or return from inflateBack() - with an error if there is no input available. */ -#define PULLBYTE() \ - do { \ - PULL(); \ - have--; \ - hold += (unsigned long)(*next++) << bits; \ - bits += 8; \ - } while (0) - -/* Assure that there are at least n bits in the bit accumulator. If there is - not enough available input to do that, then return from inflateBack() with - an error. */ -#define NEEDBITS(n) \ - do { \ - while (bits < (unsigned)(n)) \ - PULLBYTE(); \ - } while (0) - -/* Return the low n bits of the bit accumulator (n < 16) */ -#define BITS(n) \ - ((unsigned)hold & ((1U << (n)) - 1)) - -/* Remove n bits from the bit accumulator */ -#define DROPBITS(n) \ - do { \ - hold >>= (n); \ - bits -= (unsigned)(n); \ - } while (0) - -/* Remove zero to seven bits as needed to go to a byte boundary */ -#define BYTEBITS() \ - do { \ - hold >>= bits & 7; \ - bits -= bits & 7; \ - } while (0) - -/* Assure that some output space is available, by writing out the window - if it's full. If the write fails, return from inflateBack() with a - Z_BUF_ERROR. */ -#define ROOM() \ - do { \ - if (left == 0) { \ - put = state->window; \ - left = state->wsize; \ - state->whave = left; \ - if (out(out_desc, put, left)) { \ - ret = Z_BUF_ERROR; \ - goto inf_leave; \ - } \ - } \ - } while (0) - -/* - strm provides the memory allocation functions and window buffer on input, - and provides information on the unused input on return. For Z_DATA_ERROR - returns, strm will also provide an error message. - - in() and out() are the call-back input and output functions. When - inflateBack() needs more input, it calls in(). When inflateBack() has - filled the window with output, or when it completes with data in the - window, it calls out() to write out the data. The application must not - change the provided input until in() is called again or inflateBack() - returns. The application must not change the window/output buffer until - inflateBack() returns. - - in() and out() are called with a descriptor parameter provided in the - inflateBack() call. This parameter can be a structure that provides the - information required to do the read or write, as well as accumulated - information on the input and output such as totals and check values. - - in() should return zero on failure. out() should return non-zero on - failure. If either in() or out() fails, than inflateBack() returns a - Z_BUF_ERROR. strm->next_in can be checked for Z_NULL to see whether it - was in() or out() that caused in the error. Otherwise, inflateBack() - returns Z_STREAM_END on success, Z_DATA_ERROR for an deflate format - error, or Z_MEM_ERROR if it could not allocate memory for the state. - inflateBack() can also return Z_STREAM_ERROR if the input parameters - are not correct, i.e. strm is Z_NULL or the state was not initialized. - */ -int ZEXPORT inflateBack(strm, in, in_desc, out, out_desc) -z_streamp strm; -in_func in; -void FAR *in_desc; -out_func out; -void FAR *out_desc; -{ - struct inflate_state FAR *state; - unsigned char FAR *next; /* next input */ - unsigned char FAR *put; /* next output */ - unsigned have, left; /* available input and output */ - unsigned long hold; /* bit buffer */ - unsigned bits; /* bits in bit buffer */ - unsigned copy; /* number of stored or match bytes to copy */ - unsigned char FAR *from; /* where to copy match bytes from */ - code here; /* current decoding table entry */ - code last; /* parent table entry */ - unsigned len; /* length to copy for repeats, bits to drop */ - int ret; /* return code */ - static const unsigned short order[19] = /* permutation of code lengths */ - {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}; - - /* Check that the strm exists and that the state was initialized */ - if (strm == Z_NULL || strm->state == Z_NULL) - return Z_STREAM_ERROR; - state = (struct inflate_state FAR *)strm->state; - - /* Reset the state */ - strm->msg = Z_NULL; - state->mode = TYPE; - state->last = 0; - state->whave = 0; - next = strm->next_in; - have = next != Z_NULL ? strm->avail_in : 0; - hold = 0; - bits = 0; - put = state->window; - left = state->wsize; - - /* Inflate until end of block marked as last */ - for (;;) - switch (state->mode) { - case TYPE: - /* determine and dispatch block type */ - if (state->last) { - BYTEBITS(); - state->mode = DONE; - break; - } - NEEDBITS(3); - state->last = BITS(1); - DROPBITS(1); - switch (BITS(2)) { - case 0: /* stored block */ - Tracev((stderr, "inflate: stored block%s\n", - state->last ? " (last)" : "")); - state->mode = STORED; - break; - case 1: /* fixed block */ - fixedtables(state); - Tracev((stderr, "inflate: fixed codes block%s\n", - state->last ? " (last)" : "")); - state->mode = LEN; /* decode codes */ - break; - case 2: /* dynamic block */ - Tracev((stderr, "inflate: dynamic codes block%s\n", - state->last ? " (last)" : "")); - state->mode = TABLE; - break; - case 3: - strm->msg = (char *)"invalid block type"; - state->mode = BAD; - } - DROPBITS(2); - break; - - case STORED: - /* get and verify stored block length */ - BYTEBITS(); /* go to byte boundary */ - NEEDBITS(32); - if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) { - strm->msg = (char *)"invalid stored block lengths"; - state->mode = BAD; - break; - } - state->length = (unsigned)hold & 0xffff; - Tracev((stderr, "inflate: stored length %u\n", - state->length)); - INITBITS(); - - /* copy stored block from input to output */ - while (state->length != 0) { - copy = state->length; - PULL(); - ROOM(); - if (copy > have) copy = have; - if (copy > left) copy = left; - zmemcpy(put, next, copy); - have -= copy; - next += copy; - left -= copy; - put += copy; - state->length -= copy; - } - Tracev((stderr, "inflate: stored end\n")); - state->mode = TYPE; - break; - - case TABLE: - /* get dynamic table entries descriptor */ - NEEDBITS(14); - state->nlen = BITS(5) + 257; - DROPBITS(5); - state->ndist = BITS(5) + 1; - DROPBITS(5); - state->ncode = BITS(4) + 4; - DROPBITS(4); -#ifndef PKZIP_BUG_WORKAROUND - if (state->nlen > 286 || state->ndist > 30) { - strm->msg = (char *)"too many length or distance symbols"; - state->mode = BAD; - break; - } -#endif - Tracev((stderr, "inflate: table sizes ok\n")); - - /* get code length code lengths (not a typo) */ - state->have = 0; - while (state->have < state->ncode) { - NEEDBITS(3); - state->lens[order[state->have++]] = (unsigned short)BITS(3); - DROPBITS(3); - } - while (state->have < 19) - state->lens[order[state->have++]] = 0; - state->next = state->codes; - state->lencode = (code const FAR *)(state->next); - state->lenbits = 7; - ret = inflate_table(CODES, state->lens, 19, &(state->next), - &(state->lenbits), state->work); - if (ret) { - strm->msg = (char *)"invalid code lengths set"; - state->mode = BAD; - break; - } - Tracev((stderr, "inflate: code lengths ok\n")); - - /* get length and distance code code lengths */ - state->have = 0; - while (state->have < state->nlen + state->ndist) { - for (;;) { - here = state->lencode[BITS(state->lenbits)]; - if ((unsigned)(here.bits) <= bits) break; - PULLBYTE(); - } - if (here.val < 16) { - NEEDBITS(here.bits); - DROPBITS(here.bits); - state->lens[state->have++] = here.val; - } - else { - if (here.val == 16) { - NEEDBITS(here.bits + 2); - DROPBITS(here.bits); - if (state->have == 0) { - strm->msg = (char *)"invalid bit length repeat"; - state->mode = BAD; - break; - } - len = (unsigned)(state->lens[state->have - 1]); - copy = 3 + BITS(2); - DROPBITS(2); - } - else if (here.val == 17) { - NEEDBITS(here.bits + 3); - DROPBITS(here.bits); - len = 0; - copy = 3 + BITS(3); - DROPBITS(3); - } - else { - NEEDBITS(here.bits + 7); - DROPBITS(here.bits); - len = 0; - copy = 11 + BITS(7); - DROPBITS(7); - } - if (state->have + copy > state->nlen + state->ndist) { - strm->msg = (char *)"invalid bit length repeat"; - state->mode = BAD; - break; - } - while (copy--) - state->lens[state->have++] = (unsigned short)len; - } - } - - /* handle error breaks in while */ - if (state->mode == BAD) break; - - /* check for end-of-block code (better have one) */ - if (state->lens[256] == 0) { - strm->msg = (char *)"invalid code -- missing end-of-block"; - state->mode = BAD; - break; - } - - /* build code tables -- note: do not change the lenbits or distbits - values here (9 and 6) without reading the comments in inftrees.h - concerning the ENOUGH constants, which depend on those values */ - state->next = state->codes; - state->lencode = (code const FAR *)(state->next); - state->lenbits = 9; - ret = inflate_table(LENS, state->lens, state->nlen, &(state->next), - &(state->lenbits), state->work); - if (ret) { - strm->msg = (char *)"invalid literal/lengths set"; - state->mode = BAD; - break; - } - state->distcode = (code const FAR *)(state->next); - state->distbits = 6; - ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist, - &(state->next), &(state->distbits), state->work); - if (ret) { - strm->msg = (char *)"invalid distances set"; - state->mode = BAD; - break; - } - Tracev((stderr, "inflate: codes ok\n")); - state->mode = LEN; - - case LEN: - /* use inflate_fast() if we have enough input and output */ - if (have >= 6 && left >= 258) { - RESTORE(); - if (state->whave < state->wsize) - state->whave = state->wsize - left; - inflate_fast(strm, state->wsize); - LOAD(); - break; - } - - /* get a literal, length, or end-of-block code */ - for (;;) { - here = state->lencode[BITS(state->lenbits)]; - if ((unsigned)(here.bits) <= bits) break; - PULLBYTE(); - } - if (here.op && (here.op & 0xf0) == 0) { - last = here; - for (;;) { - here = state->lencode[last.val + - (BITS(last.bits + last.op) >> last.bits)]; - if ((unsigned)(last.bits + here.bits) <= bits) break; - PULLBYTE(); - } - DROPBITS(last.bits); - } - DROPBITS(here.bits); - state->length = (unsigned)here.val; - - /* process literal */ - if (here.op == 0) { - Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ? - "inflate: literal '%c'\n" : - "inflate: literal 0x%02x\n", here.val)); - ROOM(); - *put++ = (unsigned char)(state->length); - left--; - state->mode = LEN; - break; - } - - /* process end of block */ - if (here.op & 32) { - Tracevv((stderr, "inflate: end of block\n")); - state->mode = TYPE; - break; - } - - /* invalid code */ - if (here.op & 64) { - strm->msg = (char *)"invalid literal/length code"; - state->mode = BAD; - break; - } - - /* length code -- get extra bits, if any */ - state->extra = (unsigned)(here.op) & 15; - if (state->extra != 0) { - NEEDBITS(state->extra); - state->length += BITS(state->extra); - DROPBITS(state->extra); - } - Tracevv((stderr, "inflate: length %u\n", state->length)); - - /* get distance code */ - for (;;) { - here = state->distcode[BITS(state->distbits)]; - if ((unsigned)(here.bits) <= bits) break; - PULLBYTE(); - } - if ((here.op & 0xf0) == 0) { - last = here; - for (;;) { - here = state->distcode[last.val + - (BITS(last.bits + last.op) >> last.bits)]; - if ((unsigned)(last.bits + here.bits) <= bits) break; - PULLBYTE(); - } - DROPBITS(last.bits); - } - DROPBITS(here.bits); - if (here.op & 64) { - strm->msg = (char *)"invalid distance code"; - state->mode = BAD; - break; - } - state->offset = (unsigned)here.val; - - /* get distance extra bits, if any */ - state->extra = (unsigned)(here.op) & 15; - if (state->extra != 0) { - NEEDBITS(state->extra); - state->offset += BITS(state->extra); - DROPBITS(state->extra); - } - if (state->offset > state->wsize - (state->whave < state->wsize ? - left : 0)) { - strm->msg = (char *)"invalid distance too far back"; - state->mode = BAD; - break; - } - Tracevv((stderr, "inflate: distance %u\n", state->offset)); - - /* copy match from window to output */ - do { - ROOM(); - copy = state->wsize - state->offset; - if (copy < left) { - from = put + copy; - copy = left - copy; - } - else { - from = put - state->offset; - copy = left; - } - if (copy > state->length) copy = state->length; - state->length -= copy; - left -= copy; - do { - *put++ = *from++; - } while (--copy); - } while (state->length != 0); - break; - - case DONE: - /* inflate stream terminated properly -- write leftover output */ - ret = Z_STREAM_END; - if (left < state->wsize) { - if (out(out_desc, state->window, state->wsize - left)) - ret = Z_BUF_ERROR; - } - goto inf_leave; - - case BAD: - ret = Z_DATA_ERROR; - goto inf_leave; - - default: /* can't happen, but makes compilers happy */ - ret = Z_STREAM_ERROR; - goto inf_leave; - } - - /* Return unused input */ - inf_leave: - strm->next_in = next; - strm->avail_in = have; - return ret; -} - -int ZEXPORT inflateBackEnd(strm) -z_streamp strm; -{ - if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0) - return Z_STREAM_ERROR; - ZFREE(strm, strm->state); - strm->state = Z_NULL; - Tracev((stderr, "inflate: end\n")); - return Z_OK; -} diff --git a/libs/libwebsockets/win32port/zlib/inffast.c b/libs/libwebsockets/win32port/zlib/inffast.c deleted file mode 100644 index 2dfd4127db..0000000000 --- a/libs/libwebsockets/win32port/zlib/inffast.c +++ /dev/null @@ -1,340 +0,0 @@ -/* inffast.c -- fast decoding - * Copyright (C) 1995-2008, 2010 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -#include "zutil.h" -#include "inftrees.h" -#include "inflate.h" -#include "inffast.h" - -#ifndef ASMINF - -/* Allow machine dependent optimization for post-increment or pre-increment. - Based on testing to date, - Pre-increment preferred for: - - PowerPC G3 (Adler) - - MIPS R5000 (Randers-Pehrson) - Post-increment preferred for: - - none - No measurable difference: - - Pentium III (Anderson) - - M68060 (Nikl) - */ -#ifdef POSTINC -# define OFF 0 -# define PUP(a) *(a)++ -#else -# define OFF 1 -# define PUP(a) *++(a) -#endif - -/* - Decode literal, length, and distance codes and write out the resulting - literal and match bytes until either not enough input or output is - available, an end-of-block is encountered, or a data error is encountered. - When large enough input and output buffers are supplied to inflate(), for - example, a 16K input buffer and a 64K output buffer, more than 95% of the - inflate execution time is spent in this routine. - - Entry assumptions: - - state->mode == LEN - strm->avail_in >= 6 - strm->avail_out >= 258 - start >= strm->avail_out - state->bits < 8 - - On return, state->mode is one of: - - LEN -- ran out of enough output space or enough available input - TYPE -- reached end of block code, inflate() to interpret next block - BAD -- error in block data - - Notes: - - - The maximum input bits used by a length/distance pair is 15 bits for the - length code, 5 bits for the length extra, 15 bits for the distance code, - and 13 bits for the distance extra. This totals 48 bits, or six bytes. - Therefore if strm->avail_in >= 6, then there is enough input to avoid - checking for available input while decoding. - - - The maximum bytes that a single length/distance pair can output is 258 - bytes, which is the maximum length that can be coded. inflate_fast() - requires strm->avail_out >= 258 for each loop to avoid checking for - output space. - */ -void ZLIB_INTERNAL inflate_fast(strm, start) -z_streamp strm; -unsigned start; /* inflate()'s starting value for strm->avail_out */ -{ - struct inflate_state FAR *state; - unsigned char FAR *in; /* local strm->next_in */ - unsigned char FAR *last; /* while in < last, enough input available */ - unsigned char FAR *out; /* local strm->next_out */ - unsigned char FAR *beg; /* inflate()'s initial strm->next_out */ - unsigned char FAR *end; /* while out < end, enough space available */ -#ifdef INFLATE_STRICT - unsigned dmax; /* maximum distance from zlib header */ -#endif - unsigned wsize; /* window size or zero if not using window */ - unsigned whave; /* valid bytes in the window */ - unsigned wnext; /* window write index */ - unsigned char FAR *window; /* allocated sliding window, if wsize != 0 */ - unsigned long hold; /* local strm->hold */ - unsigned bits; /* local strm->bits */ - code const FAR *lcode; /* local strm->lencode */ - code const FAR *dcode; /* local strm->distcode */ - unsigned lmask; /* mask for first level of length codes */ - unsigned dmask; /* mask for first level of distance codes */ - code here; /* retrieved table entry */ - unsigned op; /* code bits, operation, extra bits, or */ - /* window position, window bytes to copy */ - unsigned len; /* match length, unused bytes */ - unsigned dist; /* match distance */ - unsigned char FAR *from; /* where to copy match from */ - - /* copy state to local variables */ - state = (struct inflate_state FAR *)strm->state; - in = strm->next_in - OFF; - last = in + (strm->avail_in - 5); - out = strm->next_out - OFF; - beg = out - (start - strm->avail_out); - end = out + (strm->avail_out - 257); -#ifdef INFLATE_STRICT - dmax = state->dmax; -#endif - wsize = state->wsize; - whave = state->whave; - wnext = state->wnext; - window = state->window; - hold = state->hold; - bits = state->bits; - lcode = state->lencode; - dcode = state->distcode; - lmask = (1U << state->lenbits) - 1; - dmask = (1U << state->distbits) - 1; - - /* decode literals and length/distances until end-of-block or not enough - input data or output space */ - do { - if (bits < 15) { - hold += (unsigned long)(PUP(in)) << bits; - bits += 8; - hold += (unsigned long)(PUP(in)) << bits; - bits += 8; - } - here = lcode[hold & lmask]; - dolen: - op = (unsigned)(here.bits); - hold >>= op; - bits -= op; - op = (unsigned)(here.op); - if (op == 0) { /* literal */ - Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ? - "inflate: literal '%c'\n" : - "inflate: literal 0x%02x\n", here.val)); - PUP(out) = (unsigned char)(here.val); - } - else if (op & 16) { /* length base */ - len = (unsigned)(here.val); - op &= 15; /* number of extra bits */ - if (op) { - if (bits < op) { - hold += (unsigned long)(PUP(in)) << bits; - bits += 8; - } - len += (unsigned)hold & ((1U << op) - 1); - hold >>= op; - bits -= op; - } - Tracevv((stderr, "inflate: length %u\n", len)); - if (bits < 15) { - hold += (unsigned long)(PUP(in)) << bits; - bits += 8; - hold += (unsigned long)(PUP(in)) << bits; - bits += 8; - } - here = dcode[hold & dmask]; - dodist: - op = (unsigned)(here.bits); - hold >>= op; - bits -= op; - op = (unsigned)(here.op); - if (op & 16) { /* distance base */ - dist = (unsigned)(here.val); - op &= 15; /* number of extra bits */ - if (bits < op) { - hold += (unsigned long)(PUP(in)) << bits; - bits += 8; - if (bits < op) { - hold += (unsigned long)(PUP(in)) << bits; - bits += 8; - } - } - dist += (unsigned)hold & ((1U << op) - 1); -#ifdef INFLATE_STRICT - if (dist > dmax) { - strm->msg = (char *)"invalid distance too far back"; - state->mode = BAD; - break; - } -#endif - hold >>= op; - bits -= op; - Tracevv((stderr, "inflate: distance %u\n", dist)); - op = (unsigned)(out - beg); /* max distance in output */ - if (dist > op) { /* see if copy from window */ - op = dist - op; /* distance back in window */ - if (op > whave) { - if (state->sane) { - strm->msg = - (char *)"invalid distance too far back"; - state->mode = BAD; - break; - } -#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR - if (len <= op - whave) { - do { - PUP(out) = 0; - } while (--len); - continue; - } - len -= op - whave; - do { - PUP(out) = 0; - } while (--op > whave); - if (op == 0) { - from = out - dist; - do { - PUP(out) = PUP(from); - } while (--len); - continue; - } -#endif - } - from = window - OFF; - if (wnext == 0) { /* very common case */ - from += wsize - op; - if (op < len) { /* some from window */ - len -= op; - do { - PUP(out) = PUP(from); - } while (--op); - from = out - dist; /* rest from output */ - } - } - else if (wnext < op) { /* wrap around window */ - from += wsize + wnext - op; - op -= wnext; - if (op < len) { /* some from end of window */ - len -= op; - do { - PUP(out) = PUP(from); - } while (--op); - from = window - OFF; - if (wnext < len) { /* some from start of window */ - op = wnext; - len -= op; - do { - PUP(out) = PUP(from); - } while (--op); - from = out - dist; /* rest from output */ - } - } - } - else { /* contiguous in window */ - from += wnext - op; - if (op < len) { /* some from window */ - len -= op; - do { - PUP(out) = PUP(from); - } while (--op); - from = out - dist; /* rest from output */ - } - } - while (len > 2) { - PUP(out) = PUP(from); - PUP(out) = PUP(from); - PUP(out) = PUP(from); - len -= 3; - } - if (len) { - PUP(out) = PUP(from); - if (len > 1) - PUP(out) = PUP(from); - } - } - else { - from = out - dist; /* copy direct from output */ - do { /* minimum length is three */ - PUP(out) = PUP(from); - PUP(out) = PUP(from); - PUP(out) = PUP(from); - len -= 3; - } while (len > 2); - if (len) { - PUP(out) = PUP(from); - if (len > 1) - PUP(out) = PUP(from); - } - } - } - else if ((op & 64) == 0) { /* 2nd level distance code */ - here = dcode[here.val + (hold & ((1U << op) - 1))]; - goto dodist; - } - else { - strm->msg = (char *)"invalid distance code"; - state->mode = BAD; - break; - } - } - else if ((op & 64) == 0) { /* 2nd level length code */ - here = lcode[here.val + (hold & ((1U << op) - 1))]; - goto dolen; - } - else if (op & 32) { /* end-of-block */ - Tracevv((stderr, "inflate: end of block\n")); - state->mode = TYPE; - break; - } - else { - strm->msg = (char *)"invalid literal/length code"; - state->mode = BAD; - break; - } - } while (in < last && out < end); - - /* return unused bytes (on entry, bits < 8, so in won't go too far back) */ - len = bits >> 3; - in -= len; - bits -= len << 3; - hold &= (1U << bits) - 1; - - /* update state and return */ - strm->next_in = in + OFF; - strm->next_out = out + OFF; - strm->avail_in = (unsigned)(in < last ? 5 + (last - in) : 5 - (in - last)); - strm->avail_out = (unsigned)(out < end ? - 257 + (end - out) : 257 - (out - end)); - state->hold = hold; - state->bits = bits; - return; -} - -/* - inflate_fast() speedups that turned out slower (on a PowerPC G3 750CXe): - - Using bit fields for code structure - - Different op definition to avoid & for extra bits (do & for table bits) - - Three separate decoding do-loops for direct, window, and wnext == 0 - - Special case for distance > 1 copies to do overlapped load and store copy - - Explicit branch predictions (based on measured branch probabilities) - - Deferring match copy and interspersed it with decoding subsequent codes - - Swapping literal/length else - - Swapping window/direct else - - Larger unrolled copy loops (three is about right) - - Moving len -= 3 statement into middle of loop - */ - -#endif /* !ASMINF */ diff --git a/libs/libwebsockets/win32port/zlib/inffast.h b/libs/libwebsockets/win32port/zlib/inffast.h deleted file mode 100644 index e1e6db4ac5..0000000000 --- a/libs/libwebsockets/win32port/zlib/inffast.h +++ /dev/null @@ -1,11 +0,0 @@ -/* inffast.h -- header to use inffast.c - * Copyright (C) 1995-2003, 2010 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -/* WARNING: this file should *not* be used by applications. It is - part of the implementation of the compression library and is - subject to change. Applications should only use zlib.h. - */ - -void ZLIB_INTERNAL inflate_fast OF((z_streamp strm, unsigned start)); diff --git a/libs/libwebsockets/win32port/zlib/inffixed.h b/libs/libwebsockets/win32port/zlib/inffixed.h deleted file mode 100644 index 423d5c5b50..0000000000 --- a/libs/libwebsockets/win32port/zlib/inffixed.h +++ /dev/null @@ -1,94 +0,0 @@ - /* inffixed.h -- table for decoding fixed codes - * Generated automatically by makefixed(). - */ - - /* WARNING: this file should *not* be used by applications. It - is part of the implementation of the compression library and - is subject to change. Applications should only use zlib.h. - */ - - static const code lenfix[512] = { - {96,7,0},{0,8,80},{0,8,16},{20,8,115},{18,7,31},{0,8,112},{0,8,48}, - {0,9,192},{16,7,10},{0,8,96},{0,8,32},{0,9,160},{0,8,0},{0,8,128}, - {0,8,64},{0,9,224},{16,7,6},{0,8,88},{0,8,24},{0,9,144},{19,7,59}, - {0,8,120},{0,8,56},{0,9,208},{17,7,17},{0,8,104},{0,8,40},{0,9,176}, - {0,8,8},{0,8,136},{0,8,72},{0,9,240},{16,7,4},{0,8,84},{0,8,20}, - {21,8,227},{19,7,43},{0,8,116},{0,8,52},{0,9,200},{17,7,13},{0,8,100}, - {0,8,36},{0,9,168},{0,8,4},{0,8,132},{0,8,68},{0,9,232},{16,7,8}, - {0,8,92},{0,8,28},{0,9,152},{20,7,83},{0,8,124},{0,8,60},{0,9,216}, - {18,7,23},{0,8,108},{0,8,44},{0,9,184},{0,8,12},{0,8,140},{0,8,76}, - {0,9,248},{16,7,3},{0,8,82},{0,8,18},{21,8,163},{19,7,35},{0,8,114}, - {0,8,50},{0,9,196},{17,7,11},{0,8,98},{0,8,34},{0,9,164},{0,8,2}, - {0,8,130},{0,8,66},{0,9,228},{16,7,7},{0,8,90},{0,8,26},{0,9,148}, - {20,7,67},{0,8,122},{0,8,58},{0,9,212},{18,7,19},{0,8,106},{0,8,42}, - {0,9,180},{0,8,10},{0,8,138},{0,8,74},{0,9,244},{16,7,5},{0,8,86}, - {0,8,22},{64,8,0},{19,7,51},{0,8,118},{0,8,54},{0,9,204},{17,7,15}, - {0,8,102},{0,8,38},{0,9,172},{0,8,6},{0,8,134},{0,8,70},{0,9,236}, - {16,7,9},{0,8,94},{0,8,30},{0,9,156},{20,7,99},{0,8,126},{0,8,62}, - {0,9,220},{18,7,27},{0,8,110},{0,8,46},{0,9,188},{0,8,14},{0,8,142}, - {0,8,78},{0,9,252},{96,7,0},{0,8,81},{0,8,17},{21,8,131},{18,7,31}, - {0,8,113},{0,8,49},{0,9,194},{16,7,10},{0,8,97},{0,8,33},{0,9,162}, - {0,8,1},{0,8,129},{0,8,65},{0,9,226},{16,7,6},{0,8,89},{0,8,25}, - {0,9,146},{19,7,59},{0,8,121},{0,8,57},{0,9,210},{17,7,17},{0,8,105}, - {0,8,41},{0,9,178},{0,8,9},{0,8,137},{0,8,73},{0,9,242},{16,7,4}, - {0,8,85},{0,8,21},{16,8,258},{19,7,43},{0,8,117},{0,8,53},{0,9,202}, - {17,7,13},{0,8,101},{0,8,37},{0,9,170},{0,8,5},{0,8,133},{0,8,69}, - {0,9,234},{16,7,8},{0,8,93},{0,8,29},{0,9,154},{20,7,83},{0,8,125}, - {0,8,61},{0,9,218},{18,7,23},{0,8,109},{0,8,45},{0,9,186},{0,8,13}, - {0,8,141},{0,8,77},{0,9,250},{16,7,3},{0,8,83},{0,8,19},{21,8,195}, - {19,7,35},{0,8,115},{0,8,51},{0,9,198},{17,7,11},{0,8,99},{0,8,35}, - {0,9,166},{0,8,3},{0,8,131},{0,8,67},{0,9,230},{16,7,7},{0,8,91}, - {0,8,27},{0,9,150},{20,7,67},{0,8,123},{0,8,59},{0,9,214},{18,7,19}, - {0,8,107},{0,8,43},{0,9,182},{0,8,11},{0,8,139},{0,8,75},{0,9,246}, - {16,7,5},{0,8,87},{0,8,23},{64,8,0},{19,7,51},{0,8,119},{0,8,55}, - {0,9,206},{17,7,15},{0,8,103},{0,8,39},{0,9,174},{0,8,7},{0,8,135}, - {0,8,71},{0,9,238},{16,7,9},{0,8,95},{0,8,31},{0,9,158},{20,7,99}, - {0,8,127},{0,8,63},{0,9,222},{18,7,27},{0,8,111},{0,8,47},{0,9,190}, - {0,8,15},{0,8,143},{0,8,79},{0,9,254},{96,7,0},{0,8,80},{0,8,16}, - {20,8,115},{18,7,31},{0,8,112},{0,8,48},{0,9,193},{16,7,10},{0,8,96}, - {0,8,32},{0,9,161},{0,8,0},{0,8,128},{0,8,64},{0,9,225},{16,7,6}, - {0,8,88},{0,8,24},{0,9,145},{19,7,59},{0,8,120},{0,8,56},{0,9,209}, - {17,7,17},{0,8,104},{0,8,40},{0,9,177},{0,8,8},{0,8,136},{0,8,72}, - {0,9,241},{16,7,4},{0,8,84},{0,8,20},{21,8,227},{19,7,43},{0,8,116}, - {0,8,52},{0,9,201},{17,7,13},{0,8,100},{0,8,36},{0,9,169},{0,8,4}, - {0,8,132},{0,8,68},{0,9,233},{16,7,8},{0,8,92},{0,8,28},{0,9,153}, - {20,7,83},{0,8,124},{0,8,60},{0,9,217},{18,7,23},{0,8,108},{0,8,44}, - {0,9,185},{0,8,12},{0,8,140},{0,8,76},{0,9,249},{16,7,3},{0,8,82}, - {0,8,18},{21,8,163},{19,7,35},{0,8,114},{0,8,50},{0,9,197},{17,7,11}, - {0,8,98},{0,8,34},{0,9,165},{0,8,2},{0,8,130},{0,8,66},{0,9,229}, - {16,7,7},{0,8,90},{0,8,26},{0,9,149},{20,7,67},{0,8,122},{0,8,58}, - {0,9,213},{18,7,19},{0,8,106},{0,8,42},{0,9,181},{0,8,10},{0,8,138}, - {0,8,74},{0,9,245},{16,7,5},{0,8,86},{0,8,22},{64,8,0},{19,7,51}, - {0,8,118},{0,8,54},{0,9,205},{17,7,15},{0,8,102},{0,8,38},{0,9,173}, - {0,8,6},{0,8,134},{0,8,70},{0,9,237},{16,7,9},{0,8,94},{0,8,30}, - {0,9,157},{20,7,99},{0,8,126},{0,8,62},{0,9,221},{18,7,27},{0,8,110}, - {0,8,46},{0,9,189},{0,8,14},{0,8,142},{0,8,78},{0,9,253},{96,7,0}, - {0,8,81},{0,8,17},{21,8,131},{18,7,31},{0,8,113},{0,8,49},{0,9,195}, - {16,7,10},{0,8,97},{0,8,33},{0,9,163},{0,8,1},{0,8,129},{0,8,65}, - {0,9,227},{16,7,6},{0,8,89},{0,8,25},{0,9,147},{19,7,59},{0,8,121}, - {0,8,57},{0,9,211},{17,7,17},{0,8,105},{0,8,41},{0,9,179},{0,8,9}, - {0,8,137},{0,8,73},{0,9,243},{16,7,4},{0,8,85},{0,8,21},{16,8,258}, - {19,7,43},{0,8,117},{0,8,53},{0,9,203},{17,7,13},{0,8,101},{0,8,37}, - {0,9,171},{0,8,5},{0,8,133},{0,8,69},{0,9,235},{16,7,8},{0,8,93}, - {0,8,29},{0,9,155},{20,7,83},{0,8,125},{0,8,61},{0,9,219},{18,7,23}, - {0,8,109},{0,8,45},{0,9,187},{0,8,13},{0,8,141},{0,8,77},{0,9,251}, - {16,7,3},{0,8,83},{0,8,19},{21,8,195},{19,7,35},{0,8,115},{0,8,51}, - {0,9,199},{17,7,11},{0,8,99},{0,8,35},{0,9,167},{0,8,3},{0,8,131}, - {0,8,67},{0,9,231},{16,7,7},{0,8,91},{0,8,27},{0,9,151},{20,7,67}, - {0,8,123},{0,8,59},{0,9,215},{18,7,19},{0,8,107},{0,8,43},{0,9,183}, - {0,8,11},{0,8,139},{0,8,75},{0,9,247},{16,7,5},{0,8,87},{0,8,23}, - {64,8,0},{19,7,51},{0,8,119},{0,8,55},{0,9,207},{17,7,15},{0,8,103}, - {0,8,39},{0,9,175},{0,8,7},{0,8,135},{0,8,71},{0,9,239},{16,7,9}, - {0,8,95},{0,8,31},{0,9,159},{20,7,99},{0,8,127},{0,8,63},{0,9,223}, - {18,7,27},{0,8,111},{0,8,47},{0,9,191},{0,8,15},{0,8,143},{0,8,79}, - {0,9,255} - }; - - static const code distfix[32] = { - {16,5,1},{23,5,257},{19,5,17},{27,5,4097},{17,5,5},{25,5,1025}, - {21,5,65},{29,5,16385},{16,5,3},{24,5,513},{20,5,33},{28,5,8193}, - {18,5,9},{26,5,2049},{22,5,129},{64,5,0},{16,5,2},{23,5,385}, - {19,5,25},{27,5,6145},{17,5,7},{25,5,1537},{21,5,97},{29,5,24577}, - {16,5,4},{24,5,769},{20,5,49},{28,5,12289},{18,5,13},{26,5,3073}, - {22,5,193},{64,5,0} - }; diff --git a/libs/libwebsockets/win32port/zlib/inflate.c b/libs/libwebsockets/win32port/zlib/inflate.c deleted file mode 100644 index 5bec31e2ec..0000000000 --- a/libs/libwebsockets/win32port/zlib/inflate.c +++ /dev/null @@ -1,1480 +0,0 @@ -/* inflate.c -- zlib decompression - * Copyright (C) 1995-2010 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -/* - * Change history: - * - * 1.2.beta0 24 Nov 2002 - * - First version -- complete rewrite of inflate to simplify code, avoid - * creation of window when not needed, minimize use of window when it is - * needed, make inffast.c even faster, implement gzip decoding, and to - * improve code readability and style over the previous zlib inflate code - * - * 1.2.beta1 25 Nov 2002 - * - Use pointers for available input and output checking in inffast.c - * - Remove input and output counters in inffast.c - * - Change inffast.c entry and loop from avail_in >= 7 to >= 6 - * - Remove unnecessary second byte pull from length extra in inffast.c - * - Unroll direct copy to three copies per loop in inffast.c - * - * 1.2.beta2 4 Dec 2002 - * - Change external routine names to reduce potential conflicts - * - Correct filename to inffixed.h for fixed tables in inflate.c - * - Make hbuf[] unsigned char to match parameter type in inflate.c - * - Change strm->next_out[-state->offset] to *(strm->next_out - state->offset) - * to avoid negation problem on Alphas (64 bit) in inflate.c - * - * 1.2.beta3 22 Dec 2002 - * - Add comments on state->bits assertion in inffast.c - * - Add comments on op field in inftrees.h - * - Fix bug in reuse of allocated window after inflateReset() - * - Remove bit fields--back to byte structure for speed - * - Remove distance extra == 0 check in inflate_fast()--only helps for lengths - * - Change post-increments to pre-increments in inflate_fast(), PPC biased? - * - Add compile time option, POSTINC, to use post-increments instead (Intel?) - * - Make MATCH copy in inflate() much faster for when inflate_fast() not used - * - Use local copies of stream next and avail values, as well as local bit - * buffer and bit count in inflate()--for speed when inflate_fast() not used - * - * 1.2.beta4 1 Jan 2003 - * - Split ptr - 257 statements in inflate_table() to avoid compiler warnings - * - Move a comment on output buffer sizes from inffast.c to inflate.c - * - Add comments in inffast.c to introduce the inflate_fast() routine - * - Rearrange window copies in inflate_fast() for speed and simplification - * - Unroll last copy for window match in inflate_fast() - * - Use local copies of window variables in inflate_fast() for speed - * - Pull out common wnext == 0 case for speed in inflate_fast() - * - Make op and len in inflate_fast() unsigned for consistency - * - Add FAR to lcode and dcode declarations in inflate_fast() - * - Simplified bad distance check in inflate_fast() - * - Added inflateBackInit(), inflateBack(), and inflateBackEnd() in new - * source file infback.c to provide a call-back interface to inflate for - * programs like gzip and unzip -- uses window as output buffer to avoid - * window copying - * - * 1.2.beta5 1 Jan 2003 - * - Improved inflateBack() interface to allow the caller to provide initial - * input in strm. - * - Fixed stored blocks bug in inflateBack() - * - * 1.2.beta6 4 Jan 2003 - * - Added comments in inffast.c on effectiveness of POSTINC - * - Typecasting all around to reduce compiler warnings - * - Changed loops from while (1) or do {} while (1) to for (;;), again to - * make compilers happy - * - Changed type of window in inflateBackInit() to unsigned char * - * - * 1.2.beta7 27 Jan 2003 - * - Changed many types to unsigned or unsigned short to avoid warnings - * - Added inflateCopy() function - * - * 1.2.0 9 Mar 2003 - * - Changed inflateBack() interface to provide separate opaque descriptors - * for the in() and out() functions - * - Changed inflateBack() argument and in_func typedef to swap the length - * and buffer address return values for the input function - * - Check next_in and next_out for Z_NULL on entry to inflate() - * - * The history for versions after 1.2.0 are in ChangeLog in zlib distribution. - */ - -#include "zutil.h" -#include "inftrees.h" -#include "inflate.h" -#include "inffast.h" - -#ifdef MAKEFIXED -# ifndef BUILDFIXED -# define BUILDFIXED -# endif -#endif - -/* function prototypes */ -local void fixedtables OF((struct inflate_state FAR *state)); -local int updatewindow OF((z_streamp strm, unsigned out)); -#ifdef BUILDFIXED - void makefixed OF((void)); -#endif -local unsigned syncsearch OF((unsigned FAR *have, unsigned char FAR *buf, - unsigned len)); - -int ZEXPORT inflateReset(strm) -z_streamp strm; -{ - struct inflate_state FAR *state; - - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; - state = (struct inflate_state FAR *)strm->state; - strm->total_in = strm->total_out = state->total = 0; - strm->msg = Z_NULL; - strm->adler = 1; /* to support ill-conceived Java test suite */ - state->mode = HEAD; - state->last = 0; - state->havedict = 0; - state->dmax = 32768U; - state->head = Z_NULL; - state->wsize = 0; - state->whave = 0; - state->wnext = 0; - state->hold = 0; - state->bits = 0; - state->lencode = state->distcode = state->next = state->codes; - state->sane = 1; - state->back = -1; - Tracev((stderr, "inflate: reset\n")); - return Z_OK; -} - -int ZEXPORT inflateReset2(strm, windowBits) -z_streamp strm; -int windowBits; -{ - int wrap; - struct inflate_state FAR *state; - - /* get the state */ - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; - state = (struct inflate_state FAR *)strm->state; - - /* extract wrap request from windowBits parameter */ - if (windowBits < 0) { - wrap = 0; - windowBits = -windowBits; - } - else { - wrap = (windowBits >> 4) + 1; -#ifdef GUNZIP - if (windowBits < 48) - windowBits &= 15; -#endif - } - - /* set number of window bits, free window if different */ - if (windowBits && (windowBits < 8 || windowBits > 15)) - return Z_STREAM_ERROR; - if (state->window != Z_NULL && state->wbits != (unsigned)windowBits) { - ZFREE(strm, state->window); - state->window = Z_NULL; - } - - /* update state and reset the rest of it */ - state->wrap = wrap; - state->wbits = (unsigned)windowBits; - return inflateReset(strm); -} - -int ZEXPORT inflateInit2_(strm, windowBits, version, stream_size) -z_streamp strm; -int windowBits; -const char *version; -int stream_size; -{ - int ret; - struct inflate_state FAR *state; - - if (version == Z_NULL || version[0] != ZLIB_VERSION[0] || - stream_size != (int)(sizeof(z_stream))) - return Z_VERSION_ERROR; - if (strm == Z_NULL) return Z_STREAM_ERROR; - strm->msg = Z_NULL; /* in case we return an error */ - if (strm->zalloc == (alloc_func)0) { - strm->zalloc = zcalloc; - strm->opaque = (voidpf)0; - } - if (strm->zfree == (free_func)0) strm->zfree = zcfree; - state = (struct inflate_state FAR *) - ZALLOC(strm, 1, sizeof(struct inflate_state)); - if (state == Z_NULL) return Z_MEM_ERROR; - Tracev((stderr, "inflate: allocated\n")); - strm->state = (struct internal_state FAR *)state; - state->window = Z_NULL; - ret = inflateReset2(strm, windowBits); - if (ret != Z_OK) { - ZFREE(strm, state); - strm->state = Z_NULL; - } - return ret; -} - -int ZEXPORT inflateInit_(strm, version, stream_size) -z_streamp strm; -const char *version; -int stream_size; -{ - return inflateInit2_(strm, DEF_WBITS, version, stream_size); -} - -int ZEXPORT inflatePrime(strm, bits, value) -z_streamp strm; -int bits; -int value; -{ - struct inflate_state FAR *state; - - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; - state = (struct inflate_state FAR *)strm->state; - if (bits < 0) { - state->hold = 0; - state->bits = 0; - return Z_OK; - } - if (bits > 16 || state->bits + bits > 32) return Z_STREAM_ERROR; - value &= (1L << bits) - 1; - state->hold += value << state->bits; - state->bits += bits; - return Z_OK; -} - -/* - Return state with length and distance decoding tables and index sizes set to - fixed code decoding. Normally this returns fixed tables from inffixed.h. - If BUILDFIXED is defined, then instead this routine builds the tables the - first time it's called, and returns those tables the first time and - thereafter. This reduces the size of the code by about 2K bytes, in - exchange for a little execution time. However, BUILDFIXED should not be - used for threaded applications, since the rewriting of the tables and virgin - may not be thread-safe. - */ -local void fixedtables(state) -struct inflate_state FAR *state; -{ -#ifdef BUILDFIXED - static int virgin = 1; - static code *lenfix, *distfix; - static code fixed[544]; - - /* build fixed huffman tables if first call (may not be thread safe) */ - if (virgin) { - unsigned sym, bits; - static code *next; - - /* literal/length table */ - sym = 0; - while (sym < 144) state->lens[sym++] = 8; - while (sym < 256) state->lens[sym++] = 9; - while (sym < 280) state->lens[sym++] = 7; - while (sym < 288) state->lens[sym++] = 8; - next = fixed; - lenfix = next; - bits = 9; - inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work); - - /* distance table */ - sym = 0; - while (sym < 32) state->lens[sym++] = 5; - distfix = next; - bits = 5; - inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work); - - /* do this just once */ - virgin = 0; - } -#else /* !BUILDFIXED */ -# include "inffixed.h" -#endif /* BUILDFIXED */ - state->lencode = lenfix; - state->lenbits = 9; - state->distcode = distfix; - state->distbits = 5; -} - -#ifdef MAKEFIXED -#include - -/* - Write out the inffixed.h that is #include'd above. Defining MAKEFIXED also - defines BUILDFIXED, so the tables are built on the fly. makefixed() writes - those tables to stdout, which would be piped to inffixed.h. A small program - can simply call makefixed to do this: - - void makefixed(void); - - int main(void) - { - makefixed(); - return 0; - } - - Then that can be linked with zlib built with MAKEFIXED defined and run: - - a.out > inffixed.h - */ -void makefixed() -{ - unsigned low, size; - struct inflate_state state; - - fixedtables(&state); - puts(" /* inffixed.h -- table for decoding fixed codes"); - puts(" * Generated automatically by makefixed()."); - puts(" */"); - puts(""); - puts(" /* WARNING: this file should *not* be used by applications."); - puts(" It is part of the implementation of this library and is"); - puts(" subject to change. Applications should only use zlib.h."); - puts(" */"); - puts(""); - size = 1U << 9; - printf(" static const code lenfix[%u] = {", size); - low = 0; - for (;;) { - if ((low % 7) == 0) printf("\n "); - printf("{%u,%u,%d}", state.lencode[low].op, state.lencode[low].bits, - state.lencode[low].val); - if (++low == size) break; - putchar(','); - } - puts("\n };"); - size = 1U << 5; - printf("\n static const code distfix[%u] = {", size); - low = 0; - for (;;) { - if ((low % 6) == 0) printf("\n "); - printf("{%u,%u,%d}", state.distcode[low].op, state.distcode[low].bits, - state.distcode[low].val); - if (++low == size) break; - putchar(','); - } - puts("\n };"); -} -#endif /* MAKEFIXED */ - -/* - Update the window with the last wsize (normally 32K) bytes written before - returning. If window does not exist yet, create it. This is only called - when a window is already in use, or when output has been written during this - inflate call, but the end of the deflate stream has not been reached yet. - It is also called to create a window for dictionary data when a dictionary - is loaded. - - Providing output buffers larger than 32K to inflate() should provide a speed - advantage, since only the last 32K of output is copied to the sliding window - upon return from inflate(), and since all distances after the first 32K of - output will fall in the output data, making match copies simpler and faster. - The advantage may be dependent on the size of the processor's data caches. - */ -local int updatewindow(strm, out) -z_streamp strm; -unsigned out; -{ - struct inflate_state FAR *state; - unsigned copy, dist; - - state = (struct inflate_state FAR *)strm->state; - - /* if it hasn't been done already, allocate space for the window */ - if (state->window == Z_NULL) { - state->window = (unsigned char FAR *) - ZALLOC(strm, 1U << state->wbits, - sizeof(unsigned char)); - if (state->window == Z_NULL) return 1; - } - - /* if window not in use yet, initialize */ - if (state->wsize == 0) { - state->wsize = 1U << state->wbits; - state->wnext = 0; - state->whave = 0; - } - - /* copy state->wsize or less output bytes into the circular window */ - copy = out - strm->avail_out; - if (copy >= state->wsize) { - zmemcpy(state->window, strm->next_out - state->wsize, state->wsize); - state->wnext = 0; - state->whave = state->wsize; - } - else { - dist = state->wsize - state->wnext; - if (dist > copy) dist = copy; - zmemcpy(state->window + state->wnext, strm->next_out - copy, dist); - copy -= dist; - if (copy) { - zmemcpy(state->window, strm->next_out - copy, copy); - state->wnext = copy; - state->whave = state->wsize; - } - else { - state->wnext += dist; - if (state->wnext == state->wsize) state->wnext = 0; - if (state->whave < state->wsize) state->whave += dist; - } - } - return 0; -} - -/* Macros for inflate(): */ - -/* check function to use adler32() for zlib or crc32() for gzip */ -#ifdef GUNZIP -# define UPDATE(check, buf, len) \ - (state->flags ? crc32(check, buf, len) : adler32(check, buf, len)) -#else -# define UPDATE(check, buf, len) adler32(check, buf, len) -#endif - -/* check macros for header crc */ -#ifdef GUNZIP -# define CRC2(check, word) \ - do { \ - hbuf[0] = (unsigned char)(word); \ - hbuf[1] = (unsigned char)((word) >> 8); \ - check = crc32(check, hbuf, 2); \ - } while (0) - -# define CRC4(check, word) \ - do { \ - hbuf[0] = (unsigned char)(word); \ - hbuf[1] = (unsigned char)((word) >> 8); \ - hbuf[2] = (unsigned char)((word) >> 16); \ - hbuf[3] = (unsigned char)((word) >> 24); \ - check = crc32(check, hbuf, 4); \ - } while (0) -#endif - -/* Load registers with state in inflate() for speed */ -#define LOAD() \ - do { \ - put = strm->next_out; \ - left = strm->avail_out; \ - next = strm->next_in; \ - have = strm->avail_in; \ - hold = state->hold; \ - bits = state->bits; \ - } while (0) - -/* Restore state from registers in inflate() */ -#define RESTORE() \ - do { \ - strm->next_out = put; \ - strm->avail_out = left; \ - strm->next_in = next; \ - strm->avail_in = have; \ - state->hold = hold; \ - state->bits = bits; \ - } while (0) - -/* Clear the input bit accumulator */ -#define INITBITS() \ - do { \ - hold = 0; \ - bits = 0; \ - } while (0) - -/* Get a byte of input into the bit accumulator, or return from inflate() - if there is no input available. */ -#define PULLBYTE() \ - do { \ - if (have == 0) goto inf_leave; \ - have--; \ - hold += (unsigned long)(*next++) << bits; \ - bits += 8; \ - } while (0) - -/* Assure that there are at least n bits in the bit accumulator. If there is - not enough available input to do that, then return from inflate(). */ -#define NEEDBITS(n) \ - do { \ - while (bits < (unsigned)(n)) \ - PULLBYTE(); \ - } while (0) - -/* Return the low n bits of the bit accumulator (n < 16) */ -#define BITS(n) \ - ((unsigned)hold & ((1U << (n)) - 1)) - -/* Remove n bits from the bit accumulator */ -#define DROPBITS(n) \ - do { \ - hold >>= (n); \ - bits -= (unsigned)(n); \ - } while (0) - -/* Remove zero to seven bits as needed to go to a byte boundary */ -#define BYTEBITS() \ - do { \ - hold >>= bits & 7; \ - bits -= bits & 7; \ - } while (0) - -/* Reverse the bytes in a 32-bit value */ -#define REVERSE(q) \ - ((((q) >> 24) & 0xff) + (((q) >> 8) & 0xff00) + \ - (((q) & 0xff00) << 8) + (((q) & 0xff) << 24)) - -/* - inflate() uses a state machine to process as much input data and generate as - much output data as possible before returning. The state machine is - structured roughly as follows: - - for (;;) switch (state) { - ... - case STATEn: - if (not enough input data or output space to make progress) - return; - ... make progress ... - state = STATEm; - break; - ... - } - - so when inflate() is called again, the same case is attempted again, and - if the appropriate resources are provided, the machine proceeds to the - next state. The NEEDBITS() macro is usually the way the state evaluates - whether it can proceed or should return. NEEDBITS() does the return if - the requested bits are not available. The typical use of the BITS macros - is: - - NEEDBITS(n); - ... do something with BITS(n) ... - DROPBITS(n); - - where NEEDBITS(n) either returns from inflate() if there isn't enough - input left to load n bits into the accumulator, or it continues. BITS(n) - gives the low n bits in the accumulator. When done, DROPBITS(n) drops - the low n bits off the accumulator. INITBITS() clears the accumulator - and sets the number of available bits to zero. BYTEBITS() discards just - enough bits to put the accumulator on a byte boundary. After BYTEBITS() - and a NEEDBITS(8), then BITS(8) would return the next byte in the stream. - - NEEDBITS(n) uses PULLBYTE() to get an available byte of input, or to return - if there is no input available. The decoding of variable length codes uses - PULLBYTE() directly in order to pull just enough bytes to decode the next - code, and no more. - - Some states loop until they get enough input, making sure that enough - state information is maintained to continue the loop where it left off - if NEEDBITS() returns in the loop. For example, want, need, and keep - would all have to actually be part of the saved state in case NEEDBITS() - returns: - - case STATEw: - while (want < need) { - NEEDBITS(n); - keep[want++] = BITS(n); - DROPBITS(n); - } - state = STATEx; - case STATEx: - - As shown above, if the next state is also the next case, then the break - is omitted. - - A state may also return if there is not enough output space available to - complete that state. Those states are copying stored data, writing a - literal byte, and copying a matching string. - - When returning, a "goto inf_leave" is used to update the total counters, - update the check value, and determine whether any progress has been made - during that inflate() call in order to return the proper return code. - Progress is defined as a change in either strm->avail_in or strm->avail_out. - When there is a window, goto inf_leave will update the window with the last - output written. If a goto inf_leave occurs in the middle of decompression - and there is no window currently, goto inf_leave will create one and copy - output to the window for the next call of inflate(). - - In this implementation, the flush parameter of inflate() only affects the - return code (per zlib.h). inflate() always writes as much as possible to - strm->next_out, given the space available and the provided input--the effect - documented in zlib.h of Z_SYNC_FLUSH. Furthermore, inflate() always defers - the allocation of and copying into a sliding window until necessary, which - provides the effect documented in zlib.h for Z_FINISH when the entire input - stream available. So the only thing the flush parameter actually does is: - when flush is set to Z_FINISH, inflate() cannot return Z_OK. Instead it - will return Z_BUF_ERROR if it has not reached the end of the stream. - */ - -int ZEXPORT inflate(strm, flush) -z_streamp strm; -int flush; -{ - struct inflate_state FAR *state; - unsigned char FAR *next; /* next input */ - unsigned char FAR *put; /* next output */ - unsigned have, left; /* available input and output */ - unsigned long hold; /* bit buffer */ - unsigned bits; /* bits in bit buffer */ - unsigned in, out; /* save starting available input and output */ - unsigned copy; /* number of stored or match bytes to copy */ - unsigned char FAR *from; /* where to copy match bytes from */ - code here; /* current decoding table entry */ - code last; /* parent table entry */ - unsigned len; /* length to copy for repeats, bits to drop */ - int ret; /* return code */ -#ifdef GUNZIP - unsigned char hbuf[4]; /* buffer for gzip header crc calculation */ -#endif - static const unsigned short order[19] = /* permutation of code lengths */ - {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}; - - if (strm == Z_NULL || strm->state == Z_NULL || strm->next_out == Z_NULL || - (strm->next_in == Z_NULL && strm->avail_in != 0)) - return Z_STREAM_ERROR; - - state = (struct inflate_state FAR *)strm->state; - if (state->mode == TYPE) state->mode = TYPEDO; /* skip check */ - LOAD(); - in = have; - out = left; - ret = Z_OK; - for (;;) - switch (state->mode) { - case HEAD: - if (state->wrap == 0) { - state->mode = TYPEDO; - break; - } - NEEDBITS(16); -#ifdef GUNZIP - if ((state->wrap & 2) && hold == 0x8b1f) { /* gzip header */ - state->check = crc32(0L, Z_NULL, 0); - CRC2(state->check, hold); - INITBITS(); - state->mode = FLAGS; - break; - } - state->flags = 0; /* expect zlib header */ - if (state->head != Z_NULL) - state->head->done = -1; - if (!(state->wrap & 1) || /* check if zlib header allowed */ -#else - if ( -#endif - ((BITS(8) << 8) + (hold >> 8)) % 31) { - strm->msg = (char *)"incorrect header check"; - state->mode = BAD; - break; - } - if (BITS(4) != Z_DEFLATED) { - strm->msg = (char *)"unknown compression method"; - state->mode = BAD; - break; - } - DROPBITS(4); - len = BITS(4) + 8; - if (state->wbits == 0) - state->wbits = len; - else if (len > state->wbits) { - strm->msg = (char *)"invalid window size"; - state->mode = BAD; - break; - } - state->dmax = 1U << len; - Tracev((stderr, "inflate: zlib header ok\n")); - strm->adler = state->check = adler32(0L, Z_NULL, 0); - state->mode = hold & 0x200 ? DICTID : TYPE; - INITBITS(); - break; -#ifdef GUNZIP - case FLAGS: - NEEDBITS(16); - state->flags = (int)(hold); - if ((state->flags & 0xff) != Z_DEFLATED) { - strm->msg = (char *)"unknown compression method"; - state->mode = BAD; - break; - } - if (state->flags & 0xe000) { - strm->msg = (char *)"unknown header flags set"; - state->mode = BAD; - break; - } - if (state->head != Z_NULL) - state->head->text = (int)((hold >> 8) & 1); - if (state->flags & 0x0200) CRC2(state->check, hold); - INITBITS(); - state->mode = TIME; - case TIME: - NEEDBITS(32); - if (state->head != Z_NULL) - state->head->time = hold; - if (state->flags & 0x0200) CRC4(state->check, hold); - INITBITS(); - state->mode = OS; - case OS: - NEEDBITS(16); - if (state->head != Z_NULL) { - state->head->xflags = (int)(hold & 0xff); - state->head->os = (int)(hold >> 8); - } - if (state->flags & 0x0200) CRC2(state->check, hold); - INITBITS(); - state->mode = EXLEN; - case EXLEN: - if (state->flags & 0x0400) { - NEEDBITS(16); - state->length = (unsigned)(hold); - if (state->head != Z_NULL) - state->head->extra_len = (unsigned)hold; - if (state->flags & 0x0200) CRC2(state->check, hold); - INITBITS(); - } - else if (state->head != Z_NULL) - state->head->extra = Z_NULL; - state->mode = EXTRA; - case EXTRA: - if (state->flags & 0x0400) { - copy = state->length; - if (copy > have) copy = have; - if (copy) { - if (state->head != Z_NULL && - state->head->extra != Z_NULL) { - len = state->head->extra_len - state->length; - zmemcpy(state->head->extra + len, next, - len + copy > state->head->extra_max ? - state->head->extra_max - len : copy); - } - if (state->flags & 0x0200) - state->check = crc32(state->check, next, copy); - have -= copy; - next += copy; - state->length -= copy; - } - if (state->length) goto inf_leave; - } - state->length = 0; - state->mode = NAME; - case NAME: - if (state->flags & 0x0800) { - if (have == 0) goto inf_leave; - copy = 0; - do { - len = (unsigned)(next[copy++]); - if (state->head != Z_NULL && - state->head->name != Z_NULL && - state->length < state->head->name_max) - state->head->name[state->length++] = len; - } while (len && copy < have); - if (state->flags & 0x0200) - state->check = crc32(state->check, next, copy); - have -= copy; - next += copy; - if (len) goto inf_leave; - } - else if (state->head != Z_NULL) - state->head->name = Z_NULL; - state->length = 0; - state->mode = COMMENT; - case COMMENT: - if (state->flags & 0x1000) { - if (have == 0) goto inf_leave; - copy = 0; - do { - len = (unsigned)(next[copy++]); - if (state->head != Z_NULL && - state->head->comment != Z_NULL && - state->length < state->head->comm_max) - state->head->comment[state->length++] = len; - } while (len && copy < have); - if (state->flags & 0x0200) - state->check = crc32(state->check, next, copy); - have -= copy; - next += copy; - if (len) goto inf_leave; - } - else if (state->head != Z_NULL) - state->head->comment = Z_NULL; - state->mode = HCRC; - case HCRC: - if (state->flags & 0x0200) { - NEEDBITS(16); - if (hold != (state->check & 0xffff)) { - strm->msg = (char *)"header crc mismatch"; - state->mode = BAD; - break; - } - INITBITS(); - } - if (state->head != Z_NULL) { - state->head->hcrc = (int)((state->flags >> 9) & 1); - state->head->done = 1; - } - strm->adler = state->check = crc32(0L, Z_NULL, 0); - state->mode = TYPE; - break; -#endif - case DICTID: - NEEDBITS(32); - strm->adler = state->check = REVERSE(hold); - INITBITS(); - state->mode = DICT; - case DICT: - if (state->havedict == 0) { - RESTORE(); - return Z_NEED_DICT; - } - strm->adler = state->check = adler32(0L, Z_NULL, 0); - state->mode = TYPE; - case TYPE: - if (flush == Z_BLOCK || flush == Z_TREES) goto inf_leave; - case TYPEDO: - if (state->last) { - BYTEBITS(); - state->mode = CHECK; - break; - } - NEEDBITS(3); - state->last = BITS(1); - DROPBITS(1); - switch (BITS(2)) { - case 0: /* stored block */ - Tracev((stderr, "inflate: stored block%s\n", - state->last ? " (last)" : "")); - state->mode = STORED; - break; - case 1: /* fixed block */ - fixedtables(state); - Tracev((stderr, "inflate: fixed codes block%s\n", - state->last ? " (last)" : "")); - state->mode = LEN_; /* decode codes */ - if (flush == Z_TREES) { - DROPBITS(2); - goto inf_leave; - } - break; - case 2: /* dynamic block */ - Tracev((stderr, "inflate: dynamic codes block%s\n", - state->last ? " (last)" : "")); - state->mode = TABLE; - break; - case 3: - strm->msg = (char *)"invalid block type"; - state->mode = BAD; - } - DROPBITS(2); - break; - case STORED: - BYTEBITS(); /* go to byte boundary */ - NEEDBITS(32); - if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) { - strm->msg = (char *)"invalid stored block lengths"; - state->mode = BAD; - break; - } - state->length = (unsigned)hold & 0xffff; - Tracev((stderr, "inflate: stored length %u\n", - state->length)); - INITBITS(); - state->mode = COPY_; - if (flush == Z_TREES) goto inf_leave; - case COPY_: - state->mode = COPY; - case COPY: - copy = state->length; - if (copy) { - if (copy > have) copy = have; - if (copy > left) copy = left; - if (copy == 0) goto inf_leave; - zmemcpy(put, next, copy); - have -= copy; - next += copy; - left -= copy; - put += copy; - state->length -= copy; - break; - } - Tracev((stderr, "inflate: stored end\n")); - state->mode = TYPE; - break; - case TABLE: - NEEDBITS(14); - state->nlen = BITS(5) + 257; - DROPBITS(5); - state->ndist = BITS(5) + 1; - DROPBITS(5); - state->ncode = BITS(4) + 4; - DROPBITS(4); -#ifndef PKZIP_BUG_WORKAROUND - if (state->nlen > 286 || state->ndist > 30) { - strm->msg = (char *)"too many length or distance symbols"; - state->mode = BAD; - break; - } -#endif - Tracev((stderr, "inflate: table sizes ok\n")); - state->have = 0; - state->mode = LENLENS; - case LENLENS: - while (state->have < state->ncode) { - NEEDBITS(3); - state->lens[order[state->have++]] = (unsigned short)BITS(3); - DROPBITS(3); - } - while (state->have < 19) - state->lens[order[state->have++]] = 0; - state->next = state->codes; - state->lencode = (code const FAR *)(state->next); - state->lenbits = 7; - ret = inflate_table(CODES, state->lens, 19, &(state->next), - &(state->lenbits), state->work); - if (ret) { - strm->msg = (char *)"invalid code lengths set"; - state->mode = BAD; - break; - } - Tracev((stderr, "inflate: code lengths ok\n")); - state->have = 0; - state->mode = CODELENS; - case CODELENS: - while (state->have < state->nlen + state->ndist) { - for (;;) { - here = state->lencode[BITS(state->lenbits)]; - if ((unsigned)(here.bits) <= bits) break; - PULLBYTE(); - } - if (here.val < 16) { - NEEDBITS(here.bits); - DROPBITS(here.bits); - state->lens[state->have++] = here.val; - } - else { - if (here.val == 16) { - NEEDBITS(here.bits + 2); - DROPBITS(here.bits); - if (state->have == 0) { - strm->msg = (char *)"invalid bit length repeat"; - state->mode = BAD; - break; - } - len = state->lens[state->have - 1]; - copy = 3 + BITS(2); - DROPBITS(2); - } - else if (here.val == 17) { - NEEDBITS(here.bits + 3); - DROPBITS(here.bits); - len = 0; - copy = 3 + BITS(3); - DROPBITS(3); - } - else { - NEEDBITS(here.bits + 7); - DROPBITS(here.bits); - len = 0; - copy = 11 + BITS(7); - DROPBITS(7); - } - if (state->have + copy > state->nlen + state->ndist) { - strm->msg = (char *)"invalid bit length repeat"; - state->mode = BAD; - break; - } - while (copy--) - state->lens[state->have++] = (unsigned short)len; - } - } - - /* handle error breaks in while */ - if (state->mode == BAD) break; - - /* check for end-of-block code (better have one) */ - if (state->lens[256] == 0) { - strm->msg = (char *)"invalid code -- missing end-of-block"; - state->mode = BAD; - break; - } - - /* build code tables -- note: do not change the lenbits or distbits - values here (9 and 6) without reading the comments in inftrees.h - concerning the ENOUGH constants, which depend on those values */ - state->next = state->codes; - state->lencode = (code const FAR *)(state->next); - state->lenbits = 9; - ret = inflate_table(LENS, state->lens, state->nlen, &(state->next), - &(state->lenbits), state->work); - if (ret) { - strm->msg = (char *)"invalid literal/lengths set"; - state->mode = BAD; - break; - } - state->distcode = (code const FAR *)(state->next); - state->distbits = 6; - ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist, - &(state->next), &(state->distbits), state->work); - if (ret) { - strm->msg = (char *)"invalid distances set"; - state->mode = BAD; - break; - } - Tracev((stderr, "inflate: codes ok\n")); - state->mode = LEN_; - if (flush == Z_TREES) goto inf_leave; - case LEN_: - state->mode = LEN; - case LEN: - if (have >= 6 && left >= 258) { - RESTORE(); - inflate_fast(strm, out); - LOAD(); - if (state->mode == TYPE) - state->back = -1; - break; - } - state->back = 0; - for (;;) { - here = state->lencode[BITS(state->lenbits)]; - if ((unsigned)(here.bits) <= bits) break; - PULLBYTE(); - } - if (here.op && (here.op & 0xf0) == 0) { - last = here; - for (;;) { - here = state->lencode[last.val + - (BITS(last.bits + last.op) >> last.bits)]; - if ((unsigned)(last.bits + here.bits) <= bits) break; - PULLBYTE(); - } - DROPBITS(last.bits); - state->back += last.bits; - } - DROPBITS(here.bits); - state->back += here.bits; - state->length = (unsigned)here.val; - if ((int)(here.op) == 0) { - Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ? - "inflate: literal '%c'\n" : - "inflate: literal 0x%02x\n", here.val)); - state->mode = LIT; - break; - } - if (here.op & 32) { - Tracevv((stderr, "inflate: end of block\n")); - state->back = -1; - state->mode = TYPE; - break; - } - if (here.op & 64) { - strm->msg = (char *)"invalid literal/length code"; - state->mode = BAD; - break; - } - state->extra = (unsigned)(here.op) & 15; - state->mode = LENEXT; - case LENEXT: - if (state->extra) { - NEEDBITS(state->extra); - state->length += BITS(state->extra); - DROPBITS(state->extra); - state->back += state->extra; - } - Tracevv((stderr, "inflate: length %u\n", state->length)); - state->was = state->length; - state->mode = DIST; - case DIST: - for (;;) { - here = state->distcode[BITS(state->distbits)]; - if ((unsigned)(here.bits) <= bits) break; - PULLBYTE(); - } - if ((here.op & 0xf0) == 0) { - last = here; - for (;;) { - here = state->distcode[last.val + - (BITS(last.bits + last.op) >> last.bits)]; - if ((unsigned)(last.bits + here.bits) <= bits) break; - PULLBYTE(); - } - DROPBITS(last.bits); - state->back += last.bits; - } - DROPBITS(here.bits); - state->back += here.bits; - if (here.op & 64) { - strm->msg = (char *)"invalid distance code"; - state->mode = BAD; - break; - } - state->offset = (unsigned)here.val; - state->extra = (unsigned)(here.op) & 15; - state->mode = DISTEXT; - case DISTEXT: - if (state->extra) { - NEEDBITS(state->extra); - state->offset += BITS(state->extra); - DROPBITS(state->extra); - state->back += state->extra; - } -#ifdef INFLATE_STRICT - if (state->offset > state->dmax) { - strm->msg = (char *)"invalid distance too far back"; - state->mode = BAD; - break; - } -#endif - Tracevv((stderr, "inflate: distance %u\n", state->offset)); - state->mode = MATCH; - case MATCH: - if (left == 0) goto inf_leave; - copy = out - left; - if (state->offset > copy) { /* copy from window */ - copy = state->offset - copy; - if (copy > state->whave) { - if (state->sane) { - strm->msg = (char *)"invalid distance too far back"; - state->mode = BAD; - break; - } -#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR - Trace((stderr, "inflate.c too far\n")); - copy -= state->whave; - if (copy > state->length) copy = state->length; - if (copy > left) copy = left; - left -= copy; - state->length -= copy; - do { - *put++ = 0; - } while (--copy); - if (state->length == 0) state->mode = LEN; - break; -#endif - } - if (copy > state->wnext) { - copy -= state->wnext; - from = state->window + (state->wsize - copy); - } - else - from = state->window + (state->wnext - copy); - if (copy > state->length) copy = state->length; - } - else { /* copy from output */ - from = put - state->offset; - copy = state->length; - } - if (copy > left) copy = left; - left -= copy; - state->length -= copy; - do { - *put++ = *from++; - } while (--copy); - if (state->length == 0) state->mode = LEN; - break; - case LIT: - if (left == 0) goto inf_leave; - *put++ = (unsigned char)(state->length); - left--; - state->mode = LEN; - break; - case CHECK: - if (state->wrap) { - NEEDBITS(32); - out -= left; - strm->total_out += out; - state->total += out; - if (out) - strm->adler = state->check = - UPDATE(state->check, put - out, out); - out = left; - if (( -#ifdef GUNZIP - state->flags ? hold : -#endif - REVERSE(hold)) != state->check) { - strm->msg = (char *)"incorrect data check"; - state->mode = BAD; - break; - } - INITBITS(); - Tracev((stderr, "inflate: check matches trailer\n")); - } -#ifdef GUNZIP - state->mode = LENGTH; - case LENGTH: - if (state->wrap && state->flags) { - NEEDBITS(32); - if (hold != (state->total & 0xffffffffUL)) { - strm->msg = (char *)"incorrect length check"; - state->mode = BAD; - break; - } - INITBITS(); - Tracev((stderr, "inflate: length matches trailer\n")); - } -#endif - state->mode = DONE; - case DONE: - ret = Z_STREAM_END; - goto inf_leave; - case BAD: - ret = Z_DATA_ERROR; - goto inf_leave; - case MEM: - return Z_MEM_ERROR; - case SYNC: - default: - return Z_STREAM_ERROR; - } - - /* - Return from inflate(), updating the total counts and the check value. - If there was no progress during the inflate() call, return a buffer - error. Call updatewindow() to create and/or update the window state. - Note: a memory error from inflate() is non-recoverable. - */ - inf_leave: - RESTORE(); - if (state->wsize || (state->mode < CHECK && out != strm->avail_out)) - if (updatewindow(strm, out)) { - state->mode = MEM; - return Z_MEM_ERROR; - } - in -= strm->avail_in; - out -= strm->avail_out; - strm->total_in += in; - strm->total_out += out; - state->total += out; - if (state->wrap && out) - strm->adler = state->check = - UPDATE(state->check, strm->next_out - out, out); - strm->data_type = state->bits + (state->last ? 64 : 0) + - (state->mode == TYPE ? 128 : 0) + - (state->mode == LEN_ || state->mode == COPY_ ? 256 : 0); - if (((in == 0 && out == 0) || flush == Z_FINISH) && ret == Z_OK) - ret = Z_BUF_ERROR; - return ret; -} - -int ZEXPORT inflateEnd(strm) -z_streamp strm; -{ - struct inflate_state FAR *state; - if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0) - return Z_STREAM_ERROR; - state = (struct inflate_state FAR *)strm->state; - if (state->window != Z_NULL) ZFREE(strm, state->window); - ZFREE(strm, strm->state); - strm->state = Z_NULL; - Tracev((stderr, "inflate: end\n")); - return Z_OK; -} - -int ZEXPORT inflateSetDictionary(strm, dictionary, dictLength) -z_streamp strm; -const Bytef *dictionary; -uInt dictLength; -{ - struct inflate_state FAR *state; - unsigned long id; - - /* check state */ - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; - state = (struct inflate_state FAR *)strm->state; - if (state->wrap != 0 && state->mode != DICT) - return Z_STREAM_ERROR; - - /* check for correct dictionary id */ - if (state->mode == DICT) { - id = adler32(0L, Z_NULL, 0); - id = adler32(id, dictionary, dictLength); - if (id != state->check) - return Z_DATA_ERROR; - } - - /* copy dictionary to window */ - if (updatewindow(strm, strm->avail_out)) { - state->mode = MEM; - return Z_MEM_ERROR; - } - if (dictLength > state->wsize) { - zmemcpy(state->window, dictionary + dictLength - state->wsize, - state->wsize); - state->whave = state->wsize; - } - else { - zmemcpy(state->window + state->wsize - dictLength, dictionary, - dictLength); - state->whave = dictLength; - } - state->havedict = 1; - Tracev((stderr, "inflate: dictionary set\n")); - return Z_OK; -} - -int ZEXPORT inflateGetHeader(strm, head) -z_streamp strm; -gz_headerp head; -{ - struct inflate_state FAR *state; - - /* check state */ - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; - state = (struct inflate_state FAR *)strm->state; - if ((state->wrap & 2) == 0) return Z_STREAM_ERROR; - - /* save header structure */ - state->head = head; - head->done = 0; - return Z_OK; -} - -/* - Search buf[0..len-1] for the pattern: 0, 0, 0xff, 0xff. Return when found - or when out of input. When called, *have is the number of pattern bytes - found in order so far, in 0..3. On return *have is updated to the new - state. If on return *have equals four, then the pattern was found and the - return value is how many bytes were read including the last byte of the - pattern. If *have is less than four, then the pattern has not been found - yet and the return value is len. In the latter case, syncsearch() can be - called again with more data and the *have state. *have is initialized to - zero for the first call. - */ -local unsigned syncsearch(have, buf, len) -unsigned FAR *have; -unsigned char FAR *buf; -unsigned len; -{ - unsigned got; - unsigned next; - - got = *have; - next = 0; - while (next < len && got < 4) { - if ((int)(buf[next]) == (got < 2 ? 0 : 0xff)) - got++; - else if (buf[next]) - got = 0; - else - got = 4 - got; - next++; - } - *have = got; - return next; -} - -int ZEXPORT inflateSync(strm) -z_streamp strm; -{ - unsigned len; /* number of bytes to look at or looked at */ - unsigned long in, out; /* temporary to save total_in and total_out */ - unsigned char buf[4]; /* to restore bit buffer to byte string */ - struct inflate_state FAR *state; - - /* check parameters */ - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; - state = (struct inflate_state FAR *)strm->state; - if (strm->avail_in == 0 && state->bits < 8) return Z_BUF_ERROR; - - /* if first time, start search in bit buffer */ - if (state->mode != SYNC) { - state->mode = SYNC; - state->hold <<= state->bits & 7; - state->bits -= state->bits & 7; - len = 0; - while (state->bits >= 8) { - buf[len++] = (unsigned char)(state->hold); - state->hold >>= 8; - state->bits -= 8; - } - state->have = 0; - syncsearch(&(state->have), buf, len); - } - - /* search available input */ - len = syncsearch(&(state->have), strm->next_in, strm->avail_in); - strm->avail_in -= len; - strm->next_in += len; - strm->total_in += len; - - /* return no joy or set up to restart inflate() on a new block */ - if (state->have != 4) return Z_DATA_ERROR; - in = strm->total_in; out = strm->total_out; - inflateReset(strm); - strm->total_in = in; strm->total_out = out; - state->mode = TYPE; - return Z_OK; -} - -/* - Returns true if inflate is currently at the end of a block generated by - Z_SYNC_FLUSH or Z_FULL_FLUSH. This function is used by one PPP - implementation to provide an additional safety check. PPP uses - Z_SYNC_FLUSH but removes the length bytes of the resulting empty stored - block. When decompressing, PPP checks that at the end of input packet, - inflate is waiting for these length bytes. - */ -int ZEXPORT inflateSyncPoint(strm) -z_streamp strm; -{ - struct inflate_state FAR *state; - - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; - state = (struct inflate_state FAR *)strm->state; - return state->mode == STORED && state->bits == 0; -} - -int ZEXPORT inflateCopy(dest, source) -z_streamp dest; -z_streamp source; -{ - struct inflate_state FAR *state; - struct inflate_state FAR *copy; - unsigned char FAR *window; - unsigned wsize; - - /* check input */ - if (dest == Z_NULL || source == Z_NULL || source->state == Z_NULL || - source->zalloc == (alloc_func)0 || source->zfree == (free_func)0) - return Z_STREAM_ERROR; - state = (struct inflate_state FAR *)source->state; - - /* allocate space */ - copy = (struct inflate_state FAR *) - ZALLOC(source, 1, sizeof(struct inflate_state)); - if (copy == Z_NULL) return Z_MEM_ERROR; - window = Z_NULL; - if (state->window != Z_NULL) { - window = (unsigned char FAR *) - ZALLOC(source, 1U << state->wbits, sizeof(unsigned char)); - if (window == Z_NULL) { - ZFREE(source, copy); - return Z_MEM_ERROR; - } - } - - /* copy state */ - zmemcpy(dest, source, sizeof(z_stream)); - zmemcpy(copy, state, sizeof(struct inflate_state)); - if (state->lencode >= state->codes && - state->lencode <= state->codes + ENOUGH - 1) { - copy->lencode = copy->codes + (state->lencode - state->codes); - copy->distcode = copy->codes + (state->distcode - state->codes); - } - copy->next = copy->codes + (state->next - state->codes); - if (window != Z_NULL) { - wsize = 1U << state->wbits; - zmemcpy(window, state->window, wsize); - } - copy->window = window; - dest->state = (struct internal_state FAR *)copy; - return Z_OK; -} - -int ZEXPORT inflateUndermine(strm, subvert) -z_streamp strm; -int subvert; -{ - struct inflate_state FAR *state; - - if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; - state = (struct inflate_state FAR *)strm->state; - state->sane = !subvert; -#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR - return Z_OK; -#else - state->sane = 1; - return Z_DATA_ERROR; -#endif -} - -long ZEXPORT inflateMark(strm) -z_streamp strm; -{ - struct inflate_state FAR *state; - - if (strm == Z_NULL || strm->state == Z_NULL) return -1L << 16; - state = (struct inflate_state FAR *)strm->state; - return ((long)(state->back) << 16) + - (state->mode == COPY ? state->length : - (state->mode == MATCH ? state->was - state->length : 0)); -} diff --git a/libs/libwebsockets/win32port/zlib/inflate.h b/libs/libwebsockets/win32port/zlib/inflate.h deleted file mode 100644 index a8ef4287df..0000000000 --- a/libs/libwebsockets/win32port/zlib/inflate.h +++ /dev/null @@ -1,122 +0,0 @@ -/* inflate.h -- internal inflate state definition - * Copyright (C) 1995-2009 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -/* WARNING: this file should *not* be used by applications. It is - part of the implementation of the compression library and is - subject to change. Applications should only use zlib.h. - */ - -/* define NO_GZIP when compiling if you want to disable gzip header and - trailer decoding by inflate(). NO_GZIP would be used to avoid linking in - the crc code when it is not needed. For shared libraries, gzip decoding - should be left enabled. */ -#ifndef NO_GZIP -# define GUNZIP -#endif - -/* Possible inflate modes between inflate() calls */ -typedef enum { - HEAD, /* i: waiting for magic header */ - FLAGS, /* i: waiting for method and flags (gzip) */ - TIME, /* i: waiting for modification time (gzip) */ - OS, /* i: waiting for extra flags and operating system (gzip) */ - EXLEN, /* i: waiting for extra length (gzip) */ - EXTRA, /* i: waiting for extra bytes (gzip) */ - NAME, /* i: waiting for end of file name (gzip) */ - COMMENT, /* i: waiting for end of comment (gzip) */ - HCRC, /* i: waiting for header crc (gzip) */ - DICTID, /* i: waiting for dictionary check value */ - DICT, /* waiting for inflateSetDictionary() call */ - TYPE, /* i: waiting for type bits, including last-flag bit */ - TYPEDO, /* i: same, but skip check to exit inflate on new block */ - STORED, /* i: waiting for stored size (length and complement) */ - COPY_, /* i/o: same as COPY below, but only first time in */ - COPY, /* i/o: waiting for input or output to copy stored block */ - TABLE, /* i: waiting for dynamic block table lengths */ - LENLENS, /* i: waiting for code length code lengths */ - CODELENS, /* i: waiting for length/lit and distance code lengths */ - LEN_, /* i: same as LEN below, but only first time in */ - LEN, /* i: waiting for length/lit/eob code */ - LENEXT, /* i: waiting for length extra bits */ - DIST, /* i: waiting for distance code */ - DISTEXT, /* i: waiting for distance extra bits */ - MATCH, /* o: waiting for output space to copy string */ - LIT, /* o: waiting for output space to write literal */ - CHECK, /* i: waiting for 32-bit check value */ - LENGTH, /* i: waiting for 32-bit length (gzip) */ - DONE, /* finished check, done -- remain here until reset */ - BAD, /* got a data error -- remain here until reset */ - MEM, /* got an inflate() memory error -- remain here until reset */ - SYNC /* looking for synchronization bytes to restart inflate() */ -} inflate_mode; - -/* - State transitions between above modes - - - (most modes can go to BAD or MEM on error -- not shown for clarity) - - Process header: - HEAD -> (gzip) or (zlib) or (raw) - (gzip) -> FLAGS -> TIME -> OS -> EXLEN -> EXTRA -> NAME -> COMMENT -> - HCRC -> TYPE - (zlib) -> DICTID or TYPE - DICTID -> DICT -> TYPE - (raw) -> TYPEDO - Read deflate blocks: - TYPE -> TYPEDO -> STORED or TABLE or LEN_ or CHECK - STORED -> COPY_ -> COPY -> TYPE - TABLE -> LENLENS -> CODELENS -> LEN_ - LEN_ -> LEN - Read deflate codes in fixed or dynamic block: - LEN -> LENEXT or LIT or TYPE - LENEXT -> DIST -> DISTEXT -> MATCH -> LEN - LIT -> LEN - Process trailer: - CHECK -> LENGTH -> DONE - */ - -/* state maintained between inflate() calls. Approximately 10K bytes. */ -struct inflate_state { - inflate_mode mode; /* current inflate mode */ - int last; /* true if processing last block */ - int wrap; /* bit 0 true for zlib, bit 1 true for gzip */ - int havedict; /* true if dictionary provided */ - int flags; /* gzip header method and flags (0 if zlib) */ - unsigned dmax; /* zlib header max distance (INFLATE_STRICT) */ - unsigned long check; /* protected copy of check value */ - unsigned long total; /* protected copy of output count */ - gz_headerp head; /* where to save gzip header information */ - /* sliding window */ - unsigned wbits; /* log base 2 of requested window size */ - unsigned wsize; /* window size or zero if not using window */ - unsigned whave; /* valid bytes in the window */ - unsigned wnext; /* window write index */ - unsigned char FAR *window; /* allocated sliding window, if needed */ - /* bit accumulator */ - unsigned long hold; /* input bit accumulator */ - unsigned bits; /* number of bits in "in" */ - /* for string and stored block copying */ - unsigned length; /* literal or length of data to copy */ - unsigned offset; /* distance back to copy string from */ - /* for table and code decoding */ - unsigned extra; /* extra bits needed */ - /* fixed and dynamic code tables */ - code const FAR *lencode; /* starting table for length/literal codes */ - code const FAR *distcode; /* starting table for distance codes */ - unsigned lenbits; /* index bits for lencode */ - unsigned distbits; /* index bits for distcode */ - /* dynamic table building */ - unsigned ncode; /* number of code length code lengths */ - unsigned nlen; /* number of length code lengths */ - unsigned ndist; /* number of distance code lengths */ - unsigned have; /* number of code lengths in lens[] */ - code FAR *next; /* next available space in codes[] */ - unsigned short lens[320]; /* temporary storage for code lengths */ - unsigned short work[288]; /* work area for code table building */ - code codes[ENOUGH]; /* space for code tables */ - int sane; /* if false, allow invalid distance too far */ - int back; /* bits back of last unprocessed length/lit */ - unsigned was; /* initial length of match */ -}; diff --git a/libs/libwebsockets/win32port/zlib/inftrees.c b/libs/libwebsockets/win32port/zlib/inftrees.c deleted file mode 100644 index 9dbaec3368..0000000000 --- a/libs/libwebsockets/win32port/zlib/inftrees.c +++ /dev/null @@ -1,330 +0,0 @@ -/* inftrees.c -- generate Huffman trees for efficient decoding - * Copyright (C) 1995-2010 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -#include "zutil.h" -#include "inftrees.h" - -#define MAXBITS 15 - -const char inflate_copyright[] = - " inflate 1.2.5 Copyright 1995-2010 Mark Adler "; -/* - If you use the zlib library in a product, an acknowledgment is welcome - in the documentation of your product. If for some reason you cannot - include such an acknowledgment, I would appreciate that you keep this - copyright string in the executable of your product. - */ - -/* - Build a set of tables to decode the provided canonical Huffman code. - The code lengths are lens[0..codes-1]. The result starts at *table, - whose indices are 0..2^bits-1. work is a writable array of at least - lens shorts, which is used as a work area. type is the type of code - to be generated, CODES, LENS, or DISTS. On return, zero is success, - -1 is an invalid code, and +1 means that ENOUGH isn't enough. table - on return points to the next available entry's address. bits is the - requested root table index bits, and on return it is the actual root - table index bits. It will differ if the request is greater than the - longest code or if it is less than the shortest code. - */ -int ZLIB_INTERNAL inflate_table(type, lens, codes, table, bits, work) -codetype type; -unsigned short FAR *lens; -unsigned codes; -code FAR * FAR *table; -unsigned FAR *bits; -unsigned short FAR *work; -{ - unsigned len; /* a code's length in bits */ - unsigned sym; /* index of code symbols */ - unsigned min, max; /* minimum and maximum code lengths */ - unsigned root; /* number of index bits for root table */ - unsigned curr; /* number of index bits for current table */ - unsigned drop; /* code bits to drop for sub-table */ - int left; /* number of prefix codes available */ - unsigned used; /* code entries in table used */ - unsigned huff; /* Huffman code */ - unsigned incr; /* for incrementing code, index */ - unsigned fill; /* index for replicating entries */ - unsigned low; /* low bits for current root entry */ - unsigned mask; /* mask for low root bits */ - code here; /* table entry for duplication */ - code FAR *next; /* next available space in table */ - const unsigned short FAR *base; /* base value table to use */ - const unsigned short FAR *extra; /* extra bits table to use */ - int end; /* use base and extra for symbol > end */ - unsigned short count[MAXBITS+1]; /* number of codes of each length */ - unsigned short offs[MAXBITS+1]; /* offsets in table for each length */ - static const unsigned short lbase[31] = { /* Length codes 257..285 base */ - 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31, - 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0}; - static const unsigned short lext[31] = { /* Length codes 257..285 extra */ - 16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18, - 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 73, 195}; - static const unsigned short dbase[32] = { /* Distance codes 0..29 base */ - 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, - 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, - 8193, 12289, 16385, 24577, 0, 0}; - static const unsigned short dext[32] = { /* Distance codes 0..29 extra */ - 16, 16, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22, - 23, 23, 24, 24, 25, 25, 26, 26, 27, 27, - 28, 28, 29, 29, 64, 64}; - - /* - Process a set of code lengths to create a canonical Huffman code. The - code lengths are lens[0..codes-1]. Each length corresponds to the - symbols 0..codes-1. The Huffman code is generated by first sorting the - symbols by length from short to long, and retaining the symbol order - for codes with equal lengths. Then the code starts with all zero bits - for the first code of the shortest length, and the codes are integer - increments for the same length, and zeros are appended as the length - increases. For the deflate format, these bits are stored backwards - from their more natural integer increment ordering, and so when the - decoding tables are built in the large loop below, the integer codes - are incremented backwards. - - This routine assumes, but does not check, that all of the entries in - lens[] are in the range 0..MAXBITS. The caller must assure this. - 1..MAXBITS is interpreted as that code length. zero means that that - symbol does not occur in this code. - - The codes are sorted by computing a count of codes for each length, - creating from that a table of starting indices for each length in the - sorted table, and then entering the symbols in order in the sorted - table. The sorted table is work[], with that space being provided by - the caller. - - The length counts are used for other purposes as well, i.e. finding - the minimum and maximum length codes, determining if there are any - codes at all, checking for a valid set of lengths, and looking ahead - at length counts to determine sub-table sizes when building the - decoding tables. - */ - - /* accumulate lengths for codes (assumes lens[] all in 0..MAXBITS) */ - for (len = 0; len <= MAXBITS; len++) - count[len] = 0; - for (sym = 0; sym < codes; sym++) - count[lens[sym]]++; - - /* bound code lengths, force root to be within code lengths */ - root = *bits; - for (max = MAXBITS; max >= 1; max--) - if (count[max] != 0) break; - if (root > max) root = max; - if (max == 0) { /* no symbols to code at all */ - here.op = (unsigned char)64; /* invalid code marker */ - here.bits = (unsigned char)1; - here.val = (unsigned short)0; - *(*table)++ = here; /* make a table to force an error */ - *(*table)++ = here; - *bits = 1; - return 0; /* no symbols, but wait for decoding to report error */ - } - for (min = 1; min < max; min++) - if (count[min] != 0) break; - if (root < min) root = min; - - /* check for an over-subscribed or incomplete set of lengths */ - left = 1; - for (len = 1; len <= MAXBITS; len++) { - left <<= 1; - left -= count[len]; - if (left < 0) return -1; /* over-subscribed */ - } - if (left > 0 && (type == CODES || max != 1)) - return -1; /* incomplete set */ - - /* generate offsets into symbol table for each length for sorting */ - offs[1] = 0; - for (len = 1; len < MAXBITS; len++) - offs[len + 1] = offs[len] + count[len]; - - /* sort symbols by length, by symbol order within each length */ - for (sym = 0; sym < codes; sym++) - if (lens[sym] != 0) work[offs[lens[sym]]++] = (unsigned short)sym; - - /* - Create and fill in decoding tables. In this loop, the table being - filled is at next and has curr index bits. The code being used is huff - with length len. That code is converted to an index by dropping drop - bits off of the bottom. For codes where len is less than drop + curr, - those top drop + curr - len bits are incremented through all values to - fill the table with replicated entries. - - root is the number of index bits for the root table. When len exceeds - root, sub-tables are created pointed to by the root entry with an index - of the low root bits of huff. This is saved in low to check for when a - new sub-table should be started. drop is zero when the root table is - being filled, and drop is root when sub-tables are being filled. - - When a new sub-table is needed, it is necessary to look ahead in the - code lengths to determine what size sub-table is needed. The length - counts are used for this, and so count[] is decremented as codes are - entered in the tables. - - used keeps track of how many table entries have been allocated from the - provided *table space. It is checked for LENS and DIST tables against - the constants ENOUGH_LENS and ENOUGH_DISTS to guard against changes in - the initial root table size constants. See the comments in inftrees.h - for more information. - - sym increments through all symbols, and the loop terminates when - all codes of length max, i.e. all codes, have been processed. This - routine permits incomplete codes, so another loop after this one fills - in the rest of the decoding tables with invalid code markers. - */ - - /* set up for code type */ - switch (type) { - case CODES: - base = extra = work; /* dummy value--not used */ - end = 19; - break; - case LENS: - base = lbase; - base -= 257; - extra = lext; - extra -= 257; - end = 256; - break; - default: /* DISTS */ - base = dbase; - extra = dext; - end = -1; - } - - /* initialize state for loop */ - huff = 0; /* starting code */ - sym = 0; /* starting code symbol */ - len = min; /* starting code length */ - next = *table; /* current table to fill in */ - curr = root; /* current table index bits */ - drop = 0; /* current bits to drop from code for index */ - low = (unsigned)(-1); /* trigger new sub-table when len > root */ - used = 1U << root; /* use root table entries */ - mask = used - 1; /* mask for comparing low */ - - /* check available table space */ - if ((type == LENS && used >= ENOUGH_LENS) || - (type == DISTS && used >= ENOUGH_DISTS)) - return 1; - - /* process all codes and make table entries */ - for (;;) { - /* create table entry */ - here.bits = (unsigned char)(len - drop); - if ((int)(work[sym]) < end) { - here.op = (unsigned char)0; - here.val = work[sym]; - } - else if ((int)(work[sym]) > end) { - here.op = (unsigned char)(extra[work[sym]]); - here.val = base[work[sym]]; - } - else { - here.op = (unsigned char)(32 + 64); /* end of block */ - here.val = 0; - } - - /* replicate for those indices with low len bits equal to huff */ - incr = 1U << (len - drop); - fill = 1U << curr; - min = fill; /* save offset to next table */ - do { - fill -= incr; - next[(huff >> drop) + fill] = here; - } while (fill != 0); - - /* backwards increment the len-bit code huff */ - incr = 1U << (len - 1); - while (huff & incr) - incr >>= 1; - if (incr != 0) { - huff &= incr - 1; - huff += incr; - } - else - huff = 0; - - /* go to next symbol, update count, len */ - sym++; - if (--(count[len]) == 0) { - if (len == max) break; - len = lens[work[sym]]; - } - - /* create new sub-table if needed */ - if (len > root && (huff & mask) != low) { - /* if first time, transition to sub-tables */ - if (drop == 0) - drop = root; - - /* increment past last table */ - next += min; /* here min is 1 << curr */ - - /* determine length of next table */ - curr = len - drop; - left = (int)(1 << curr); - while (curr + drop < max) { - left -= count[curr + drop]; - if (left <= 0) break; - curr++; - left <<= 1; - } - - /* check for enough space */ - used += 1U << curr; - if ((type == LENS && used >= ENOUGH_LENS) || - (type == DISTS && used >= ENOUGH_DISTS)) - return 1; - - /* point entry in root table to sub-table */ - low = huff & mask; - (*table)[low].op = (unsigned char)curr; - (*table)[low].bits = (unsigned char)root; - (*table)[low].val = (unsigned short)(next - *table); - } - } - - /* - Fill in rest of table for incomplete codes. This loop is similar to the - loop above in incrementing huff for table indices. It is assumed that - len is equal to curr + drop, so there is no loop needed to increment - through high index bits. When the current sub-table is filled, the loop - drops back to the root table to fill in any remaining entries there. - */ - here.op = (unsigned char)64; /* invalid code marker */ - here.bits = (unsigned char)(len - drop); - here.val = (unsigned short)0; - while (huff != 0) { - /* when done with sub-table, drop back to root table */ - if (drop != 0 && (huff & mask) != low) { - drop = 0; - len = root; - next = *table; - here.bits = (unsigned char)len; - } - - /* put invalid code marker in table */ - next[huff >> drop] = here; - - /* backwards increment the len-bit code huff */ - incr = 1U << (len - 1); - while (huff & incr) - incr >>= 1; - if (incr != 0) { - huff &= incr - 1; - huff += incr; - } - else - huff = 0; - } - - /* set return parameters */ - *table += used; - *bits = root; - return 0; -} diff --git a/libs/libwebsockets/win32port/zlib/inftrees.h b/libs/libwebsockets/win32port/zlib/inftrees.h deleted file mode 100644 index a685d8c6ea..0000000000 --- a/libs/libwebsockets/win32port/zlib/inftrees.h +++ /dev/null @@ -1,62 +0,0 @@ -/* inftrees.h -- header to use inftrees.c - * Copyright (C) 1995-2005, 2010 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -/* WARNING: this file should *not* be used by applications. It is - part of the implementation of the compression library and is - subject to change. Applications should only use zlib.h. - */ - -/* Structure for decoding tables. Each entry provides either the - information needed to do the operation requested by the code that - indexed that table entry, or it provides a pointer to another - table that indexes more bits of the code. op indicates whether - the entry is a pointer to another table, a literal, a length or - distance, an end-of-block, or an invalid code. For a table - pointer, the low four bits of op is the number of index bits of - that table. For a length or distance, the low four bits of op - is the number of extra bits to get after the code. bits is - the number of bits in this code or part of the code to drop off - of the bit buffer. val is the actual byte to output in the case - of a literal, the base length or distance, or the offset from - the current table to the next table. Each entry is four bytes. */ -typedef struct { - unsigned char op; /* operation, extra bits, table bits */ - unsigned char bits; /* bits in this part of the code */ - unsigned short val; /* offset in table or code value */ -} code; - -/* op values as set by inflate_table(): - 00000000 - literal - 0000tttt - table link, tttt != 0 is the number of table index bits - 0001eeee - length or distance, eeee is the number of extra bits - 01100000 - end of block - 01000000 - invalid code - */ - -/* Maximum size of the dynamic table. The maximum number of code structures is - 1444, which is the sum of 852 for literal/length codes and 592 for distance - codes. These values were found by exhaustive searches using the program - examples/enough.c found in the zlib distribtution. The arguments to that - program are the number of symbols, the initial root table size, and the - maximum bit length of a code. "enough 286 9 15" for literal/length codes - returns returns 852, and "enough 30 6 15" for distance codes returns 592. - The initial root table size (9 or 6) is found in the fifth argument of the - inflate_table() calls in inflate.c and infback.c. If the root table size is - changed, then these maximum sizes would be need to be recalculated and - updated. */ -#define ENOUGH_LENS 852 -#define ENOUGH_DISTS 592 -#define ENOUGH (ENOUGH_LENS+ENOUGH_DISTS) - -/* Type of code to build for inflate_table() */ -typedef enum { - CODES, - LENS, - DISTS -} codetype; - -int ZLIB_INTERNAL inflate_table OF((codetype type, unsigned short FAR *lens, - unsigned codes, code FAR * FAR *table, - unsigned FAR *bits, unsigned short FAR *work)); diff --git a/libs/libwebsockets/win32port/zlib/trees.c b/libs/libwebsockets/win32port/zlib/trees.c deleted file mode 100644 index b4a317aced..0000000000 --- a/libs/libwebsockets/win32port/zlib/trees.c +++ /dev/null @@ -1,1244 +0,0 @@ -/* trees.c -- output deflated data using Huffman coding - * Copyright (C) 1995-2010 Jean-loup Gailly - * detect_data_type() function provided freely by Cosmin Truta, 2006 - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -/* - * ALGORITHM - * - * The "deflation" process uses several Huffman trees. The more - * common source values are represented by shorter bit sequences. - * - * Each code tree is stored in a compressed form which is itself - * a Huffman encoding of the lengths of all the code strings (in - * ascending order by source values). The actual code strings are - * reconstructed from the lengths in the inflate process, as described - * in the deflate specification. - * - * REFERENCES - * - * Deutsch, L.P.,"'Deflate' Compressed Data Format Specification". - * Available in ftp.uu.net:/pub/archiving/zip/doc/deflate-1.1.doc - * - * Storer, James A. - * Data Compression: Methods and Theory, pp. 49-50. - * Computer Science Press, 1988. ISBN 0-7167-8156-5. - * - * Sedgewick, R. - * Algorithms, p290. - * Addison-Wesley, 1983. ISBN 0-201-06672-6. - */ - -/* @(#) $Id$ */ - -/* #define GEN_TREES_H */ - -#include "deflate.h" - -#ifdef DEBUG -# include -#endif - -/* =========================================================================== - * Constants - */ - -#define MAX_BL_BITS 7 -/* Bit length codes must not exceed MAX_BL_BITS bits */ - -#define END_BLOCK 256 -/* end of block literal code */ - -#define REP_3_6 16 -/* repeat previous bit length 3-6 times (2 bits of repeat count) */ - -#define REPZ_3_10 17 -/* repeat a zero length 3-10 times (3 bits of repeat count) */ - -#define REPZ_11_138 18 -/* repeat a zero length 11-138 times (7 bits of repeat count) */ - -local const int extra_lbits[LENGTH_CODES] /* extra bits for each length code */ - = {0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0}; - -local const int extra_dbits[D_CODES] /* extra bits for each distance code */ - = {0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13}; - -local const int extra_blbits[BL_CODES]/* extra bits for each bit length code */ - = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7}; - -local const uch bl_order[BL_CODES] - = {16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15}; -/* The lengths of the bit length codes are sent in order of decreasing - * probability, to avoid transmitting the lengths for unused bit length codes. - */ - -#define Buf_size (8 * 2*sizeof(char)) -/* Number of bits used within bi_buf. (bi_buf might be implemented on - * more than 16 bits on some systems.) - */ - -/* =========================================================================== - * Local data. These are initialized only once. - */ - -#define DIST_CODE_LEN 512 /* see definition of array dist_code below */ - -#if defined(GEN_TREES_H) || !defined(STDC) -/* non ANSI compilers may not accept trees.h */ - -local ct_data static_ltree[L_CODES+2]; -/* The static literal tree. Since the bit lengths are imposed, there is no - * need for the L_CODES extra codes used during heap construction. However - * The codes 286 and 287 are needed to build a canonical tree (see _tr_init - * below). - */ - -local ct_data static_dtree[D_CODES]; -/* The static distance tree. (Actually a trivial tree since all codes use - * 5 bits.) - */ - -uch _dist_code[DIST_CODE_LEN]; -/* Distance codes. The first 256 values correspond to the distances - * 3 .. 258, the last 256 values correspond to the top 8 bits of - * the 15 bit distances. - */ - -uch _length_code[MAX_MATCH-MIN_MATCH+1]; -/* length code for each normalized match length (0 == MIN_MATCH) */ - -local int base_length[LENGTH_CODES]; -/* First normalized length for each code (0 = MIN_MATCH) */ - -local int base_dist[D_CODES]; -/* First normalized distance for each code (0 = distance of 1) */ - -#else -# include "trees.h" -#endif /* GEN_TREES_H */ - -struct static_tree_desc_s { - const ct_data *static_tree; /* static tree or NULL */ - const intf *extra_bits; /* extra bits for each code or NULL */ - int extra_base; /* base index for extra_bits */ - int elems; /* max number of elements in the tree */ - int max_length; /* max bit length for the codes */ -}; - -local static_tree_desc static_l_desc = -{static_ltree, extra_lbits, LITERALS+1, L_CODES, MAX_BITS}; - -local static_tree_desc static_d_desc = -{static_dtree, extra_dbits, 0, D_CODES, MAX_BITS}; - -local static_tree_desc static_bl_desc = -{(const ct_data *)0, extra_blbits, 0, BL_CODES, MAX_BL_BITS}; - -/* =========================================================================== - * Local (static) routines in this file. - */ - -local void tr_static_init OF((void)); -local void init_block OF((deflate_state *s)); -local void pqdownheap OF((deflate_state *s, ct_data *tree, int k)); -local void gen_bitlen OF((deflate_state *s, tree_desc *desc)); -local void gen_codes OF((ct_data *tree, int max_code, ushf *bl_count)); -local void build_tree OF((deflate_state *s, tree_desc *desc)); -local void scan_tree OF((deflate_state *s, ct_data *tree, int max_code)); -local void send_tree OF((deflate_state *s, ct_data *tree, int max_code)); -local int build_bl_tree OF((deflate_state *s)); -local void send_all_trees OF((deflate_state *s, int lcodes, int dcodes, - int blcodes)); -local void compress_block OF((deflate_state *s, ct_data *ltree, - ct_data *dtree)); -local int detect_data_type OF((deflate_state *s)); -local unsigned bi_reverse OF((unsigned value, int length)); -local void bi_windup OF((deflate_state *s)); -local void bi_flush OF((deflate_state *s)); -local void copy_block OF((deflate_state *s, charf *buf, unsigned len, - int header)); - -#ifdef GEN_TREES_H -local void gen_trees_header OF((void)); -#endif - -#ifndef DEBUG -# define send_code(s, c, tree) send_bits(s, tree[c].Code, tree[c].Len) - /* Send a code of the given tree. c and tree must not have side effects */ - -#else /* DEBUG */ -# define send_code(s, c, tree) \ - { if (z_verbose>2) fprintf(stderr,"\ncd %3d ",(c)); \ - send_bits(s, tree[c].Code, tree[c].Len); } -#endif - -/* =========================================================================== - * Output a short LSB first on the stream. - * IN assertion: there is enough room in pendingBuf. - */ -#define put_short(s, w) { \ - put_byte(s, (uch)((w) & 0xff)); \ - put_byte(s, (uch)((ush)(w) >> 8)); \ -} - -/* =========================================================================== - * Send a value on a given number of bits. - * IN assertion: length <= 16 and value fits in length bits. - */ -#ifdef DEBUG -local void send_bits OF((deflate_state *s, int value, int length)); - -local void send_bits(s, value, length) - deflate_state *s; - int value; /* value to send */ - int length; /* number of bits */ -{ - Tracevv((stderr," l %2d v %4x ", length, value)); - Assert(length > 0 && length <= 15, "invalid length"); - s->bits_sent += (ulg)length; - - /* If not enough room in bi_buf, use (valid) bits from bi_buf and - * (16 - bi_valid) bits from value, leaving (width - (16-bi_valid)) - * unused bits in value. - */ - if (s->bi_valid > (int)Buf_size - length) { - s->bi_buf |= (ush)value << s->bi_valid; - put_short(s, s->bi_buf); - s->bi_buf = (ush)value >> (Buf_size - s->bi_valid); - s->bi_valid += length - Buf_size; - } else { - s->bi_buf |= (ush)value << s->bi_valid; - s->bi_valid += length; - } -} -#else /* !DEBUG */ - -#define send_bits(s, value, length) \ -{ int len = length;\ - if (s->bi_valid > (int)Buf_size - len) {\ - int val = value;\ - s->bi_buf |= (ush)val << s->bi_valid;\ - put_short(s, s->bi_buf);\ - s->bi_buf = (ush)val >> (Buf_size - s->bi_valid);\ - s->bi_valid += len - Buf_size;\ - } else {\ - s->bi_buf |= (ush)(value) << s->bi_valid;\ - s->bi_valid += len;\ - }\ -} -#endif /* DEBUG */ - - -/* the arguments must not have side effects */ - -/* =========================================================================== - * Initialize the various 'constant' tables. - */ -local void tr_static_init() -{ -#if defined(GEN_TREES_H) || !defined(STDC) - static int static_init_done = 0; - int n; /* iterates over tree elements */ - int bits; /* bit counter */ - int length; /* length value */ - int code; /* code value */ - int dist; /* distance index */ - ush bl_count[MAX_BITS+1]; - /* number of codes at each bit length for an optimal tree */ - - if (static_init_done) return; - - /* For some embedded targets, global variables are not initialized: */ -#ifdef NO_INIT_GLOBAL_POINTERS - static_l_desc.static_tree = static_ltree; - static_l_desc.extra_bits = extra_lbits; - static_d_desc.static_tree = static_dtree; - static_d_desc.extra_bits = extra_dbits; - static_bl_desc.extra_bits = extra_blbits; -#endif - - /* Initialize the mapping length (0..255) -> length code (0..28) */ - length = 0; - for (code = 0; code < LENGTH_CODES-1; code++) { - base_length[code] = length; - for (n = 0; n < (1< dist code (0..29) */ - dist = 0; - for (code = 0 ; code < 16; code++) { - base_dist[code] = dist; - for (n = 0; n < (1<>= 7; /* from now on, all distances are divided by 128 */ - for ( ; code < D_CODES; code++) { - base_dist[code] = dist << 7; - for (n = 0; n < (1<<(extra_dbits[code]-7)); n++) { - _dist_code[256 + dist++] = (uch)code; - } - } - Assert (dist == 256, "tr_static_init: 256+dist != 512"); - - /* Construct the codes of the static literal tree */ - for (bits = 0; bits <= MAX_BITS; bits++) bl_count[bits] = 0; - n = 0; - while (n <= 143) static_ltree[n++].Len = 8, bl_count[8]++; - while (n <= 255) static_ltree[n++].Len = 9, bl_count[9]++; - while (n <= 279) static_ltree[n++].Len = 7, bl_count[7]++; - while (n <= 287) static_ltree[n++].Len = 8, bl_count[8]++; - /* Codes 286 and 287 do not exist, but we must include them in the - * tree construction to get a canonical Huffman tree (longest code - * all ones) - */ - gen_codes((ct_data *)static_ltree, L_CODES+1, bl_count); - - /* The static distance tree is trivial: */ - for (n = 0; n < D_CODES; n++) { - static_dtree[n].Len = 5; - static_dtree[n].Code = bi_reverse((unsigned)n, 5); - } - static_init_done = 1; - -# ifdef GEN_TREES_H - gen_trees_header(); -# endif -#endif /* defined(GEN_TREES_H) || !defined(STDC) */ -} - -/* =========================================================================== - * Genererate the file trees.h describing the static trees. - */ -#ifdef GEN_TREES_H -# ifndef DEBUG -# include -# endif - -# define SEPARATOR(i, last, width) \ - ((i) == (last)? "\n};\n\n" : \ - ((i) % (width) == (width)-1 ? ",\n" : ", ")) - -void gen_trees_header() -{ - FILE *header = fopen("trees.h", "w"); - int i; - - Assert (header != NULL, "Can't open trees.h"); - fprintf(header, - "/* header created automatically with -DGEN_TREES_H */\n\n"); - - fprintf(header, "local const ct_data static_ltree[L_CODES+2] = {\n"); - for (i = 0; i < L_CODES+2; i++) { - fprintf(header, "{{%3u},{%3u}}%s", static_ltree[i].Code, - static_ltree[i].Len, SEPARATOR(i, L_CODES+1, 5)); - } - - fprintf(header, "local const ct_data static_dtree[D_CODES] = {\n"); - for (i = 0; i < D_CODES; i++) { - fprintf(header, "{{%2u},{%2u}}%s", static_dtree[i].Code, - static_dtree[i].Len, SEPARATOR(i, D_CODES-1, 5)); - } - - fprintf(header, "const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] = {\n"); - for (i = 0; i < DIST_CODE_LEN; i++) { - fprintf(header, "%2u%s", _dist_code[i], - SEPARATOR(i, DIST_CODE_LEN-1, 20)); - } - - fprintf(header, - "const uch ZLIB_INTERNAL _length_code[MAX_MATCH-MIN_MATCH+1]= {\n"); - for (i = 0; i < MAX_MATCH-MIN_MATCH+1; i++) { - fprintf(header, "%2u%s", _length_code[i], - SEPARATOR(i, MAX_MATCH-MIN_MATCH, 20)); - } - - fprintf(header, "local const int base_length[LENGTH_CODES] = {\n"); - for (i = 0; i < LENGTH_CODES; i++) { - fprintf(header, "%1u%s", base_length[i], - SEPARATOR(i, LENGTH_CODES-1, 20)); - } - - fprintf(header, "local const int base_dist[D_CODES] = {\n"); - for (i = 0; i < D_CODES; i++) { - fprintf(header, "%5u%s", base_dist[i], - SEPARATOR(i, D_CODES-1, 10)); - } - - fclose(header); -} -#endif /* GEN_TREES_H */ - -/* =========================================================================== - * Initialize the tree data structures for a new zlib stream. - */ -void ZLIB_INTERNAL _tr_init(s) - deflate_state *s; -{ - tr_static_init(); - - s->l_desc.dyn_tree = s->dyn_ltree; - s->l_desc.stat_desc = &static_l_desc; - - s->d_desc.dyn_tree = s->dyn_dtree; - s->d_desc.stat_desc = &static_d_desc; - - s->bl_desc.dyn_tree = s->bl_tree; - s->bl_desc.stat_desc = &static_bl_desc; - - s->bi_buf = 0; - s->bi_valid = 0; - s->last_eob_len = 8; /* enough lookahead for inflate */ -#ifdef DEBUG - s->compressed_len = 0L; - s->bits_sent = 0L; -#endif - - /* Initialize the first block of the first file: */ - init_block(s); -} - -/* =========================================================================== - * Initialize a new block. - */ -local void init_block(s) - deflate_state *s; -{ - int n; /* iterates over tree elements */ - - /* Initialize the trees. */ - for (n = 0; n < L_CODES; n++) s->dyn_ltree[n].Freq = 0; - for (n = 0; n < D_CODES; n++) s->dyn_dtree[n].Freq = 0; - for (n = 0; n < BL_CODES; n++) s->bl_tree[n].Freq = 0; - - s->dyn_ltree[END_BLOCK].Freq = 1; - s->opt_len = s->static_len = 0L; - s->last_lit = s->matches = 0; -} - -#define SMALLEST 1 -/* Index within the heap array of least frequent node in the Huffman tree */ - - -/* =========================================================================== - * Remove the smallest element from the heap and recreate the heap with - * one less element. Updates heap and heap_len. - */ -#define pqremove(s, tree, top) \ -{\ - top = s->heap[SMALLEST]; \ - s->heap[SMALLEST] = s->heap[s->heap_len--]; \ - pqdownheap(s, tree, SMALLEST); \ -} - -/* =========================================================================== - * Compares to subtrees, using the tree depth as tie breaker when - * the subtrees have equal frequency. This minimizes the worst case length. - */ -#define smaller(tree, n, m, depth) \ - (tree[n].Freq < tree[m].Freq || \ - (tree[n].Freq == tree[m].Freq && depth[n] <= depth[m])) - -/* =========================================================================== - * Restore the heap property by moving down the tree starting at node k, - * exchanging a node with the smallest of its two sons if necessary, stopping - * when the heap property is re-established (each father smaller than its - * two sons). - */ -local void pqdownheap(s, tree, k) - deflate_state *s; - ct_data *tree; /* the tree to restore */ - int k; /* node to move down */ -{ - int v = s->heap[k]; - int j = k << 1; /* left son of k */ - while (j <= s->heap_len) { - /* Set j to the smallest of the two sons: */ - if (j < s->heap_len && - smaller(tree, s->heap[j+1], s->heap[j], s->depth)) { - j++; - } - /* Exit if v is smaller than both sons */ - if (smaller(tree, v, s->heap[j], s->depth)) break; - - /* Exchange v with the smallest son */ - s->heap[k] = s->heap[j]; k = j; - - /* And continue down the tree, setting j to the left son of k */ - j <<= 1; - } - s->heap[k] = v; -} - -/* =========================================================================== - * Compute the optimal bit lengths for a tree and update the total bit length - * for the current block. - * IN assertion: the fields freq and dad are set, heap[heap_max] and - * above are the tree nodes sorted by increasing frequency. - * OUT assertions: the field len is set to the optimal bit length, the - * array bl_count contains the frequencies for each bit length. - * The length opt_len is updated; static_len is also updated if stree is - * not null. - */ -local void gen_bitlen(s, desc) - deflate_state *s; - tree_desc *desc; /* the tree descriptor */ -{ - ct_data *tree = desc->dyn_tree; - int max_code = desc->max_code; - const ct_data *stree = desc->stat_desc->static_tree; - const intf *extra = desc->stat_desc->extra_bits; - int base = desc->stat_desc->extra_base; - int max_length = desc->stat_desc->max_length; - int h; /* heap index */ - int n, m; /* iterate over the tree elements */ - int bits; /* bit length */ - int xbits; /* extra bits */ - ush f; /* frequency */ - int overflow = 0; /* number of elements with bit length too large */ - - for (bits = 0; bits <= MAX_BITS; bits++) s->bl_count[bits] = 0; - - /* In a first pass, compute the optimal bit lengths (which may - * overflow in the case of the bit length tree). - */ - tree[s->heap[s->heap_max]].Len = 0; /* root of the heap */ - - for (h = s->heap_max+1; h < HEAP_SIZE; h++) { - n = s->heap[h]; - bits = tree[tree[n].Dad].Len + 1; - if (bits > max_length) bits = max_length, overflow++; - tree[n].Len = (ush)bits; - /* We overwrite tree[n].Dad which is no longer needed */ - - if (n > max_code) continue; /* not a leaf node */ - - s->bl_count[bits]++; - xbits = 0; - if (n >= base) xbits = extra[n-base]; - f = tree[n].Freq; - s->opt_len += (ulg)f * (bits + xbits); - if (stree) s->static_len += (ulg)f * (stree[n].Len + xbits); - } - if (overflow == 0) return; - - Trace((stderr,"\nbit length overflow\n")); - /* This happens for example on obj2 and pic of the Calgary corpus */ - - /* Find the first bit length which could increase: */ - do { - bits = max_length-1; - while (s->bl_count[bits] == 0) bits--; - s->bl_count[bits]--; /* move one leaf down the tree */ - s->bl_count[bits+1] += 2; /* move one overflow item as its brother */ - s->bl_count[max_length]--; - /* The brother of the overflow item also moves one step up, - * but this does not affect bl_count[max_length] - */ - overflow -= 2; - } while (overflow > 0); - - /* Now recompute all bit lengths, scanning in increasing frequency. - * h is still equal to HEAP_SIZE. (It is simpler to reconstruct all - * lengths instead of fixing only the wrong ones. This idea is taken - * from 'ar' written by Haruhiko Okumura.) - */ - for (bits = max_length; bits != 0; bits--) { - n = s->bl_count[bits]; - while (n != 0) { - m = s->heap[--h]; - if (m > max_code) continue; - if ((unsigned) tree[m].Len != (unsigned) bits) { - Trace((stderr,"code %d bits %d->%d\n", m, tree[m].Len, bits)); - s->opt_len += ((long)bits - (long)tree[m].Len) - *(long)tree[m].Freq; - tree[m].Len = (ush)bits; - } - n--; - } - } -} - -/* =========================================================================== - * Generate the codes for a given tree and bit counts (which need not be - * optimal). - * IN assertion: the array bl_count contains the bit length statistics for - * the given tree and the field len is set for all tree elements. - * OUT assertion: the field code is set for all tree elements of non - * zero code length. - */ -local void gen_codes (tree, max_code, bl_count) - ct_data *tree; /* the tree to decorate */ - int max_code; /* largest code with non zero frequency */ - ushf *bl_count; /* number of codes at each bit length */ -{ - ush next_code[MAX_BITS+1]; /* next code value for each bit length */ - ush code = 0; /* running code value */ - int bits; /* bit index */ - int n; /* code index */ - - /* The distribution counts are first used to generate the code values - * without bit reversal. - */ - for (bits = 1; bits <= MAX_BITS; bits++) { - next_code[bits] = code = (code + bl_count[bits-1]) << 1; - } - /* Check that the bit counts in bl_count are consistent. The last code - * must be all ones. - */ - Assert (code + bl_count[MAX_BITS]-1 == (1<dyn_tree; - const ct_data *stree = desc->stat_desc->static_tree; - int elems = desc->stat_desc->elems; - int n, m; /* iterate over heap elements */ - int max_code = -1; /* largest code with non zero frequency */ - int node; /* new node being created */ - - /* Construct the initial heap, with least frequent element in - * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n+1]. - * heap[0] is not used. - */ - s->heap_len = 0, s->heap_max = HEAP_SIZE; - - for (n = 0; n < elems; n++) { - if (tree[n].Freq != 0) { - s->heap[++(s->heap_len)] = max_code = n; - s->depth[n] = 0; - } else { - tree[n].Len = 0; - } - } - - /* The pkzip format requires that at least one distance code exists, - * and that at least one bit should be sent even if there is only one - * possible code. So to avoid special checks later on we force at least - * two codes of non zero frequency. - */ - while (s->heap_len < 2) { - node = s->heap[++(s->heap_len)] = (max_code < 2 ? ++max_code : 0); - tree[node].Freq = 1; - s->depth[node] = 0; - s->opt_len--; if (stree) s->static_len -= stree[node].Len; - /* node is 0 or 1 so it does not have extra bits */ - } - desc->max_code = max_code; - - /* The elements heap[heap_len/2+1 .. heap_len] are leaves of the tree, - * establish sub-heaps of increasing lengths: - */ - for (n = s->heap_len/2; n >= 1; n--) pqdownheap(s, tree, n); - - /* Construct the Huffman tree by repeatedly combining the least two - * frequent nodes. - */ - node = elems; /* next internal node of the tree */ - do { - pqremove(s, tree, n); /* n = node of least frequency */ - m = s->heap[SMALLEST]; /* m = node of next least frequency */ - - s->heap[--(s->heap_max)] = n; /* keep the nodes sorted by frequency */ - s->heap[--(s->heap_max)] = m; - - /* Create a new node father of n and m */ - tree[node].Freq = tree[n].Freq + tree[m].Freq; - s->depth[node] = (uch)((s->depth[n] >= s->depth[m] ? - s->depth[n] : s->depth[m]) + 1); - tree[n].Dad = tree[m].Dad = (ush)node; -#ifdef DUMP_BL_TREE - if (tree == s->bl_tree) { - fprintf(stderr,"\nnode %d(%d), sons %d(%d) %d(%d)", - node, tree[node].Freq, n, tree[n].Freq, m, tree[m].Freq); - } -#endif - /* and insert the new node in the heap */ - s->heap[SMALLEST] = node++; - pqdownheap(s, tree, SMALLEST); - - } while (s->heap_len >= 2); - - s->heap[--(s->heap_max)] = s->heap[SMALLEST]; - - /* At this point, the fields freq and dad are set. We can now - * generate the bit lengths. - */ - gen_bitlen(s, (tree_desc *)desc); - - /* The field len is now set, we can generate the bit codes */ - gen_codes ((ct_data *)tree, max_code, s->bl_count); -} - -/* =========================================================================== - * Scan a literal or distance tree to determine the frequencies of the codes - * in the bit length tree. - */ -local void scan_tree (s, tree, max_code) - deflate_state *s; - ct_data *tree; /* the tree to be scanned */ - int max_code; /* and its largest code of non zero frequency */ -{ - int n; /* iterates over all tree elements */ - int prevlen = -1; /* last emitted length */ - int curlen; /* length of current code */ - int nextlen = tree[0].Len; /* length of next code */ - int count = 0; /* repeat count of the current code */ - int max_count = 7; /* max repeat count */ - int min_count = 4; /* min repeat count */ - - if (nextlen == 0) max_count = 138, min_count = 3; - tree[max_code+1].Len = (ush)0xffff; /* guard */ - - for (n = 0; n <= max_code; n++) { - curlen = nextlen; nextlen = tree[n+1].Len; - if (++count < max_count && curlen == nextlen) { - continue; - } else if (count < min_count) { - s->bl_tree[curlen].Freq += count; - } else if (curlen != 0) { - if (curlen != prevlen) s->bl_tree[curlen].Freq++; - s->bl_tree[REP_3_6].Freq++; - } else if (count <= 10) { - s->bl_tree[REPZ_3_10].Freq++; - } else { - s->bl_tree[REPZ_11_138].Freq++; - } - count = 0; prevlen = curlen; - if (nextlen == 0) { - max_count = 138, min_count = 3; - } else if (curlen == nextlen) { - max_count = 6, min_count = 3; - } else { - max_count = 7, min_count = 4; - } - } -} - -/* =========================================================================== - * Send a literal or distance tree in compressed form, using the codes in - * bl_tree. - */ -local void send_tree (s, tree, max_code) - deflate_state *s; - ct_data *tree; /* the tree to be scanned */ - int max_code; /* and its largest code of non zero frequency */ -{ - int n; /* iterates over all tree elements */ - int prevlen = -1; /* last emitted length */ - int curlen; /* length of current code */ - int nextlen = tree[0].Len; /* length of next code */ - int count = 0; /* repeat count of the current code */ - int max_count = 7; /* max repeat count */ - int min_count = 4; /* min repeat count */ - - /* tree[max_code+1].Len = -1; */ /* guard already set */ - if (nextlen == 0) max_count = 138, min_count = 3; - - for (n = 0; n <= max_code; n++) { - curlen = nextlen; nextlen = tree[n+1].Len; - if (++count < max_count && curlen == nextlen) { - continue; - } else if (count < min_count) { - do { send_code(s, curlen, s->bl_tree); } while (--count != 0); - - } else if (curlen != 0) { - if (curlen != prevlen) { - send_code(s, curlen, s->bl_tree); count--; - } - Assert(count >= 3 && count <= 6, " 3_6?"); - send_code(s, REP_3_6, s->bl_tree); send_bits(s, count-3, 2); - - } else if (count <= 10) { - send_code(s, REPZ_3_10, s->bl_tree); send_bits(s, count-3, 3); - - } else { - send_code(s, REPZ_11_138, s->bl_tree); send_bits(s, count-11, 7); - } - count = 0; prevlen = curlen; - if (nextlen == 0) { - max_count = 138, min_count = 3; - } else if (curlen == nextlen) { - max_count = 6, min_count = 3; - } else { - max_count = 7, min_count = 4; - } - } -} - -/* =========================================================================== - * Construct the Huffman tree for the bit lengths and return the index in - * bl_order of the last bit length code to send. - */ -local int build_bl_tree(s) - deflate_state *s; -{ - int max_blindex; /* index of last bit length code of non zero freq */ - - /* Determine the bit length frequencies for literal and distance trees */ - scan_tree(s, (ct_data *)s->dyn_ltree, s->l_desc.max_code); - scan_tree(s, (ct_data *)s->dyn_dtree, s->d_desc.max_code); - - /* Build the bit length tree: */ - build_tree(s, (tree_desc *)(&(s->bl_desc))); - /* opt_len now includes the length of the tree representations, except - * the lengths of the bit lengths codes and the 5+5+4 bits for the counts. - */ - - /* Determine the number of bit length codes to send. The pkzip format - * requires that at least 4 bit length codes be sent. (appnote.txt says - * 3 but the actual value used is 4.) - */ - for (max_blindex = BL_CODES-1; max_blindex >= 3; max_blindex--) { - if (s->bl_tree[bl_order[max_blindex]].Len != 0) break; - } - /* Update opt_len to include the bit length tree and counts */ - s->opt_len += 3*(max_blindex+1) + 5+5+4; - Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld", - s->opt_len, s->static_len)); - - return max_blindex; -} - -/* =========================================================================== - * Send the header for a block using dynamic Huffman trees: the counts, the - * lengths of the bit length codes, the literal tree and the distance tree. - * IN assertion: lcodes >= 257, dcodes >= 1, blcodes >= 4. - */ -local void send_all_trees(s, lcodes, dcodes, blcodes) - deflate_state *s; - int lcodes, dcodes, blcodes; /* number of codes for each tree */ -{ - int rank; /* index in bl_order */ - - Assert (lcodes >= 257 && dcodes >= 1 && blcodes >= 4, "not enough codes"); - Assert (lcodes <= L_CODES && dcodes <= D_CODES && blcodes <= BL_CODES, - "too many codes"); - Tracev((stderr, "\nbl counts: ")); - send_bits(s, lcodes-257, 5); /* not +255 as stated in appnote.txt */ - send_bits(s, dcodes-1, 5); - send_bits(s, blcodes-4, 4); /* not -3 as stated in appnote.txt */ - for (rank = 0; rank < blcodes; rank++) { - Tracev((stderr, "\nbl code %2d ", bl_order[rank])); - send_bits(s, s->bl_tree[bl_order[rank]].Len, 3); - } - Tracev((stderr, "\nbl tree: sent %ld", s->bits_sent)); - - send_tree(s, (ct_data *)s->dyn_ltree, lcodes-1); /* literal tree */ - Tracev((stderr, "\nlit tree: sent %ld", s->bits_sent)); - - send_tree(s, (ct_data *)s->dyn_dtree, dcodes-1); /* distance tree */ - Tracev((stderr, "\ndist tree: sent %ld", s->bits_sent)); -} - -/* =========================================================================== - * Send a stored block - */ -void ZLIB_INTERNAL _tr_stored_block(s, buf, stored_len, last) - deflate_state *s; - charf *buf; /* input block */ - ulg stored_len; /* length of input block */ - int last; /* one if this is the last block for a file */ -{ - send_bits(s, (STORED_BLOCK<<1)+last, 3); /* send block type */ -#ifdef DEBUG - s->compressed_len = (s->compressed_len + 3 + 7) & (ulg)~7L; - s->compressed_len += (stored_len + 4) << 3; -#endif - copy_block(s, buf, (unsigned)stored_len, 1); /* with header */ -} - -/* =========================================================================== - * Send one empty static block to give enough lookahead for inflate. - * This takes 10 bits, of which 7 may remain in the bit buffer. - * The current inflate code requires 9 bits of lookahead. If the - * last two codes for the previous block (real code plus EOB) were coded - * on 5 bits or less, inflate may have only 5+3 bits of lookahead to decode - * the last real code. In this case we send two empty static blocks instead - * of one. (There are no problems if the previous block is stored or fixed.) - * To simplify the code, we assume the worst case of last real code encoded - * on one bit only. - */ -void ZLIB_INTERNAL _tr_align(s) - deflate_state *s; -{ - send_bits(s, STATIC_TREES<<1, 3); - send_code(s, END_BLOCK, static_ltree); -#ifdef DEBUG - s->compressed_len += 10L; /* 3 for block type, 7 for EOB */ -#endif - bi_flush(s); - /* Of the 10 bits for the empty block, we have already sent - * (10 - bi_valid) bits. The lookahead for the last real code (before - * the EOB of the previous block) was thus at least one plus the length - * of the EOB plus what we have just sent of the empty static block. - */ - if (1 + s->last_eob_len + 10 - s->bi_valid < 9) { - send_bits(s, STATIC_TREES<<1, 3); - send_code(s, END_BLOCK, static_ltree); -#ifdef DEBUG - s->compressed_len += 10L; -#endif - bi_flush(s); - } - s->last_eob_len = 7; -} - -/* =========================================================================== - * Determine the best encoding for the current block: dynamic trees, static - * trees or store, and output the encoded block to the zip file. - */ -void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last) - deflate_state *s; - charf *buf; /* input block, or NULL if too old */ - ulg stored_len; /* length of input block */ - int last; /* one if this is the last block for a file */ -{ - ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */ - int max_blindex = 0; /* index of last bit length code of non zero freq */ - - /* Build the Huffman trees unless a stored block is forced */ - if (s->level > 0) { - - /* Check if the file is binary or text */ - if (s->strm->data_type == Z_UNKNOWN) - s->strm->data_type = detect_data_type(s); - - /* Construct the literal and distance trees */ - build_tree(s, (tree_desc *)(&(s->l_desc))); - Tracev((stderr, "\nlit data: dyn %ld, stat %ld", s->opt_len, - s->static_len)); - - build_tree(s, (tree_desc *)(&(s->d_desc))); - Tracev((stderr, "\ndist data: dyn %ld, stat %ld", s->opt_len, - s->static_len)); - /* At this point, opt_len and static_len are the total bit lengths of - * the compressed block data, excluding the tree representations. - */ - - /* Build the bit length tree for the above two trees, and get the index - * in bl_order of the last bit length code to send. - */ - max_blindex = build_bl_tree(s); - - /* Determine the best encoding. Compute the block lengths in bytes. */ - opt_lenb = (s->opt_len+3+7)>>3; - static_lenb = (s->static_len+3+7)>>3; - - Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ", - opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len, - s->last_lit)); - - if (static_lenb <= opt_lenb) opt_lenb = static_lenb; - - } else { - Assert(buf != (char*)0, "lost buf"); - opt_lenb = static_lenb = stored_len + 5; /* force a stored block */ - } - -#ifdef FORCE_STORED - if (buf != (char*)0) { /* force stored block */ -#else - if (stored_len+4 <= opt_lenb && buf != (char*)0) { - /* 4: two words for the lengths */ -#endif - /* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE. - * Otherwise we can't have processed more than WSIZE input bytes since - * the last block flush, because compression would have been - * successful. If LIT_BUFSIZE <= WSIZE, it is never too late to - * transform a block into a stored block. - */ - _tr_stored_block(s, buf, stored_len, last); - -#ifdef FORCE_STATIC - } else if (static_lenb >= 0) { /* force static trees */ -#else - } else if (s->strategy == Z_FIXED || static_lenb == opt_lenb) { -#endif - send_bits(s, (STATIC_TREES<<1)+last, 3); - compress_block(s, (ct_data *)static_ltree, (ct_data *)static_dtree); -#ifdef DEBUG - s->compressed_len += 3 + s->static_len; -#endif - } else { - send_bits(s, (DYN_TREES<<1)+last, 3); - send_all_trees(s, s->l_desc.max_code+1, s->d_desc.max_code+1, - max_blindex+1); - compress_block(s, (ct_data *)s->dyn_ltree, (ct_data *)s->dyn_dtree); -#ifdef DEBUG - s->compressed_len += 3 + s->opt_len; -#endif - } - Assert (s->compressed_len == s->bits_sent, "bad compressed size"); - /* The above check is made mod 2^32, for files larger than 512 MB - * and uLong implemented on 32 bits. - */ - init_block(s); - - if (last) { - bi_windup(s); -#ifdef DEBUG - s->compressed_len += 7; /* align on byte boundary */ -#endif - } - Tracev((stderr,"\ncomprlen %lu(%lu) ", s->compressed_len>>3, - s->compressed_len-7*last)); -} - -/* =========================================================================== - * Save the match info and tally the frequency counts. Return true if - * the current block must be flushed. - */ -int ZLIB_INTERNAL _tr_tally (s, dist, lc) - deflate_state *s; - unsigned dist; /* distance of matched string */ - unsigned lc; /* match length-MIN_MATCH or unmatched char (if dist==0) */ -{ - s->d_buf[s->last_lit] = (ush)dist; - s->l_buf[s->last_lit++] = (uch)lc; - if (dist == 0) { - /* lc is the unmatched char */ - s->dyn_ltree[lc].Freq++; - } else { - s->matches++; - /* Here, lc is the match length - MIN_MATCH */ - dist--; /* dist = match distance - 1 */ - Assert((ush)dist < (ush)MAX_DIST(s) && - (ush)lc <= (ush)(MAX_MATCH-MIN_MATCH) && - (ush)d_code(dist) < (ush)D_CODES, "_tr_tally: bad match"); - - s->dyn_ltree[_length_code[lc]+LITERALS+1].Freq++; - s->dyn_dtree[d_code(dist)].Freq++; - } - -#ifdef TRUNCATE_BLOCK - /* Try to guess if it is profitable to stop the current block here */ - if ((s->last_lit & 0x1fff) == 0 && s->level > 2) { - /* Compute an upper bound for the compressed length */ - ulg out_length = (ulg)s->last_lit*8L; - ulg in_length = (ulg)((long)s->strstart - s->block_start); - int dcode; - for (dcode = 0; dcode < D_CODES; dcode++) { - out_length += (ulg)s->dyn_dtree[dcode].Freq * - (5L+extra_dbits[dcode]); - } - out_length >>= 3; - Tracev((stderr,"\nlast_lit %u, in %ld, out ~%ld(%ld%%) ", - s->last_lit, in_length, out_length, - 100L - out_length*100L/in_length)); - if (s->matches < s->last_lit/2 && out_length < in_length/2) return 1; - } -#endif - return (s->last_lit == s->lit_bufsize-1); - /* We avoid equality with lit_bufsize because of wraparound at 64K - * on 16 bit machines and because stored blocks are restricted to - * 64K-1 bytes. - */ -} - -/* =========================================================================== - * Send the block data compressed using the given Huffman trees - */ -local void compress_block(s, ltree, dtree) - deflate_state *s; - ct_data *ltree; /* literal tree */ - ct_data *dtree; /* distance tree */ -{ - unsigned dist; /* distance of matched string */ - int lc; /* match length or unmatched char (if dist == 0) */ - unsigned lx = 0; /* running index in l_buf */ - unsigned code; /* the code to send */ - int extra; /* number of extra bits to send */ - - if (s->last_lit != 0) do { - dist = s->d_buf[lx]; - lc = s->l_buf[lx++]; - if (dist == 0) { - send_code(s, lc, ltree); /* send a literal byte */ - Tracecv(isgraph(lc), (stderr," '%c' ", lc)); - } else { - /* Here, lc is the match length - MIN_MATCH */ - code = _length_code[lc]; - send_code(s, code+LITERALS+1, ltree); /* send the length code */ - extra = extra_lbits[code]; - if (extra != 0) { - lc -= base_length[code]; - send_bits(s, lc, extra); /* send the extra length bits */ - } - dist--; /* dist is now the match distance - 1 */ - code = d_code(dist); - Assert (code < D_CODES, "bad d_code"); - - send_code(s, code, dtree); /* send the distance code */ - extra = extra_dbits[code]; - if (extra != 0) { - dist -= base_dist[code]; - send_bits(s, dist, extra); /* send the extra distance bits */ - } - } /* literal or match pair ? */ - - /* Check that the overlay between pending_buf and d_buf+l_buf is ok: */ - Assert((uInt)(s->pending) < s->lit_bufsize + 2*lx, - "pendingBuf overflow"); - - } while (lx < s->last_lit); - - send_code(s, END_BLOCK, ltree); - s->last_eob_len = ltree[END_BLOCK].Len; -} - -/* =========================================================================== - * Check if the data type is TEXT or BINARY, using the following algorithm: - * - TEXT if the two conditions below are satisfied: - * a) There are no non-portable control characters belonging to the - * "black list" (0..6, 14..25, 28..31). - * b) There is at least one printable character belonging to the - * "white list" (9 {TAB}, 10 {LF}, 13 {CR}, 32..255). - * - BINARY otherwise. - * - The following partially-portable control characters form a - * "gray list" that is ignored in this detection algorithm: - * (7 {BEL}, 8 {BS}, 11 {VT}, 12 {FF}, 26 {SUB}, 27 {ESC}). - * IN assertion: the fields Freq of dyn_ltree are set. - */ -local int detect_data_type(s) - deflate_state *s; -{ - /* black_mask is the bit mask of black-listed bytes - * set bits 0..6, 14..25, and 28..31 - * 0xf3ffc07f = binary 11110011111111111100000001111111 - */ - unsigned long black_mask = 0xf3ffc07fUL; - int n; - - /* Check for non-textual ("black-listed") bytes. */ - for (n = 0; n <= 31; n++, black_mask >>= 1) - if ((black_mask & 1) && (s->dyn_ltree[n].Freq != 0)) - return Z_BINARY; - - /* Check for textual ("white-listed") bytes. */ - if (s->dyn_ltree[9].Freq != 0 || s->dyn_ltree[10].Freq != 0 - || s->dyn_ltree[13].Freq != 0) - return Z_TEXT; - for (n = 32; n < LITERALS; n++) - if (s->dyn_ltree[n].Freq != 0) - return Z_TEXT; - - /* There are no "black-listed" or "white-listed" bytes: - * this stream either is empty or has tolerated ("gray-listed") bytes only. - */ - return Z_BINARY; -} - -/* =========================================================================== - * Reverse the first len bits of a code, using straightforward code (a faster - * method would use a table) - * IN assertion: 1 <= len <= 15 - */ -local unsigned bi_reverse(code, len) - unsigned code; /* the value to invert */ - int len; /* its bit length */ -{ - register unsigned res = 0; - do { - res |= code & 1; - code >>= 1, res <<= 1; - } while (--len > 0); - return res >> 1; -} - -/* =========================================================================== - * Flush the bit buffer, keeping at most 7 bits in it. - */ -local void bi_flush(s) - deflate_state *s; -{ - if (s->bi_valid == 16) { - put_short(s, s->bi_buf); - s->bi_buf = 0; - s->bi_valid = 0; - } else if (s->bi_valid >= 8) { - put_byte(s, (Byte)s->bi_buf); - s->bi_buf >>= 8; - s->bi_valid -= 8; - } -} - -/* =========================================================================== - * Flush the bit buffer and align the output on a byte boundary - */ -local void bi_windup(s) - deflate_state *s; -{ - if (s->bi_valid > 8) { - put_short(s, s->bi_buf); - } else if (s->bi_valid > 0) { - put_byte(s, (Byte)s->bi_buf); - } - s->bi_buf = 0; - s->bi_valid = 0; -#ifdef DEBUG - s->bits_sent = (s->bits_sent+7) & ~7; -#endif -} - -/* =========================================================================== - * Copy a stored block, storing first the length and its - * one's complement if requested. - */ -local void copy_block(s, buf, len, header) - deflate_state *s; - charf *buf; /* the input data */ - unsigned len; /* its length */ - int header; /* true if block header must be written */ -{ - bi_windup(s); /* align on byte boundary */ - s->last_eob_len = 8; /* enough lookahead for inflate */ - - if (header) { - put_short(s, (ush)len); - put_short(s, (ush)~len); -#ifdef DEBUG - s->bits_sent += 2*16; -#endif - } -#ifdef DEBUG - s->bits_sent += (ulg)len<<3; -#endif - while (len--) { - put_byte(s, *buf++); - } -} diff --git a/libs/libwebsockets/win32port/zlib/trees.h b/libs/libwebsockets/win32port/zlib/trees.h deleted file mode 100644 index ce8f620444..0000000000 --- a/libs/libwebsockets/win32port/zlib/trees.h +++ /dev/null @@ -1,128 +0,0 @@ -/* header created automatically with -DGEN_TREES_H */ - -local const ct_data static_ltree[L_CODES+2] = { -{{ 12},{ 8}}, {{140},{ 8}}, {{ 76},{ 8}}, {{204},{ 8}}, {{ 44},{ 8}}, -{{172},{ 8}}, {{108},{ 8}}, {{236},{ 8}}, {{ 28},{ 8}}, {{156},{ 8}}, -{{ 92},{ 8}}, {{220},{ 8}}, {{ 60},{ 8}}, {{188},{ 8}}, {{124},{ 8}}, -{{252},{ 8}}, {{ 2},{ 8}}, {{130},{ 8}}, {{ 66},{ 8}}, {{194},{ 8}}, -{{ 34},{ 8}}, {{162},{ 8}}, {{ 98},{ 8}}, {{226},{ 8}}, {{ 18},{ 8}}, -{{146},{ 8}}, {{ 82},{ 8}}, {{210},{ 8}}, {{ 50},{ 8}}, {{178},{ 8}}, -{{114},{ 8}}, {{242},{ 8}}, {{ 10},{ 8}}, {{138},{ 8}}, {{ 74},{ 8}}, -{{202},{ 8}}, {{ 42},{ 8}}, {{170},{ 8}}, {{106},{ 8}}, {{234},{ 8}}, -{{ 26},{ 8}}, {{154},{ 8}}, {{ 90},{ 8}}, {{218},{ 8}}, {{ 58},{ 8}}, -{{186},{ 8}}, {{122},{ 8}}, {{250},{ 8}}, {{ 6},{ 8}}, {{134},{ 8}}, -{{ 70},{ 8}}, {{198},{ 8}}, {{ 38},{ 8}}, {{166},{ 8}}, {{102},{ 8}}, -{{230},{ 8}}, {{ 22},{ 8}}, {{150},{ 8}}, {{ 86},{ 8}}, {{214},{ 8}}, -{{ 54},{ 8}}, {{182},{ 8}}, {{118},{ 8}}, {{246},{ 8}}, {{ 14},{ 8}}, -{{142},{ 8}}, {{ 78},{ 8}}, {{206},{ 8}}, {{ 46},{ 8}}, {{174},{ 8}}, -{{110},{ 8}}, {{238},{ 8}}, {{ 30},{ 8}}, {{158},{ 8}}, {{ 94},{ 8}}, -{{222},{ 8}}, {{ 62},{ 8}}, {{190},{ 8}}, {{126},{ 8}}, {{254},{ 8}}, -{{ 1},{ 8}}, {{129},{ 8}}, {{ 65},{ 8}}, {{193},{ 8}}, {{ 33},{ 8}}, -{{161},{ 8}}, {{ 97},{ 8}}, {{225},{ 8}}, {{ 17},{ 8}}, {{145},{ 8}}, -{{ 81},{ 8}}, {{209},{ 8}}, {{ 49},{ 8}}, {{177},{ 8}}, {{113},{ 8}}, -{{241},{ 8}}, {{ 9},{ 8}}, {{137},{ 8}}, {{ 73},{ 8}}, {{201},{ 8}}, -{{ 41},{ 8}}, {{169},{ 8}}, {{105},{ 8}}, {{233},{ 8}}, {{ 25},{ 8}}, -{{153},{ 8}}, {{ 89},{ 8}}, {{217},{ 8}}, {{ 57},{ 8}}, {{185},{ 8}}, -{{121},{ 8}}, {{249},{ 8}}, {{ 5},{ 8}}, {{133},{ 8}}, {{ 69},{ 8}}, -{{197},{ 8}}, {{ 37},{ 8}}, {{165},{ 8}}, {{101},{ 8}}, {{229},{ 8}}, -{{ 21},{ 8}}, {{149},{ 8}}, {{ 85},{ 8}}, {{213},{ 8}}, {{ 53},{ 8}}, -{{181},{ 8}}, {{117},{ 8}}, {{245},{ 8}}, {{ 13},{ 8}}, {{141},{ 8}}, -{{ 77},{ 8}}, {{205},{ 8}}, {{ 45},{ 8}}, {{173},{ 8}}, {{109},{ 8}}, -{{237},{ 8}}, {{ 29},{ 8}}, {{157},{ 8}}, {{ 93},{ 8}}, {{221},{ 8}}, -{{ 61},{ 8}}, {{189},{ 8}}, {{125},{ 8}}, {{253},{ 8}}, {{ 19},{ 9}}, -{{275},{ 9}}, {{147},{ 9}}, {{403},{ 9}}, {{ 83},{ 9}}, {{339},{ 9}}, -{{211},{ 9}}, {{467},{ 9}}, {{ 51},{ 9}}, {{307},{ 9}}, {{179},{ 9}}, -{{435},{ 9}}, {{115},{ 9}}, {{371},{ 9}}, {{243},{ 9}}, {{499},{ 9}}, -{{ 11},{ 9}}, {{267},{ 9}}, {{139},{ 9}}, {{395},{ 9}}, {{ 75},{ 9}}, -{{331},{ 9}}, {{203},{ 9}}, {{459},{ 9}}, {{ 43},{ 9}}, {{299},{ 9}}, -{{171},{ 9}}, {{427},{ 9}}, {{107},{ 9}}, {{363},{ 9}}, {{235},{ 9}}, -{{491},{ 9}}, {{ 27},{ 9}}, {{283},{ 9}}, {{155},{ 9}}, {{411},{ 9}}, -{{ 91},{ 9}}, {{347},{ 9}}, {{219},{ 9}}, {{475},{ 9}}, {{ 59},{ 9}}, -{{315},{ 9}}, {{187},{ 9}}, {{443},{ 9}}, {{123},{ 9}}, {{379},{ 9}}, -{{251},{ 9}}, {{507},{ 9}}, {{ 7},{ 9}}, {{263},{ 9}}, {{135},{ 9}}, -{{391},{ 9}}, {{ 71},{ 9}}, {{327},{ 9}}, {{199},{ 9}}, {{455},{ 9}}, -{{ 39},{ 9}}, {{295},{ 9}}, {{167},{ 9}}, {{423},{ 9}}, {{103},{ 9}}, -{{359},{ 9}}, {{231},{ 9}}, {{487},{ 9}}, {{ 23},{ 9}}, {{279},{ 9}}, -{{151},{ 9}}, {{407},{ 9}}, {{ 87},{ 9}}, {{343},{ 9}}, {{215},{ 9}}, -{{471},{ 9}}, {{ 55},{ 9}}, {{311},{ 9}}, {{183},{ 9}}, {{439},{ 9}}, -{{119},{ 9}}, {{375},{ 9}}, {{247},{ 9}}, {{503},{ 9}}, {{ 15},{ 9}}, -{{271},{ 9}}, {{143},{ 9}}, {{399},{ 9}}, {{ 79},{ 9}}, {{335},{ 9}}, -{{207},{ 9}}, {{463},{ 9}}, {{ 47},{ 9}}, {{303},{ 9}}, {{175},{ 9}}, -{{431},{ 9}}, {{111},{ 9}}, {{367},{ 9}}, {{239},{ 9}}, {{495},{ 9}}, -{{ 31},{ 9}}, {{287},{ 9}}, {{159},{ 9}}, {{415},{ 9}}, {{ 95},{ 9}}, -{{351},{ 9}}, {{223},{ 9}}, {{479},{ 9}}, {{ 63},{ 9}}, {{319},{ 9}}, -{{191},{ 9}}, {{447},{ 9}}, {{127},{ 9}}, {{383},{ 9}}, {{255},{ 9}}, -{{511},{ 9}}, {{ 0},{ 7}}, {{ 64},{ 7}}, {{ 32},{ 7}}, {{ 96},{ 7}}, -{{ 16},{ 7}}, {{ 80},{ 7}}, {{ 48},{ 7}}, {{112},{ 7}}, {{ 8},{ 7}}, -{{ 72},{ 7}}, {{ 40},{ 7}}, {{104},{ 7}}, {{ 24},{ 7}}, {{ 88},{ 7}}, -{{ 56},{ 7}}, {{120},{ 7}}, {{ 4},{ 7}}, {{ 68},{ 7}}, {{ 36},{ 7}}, -{{100},{ 7}}, {{ 20},{ 7}}, {{ 84},{ 7}}, {{ 52},{ 7}}, {{116},{ 7}}, -{{ 3},{ 8}}, {{131},{ 8}}, {{ 67},{ 8}}, {{195},{ 8}}, {{ 35},{ 8}}, -{{163},{ 8}}, {{ 99},{ 8}}, {{227},{ 8}} -}; - -local const ct_data static_dtree[D_CODES] = { -{{ 0},{ 5}}, {{16},{ 5}}, {{ 8},{ 5}}, {{24},{ 5}}, {{ 4},{ 5}}, -{{20},{ 5}}, {{12},{ 5}}, {{28},{ 5}}, {{ 2},{ 5}}, {{18},{ 5}}, -{{10},{ 5}}, {{26},{ 5}}, {{ 6},{ 5}}, {{22},{ 5}}, {{14},{ 5}}, -{{30},{ 5}}, {{ 1},{ 5}}, {{17},{ 5}}, {{ 9},{ 5}}, {{25},{ 5}}, -{{ 5},{ 5}}, {{21},{ 5}}, {{13},{ 5}}, {{29},{ 5}}, {{ 3},{ 5}}, -{{19},{ 5}}, {{11},{ 5}}, {{27},{ 5}}, {{ 7},{ 5}}, {{23},{ 5}} -}; - -const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] = { - 0, 1, 2, 3, 4, 4, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, - 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 10, 10, 10, 10, 10, 10, 10, 10, -10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, -11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, -12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13, 13, 13, 13, -13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, -13, 13, 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, -14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, -14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, -14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15, -15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, -15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, -15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 0, 0, 16, 17, -18, 18, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22, -23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, -24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, -26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, -26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, -27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, -27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, -28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, -28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, -28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, -29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, -29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, -29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29 -}; - -const uch ZLIB_INTERNAL _length_code[MAX_MATCH-MIN_MATCH+1]= { - 0, 1, 2, 3, 4, 5, 6, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 12, 12, -13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16, -17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19, -19, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, -21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22, 22, -22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23, -23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, -24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, -25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, -25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26, -26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, -26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, -27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28 -}; - -local const int base_length[LENGTH_CODES] = { -0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 20, 24, 28, 32, 40, 48, 56, -64, 80, 96, 112, 128, 160, 192, 224, 0 -}; - -local const int base_dist[D_CODES] = { - 0, 1, 2, 3, 4, 6, 8, 12, 16, 24, - 32, 48, 64, 96, 128, 192, 256, 384, 512, 768, - 1024, 1536, 2048, 3072, 4096, 6144, 8192, 12288, 16384, 24576 -}; - diff --git a/libs/libwebsockets/win32port/zlib/uncompr.c b/libs/libwebsockets/win32port/zlib/uncompr.c deleted file mode 100644 index f07773c9de..0000000000 --- a/libs/libwebsockets/win32port/zlib/uncompr.c +++ /dev/null @@ -1,59 +0,0 @@ -/* uncompr.c -- decompress a memory buffer - * Copyright (C) 1995-2003, 2010 Jean-loup Gailly. - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -/* @(#) $Id$ */ - -#define ZLIB_INTERNAL -#include "zlib.h" - -/* =========================================================================== - Decompresses the source buffer into the destination buffer. sourceLen is - the byte length of the source buffer. Upon entry, destLen is the total - size of the destination buffer, which must be large enough to hold the - entire uncompressed data. (The size of the uncompressed data must have - been saved previously by the compressor and transmitted to the decompressor - by some mechanism outside the scope of this compression library.) - Upon exit, destLen is the actual size of the compressed buffer. - - uncompress returns Z_OK if success, Z_MEM_ERROR if there was not - enough memory, Z_BUF_ERROR if there was not enough room in the output - buffer, or Z_DATA_ERROR if the input data was corrupted. -*/ -int ZEXPORT uncompress (dest, destLen, source, sourceLen) - Bytef *dest; - uLongf *destLen; - const Bytef *source; - uLong sourceLen; -{ - z_stream stream; - int err; - - stream.next_in = (Bytef*)source; - stream.avail_in = (uInt)sourceLen; - /* Check for source > 64K on 16-bit machine: */ - if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR; - - stream.next_out = dest; - stream.avail_out = (uInt)*destLen; - if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR; - - stream.zalloc = (alloc_func)0; - stream.zfree = (free_func)0; - - err = inflateInit(&stream); - if (err != Z_OK) return err; - - err = inflate(&stream, Z_FINISH); - if (err != Z_STREAM_END) { - inflateEnd(&stream); - if (err == Z_NEED_DICT || (err == Z_BUF_ERROR && stream.avail_in == 0)) - return Z_DATA_ERROR; - return err; - } - *destLen = stream.total_out; - - err = inflateEnd(&stream); - return err; -} diff --git a/libs/libwebsockets/win32port/zlib/zconf.h b/libs/libwebsockets/win32port/zlib/zconf.h deleted file mode 100644 index 88f90f90f4..0000000000 --- a/libs/libwebsockets/win32port/zlib/zconf.h +++ /dev/null @@ -1,428 +0,0 @@ -/* zconf.h -- configuration of the zlib compression library - * Copyright (C) 1995-2010 Jean-loup Gailly. - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -/* @(#) $Id$ */ - -#ifndef ZCONF_H -#define ZCONF_H - -/* - * If you *really* need a unique prefix for all types and library functions, - * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it. - * Even better than compiling with -DZ_PREFIX would be to use configure to set - * this permanently in zconf.h using "./configure --zprefix". - */ -#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */ - -/* all linked symbols */ -# define _dist_code z__dist_code -# define _length_code z__length_code -# define _tr_align z__tr_align -# define _tr_flush_block z__tr_flush_block -# define _tr_init z__tr_init -# define _tr_stored_block z__tr_stored_block -# define _tr_tally z__tr_tally -# define adler32 z_adler32 -# define adler32_combine z_adler32_combine -# define adler32_combine64 z_adler32_combine64 -# define compress z_compress -# define compress2 z_compress2 -# define compressBound z_compressBound -# define crc32 z_crc32 -# define crc32_combine z_crc32_combine -# define crc32_combine64 z_crc32_combine64 -# define deflate z_deflate -# define deflateBound z_deflateBound -# define deflateCopy z_deflateCopy -# define deflateEnd z_deflateEnd -# define deflateInit2_ z_deflateInit2_ -# define deflateInit_ z_deflateInit_ -# define deflateParams z_deflateParams -# define deflatePrime z_deflatePrime -# define deflateReset z_deflateReset -# define deflateSetDictionary z_deflateSetDictionary -# define deflateSetHeader z_deflateSetHeader -# define deflateTune z_deflateTune -# define deflate_copyright z_deflate_copyright -# define get_crc_table z_get_crc_table -# define gz_error z_gz_error -# define gz_intmax z_gz_intmax -# define gz_strwinerror z_gz_strwinerror -# define gzbuffer z_gzbuffer -# define gzclearerr z_gzclearerr -# define gzclose z_gzclose -# define gzclose_r z_gzclose_r -# define gzclose_w z_gzclose_w -# define gzdirect z_gzdirect -# define gzdopen z_gzdopen -# define gzeof z_gzeof -# define gzerror z_gzerror -# define gzflush z_gzflush -# define gzgetc z_gzgetc -# define gzgets z_gzgets -# define gzoffset z_gzoffset -# define gzoffset64 z_gzoffset64 -# define gzopen z_gzopen -# define gzopen64 z_gzopen64 -# define gzprintf z_gzprintf -# define gzputc z_gzputc -# define gzputs z_gzputs -# define gzread z_gzread -# define gzrewind z_gzrewind -# define gzseek z_gzseek -# define gzseek64 z_gzseek64 -# define gzsetparams z_gzsetparams -# define gztell z_gztell -# define gztell64 z_gztell64 -# define gzungetc z_gzungetc -# define gzwrite z_gzwrite -# define inflate z_inflate -# define inflateBack z_inflateBack -# define inflateBackEnd z_inflateBackEnd -# define inflateBackInit_ z_inflateBackInit_ -# define inflateCopy z_inflateCopy -# define inflateEnd z_inflateEnd -# define inflateGetHeader z_inflateGetHeader -# define inflateInit2_ z_inflateInit2_ -# define inflateInit_ z_inflateInit_ -# define inflateMark z_inflateMark -# define inflatePrime z_inflatePrime -# define inflateReset z_inflateReset -# define inflateReset2 z_inflateReset2 -# define inflateSetDictionary z_inflateSetDictionary -# define inflateSync z_inflateSync -# define inflateSyncPoint z_inflateSyncPoint -# define inflateUndermine z_inflateUndermine -# define inflate_copyright z_inflate_copyright -# define inflate_fast z_inflate_fast -# define inflate_table z_inflate_table -# define uncompress z_uncompress -# define zError z_zError -# define zcalloc z_zcalloc -# define zcfree z_zcfree -# define zlibCompileFlags z_zlibCompileFlags -# define zlibVersion z_zlibVersion - -/* all zlib typedefs in zlib.h and zconf.h */ -# define Byte z_Byte -# define Bytef z_Bytef -# define alloc_func z_alloc_func -# define charf z_charf -# define free_func z_free_func -# define gzFile z_gzFile -# define gz_header z_gz_header -# define gz_headerp z_gz_headerp -# define in_func z_in_func -# define intf z_intf -# define out_func z_out_func -# define uInt z_uInt -# define uIntf z_uIntf -# define uLong z_uLong -# define uLongf z_uLongf -# define voidp z_voidp -# define voidpc z_voidpc -# define voidpf z_voidpf - -/* all zlib structs in zlib.h and zconf.h */ -# define gz_header_s z_gz_header_s -# define internal_state z_internal_state - -#endif - -#if defined(__MSDOS__) && !defined(MSDOS) -# define MSDOS -#endif -#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2) -# define OS2 -#endif -#if defined(_WINDOWS) && !defined(WINDOWS) -# define WINDOWS -#endif -#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__) -# ifndef WIN32 -# define WIN32 -# endif -#endif -#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32) -# if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__) -# ifndef SYS16BIT -# define SYS16BIT -# endif -# endif -#endif - -/* - * Compile with -DMAXSEG_64K if the alloc function cannot allocate more - * than 64k bytes at a time (needed on systems with 16-bit int). - */ -#ifdef SYS16BIT -# define MAXSEG_64K -#endif -#ifdef MSDOS -# define UNALIGNED_OK -#endif - -#ifdef __STDC_VERSION__ -# ifndef STDC -# define STDC -# endif -# if __STDC_VERSION__ >= 199901L -# ifndef STDC99 -# define STDC99 -# endif -# endif -#endif -#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus)) -# define STDC -#endif -#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__)) -# define STDC -#endif -#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32)) -# define STDC -#endif -#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__)) -# define STDC -#endif - -#if defined(__OS400__) && !defined(STDC) /* iSeries (formerly AS/400). */ -# define STDC -#endif - -#ifndef STDC -# ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */ -# define const /* note: need a more gentle solution here */ -# endif -#endif - -/* Some Mac compilers merge all .h files incorrectly: */ -#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__) -# define NO_DUMMY_DECL -#endif - -/* Maximum value for memLevel in deflateInit2 */ -#ifndef MAX_MEM_LEVEL -# ifdef MAXSEG_64K -# define MAX_MEM_LEVEL 8 -# else -# define MAX_MEM_LEVEL 9 -# endif -#endif - -/* Maximum value for windowBits in deflateInit2 and inflateInit2. - * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files - * created by gzip. (Files created by minigzip can still be extracted by - * gzip.) - */ -#ifndef MAX_WBITS -# define MAX_WBITS 15 /* 32K LZ77 window */ -#endif - -/* The memory requirements for deflate are (in bytes): - (1 << (windowBits+2)) + (1 << (memLevel+9)) - that is: 128K for windowBits=15 + 128K for memLevel = 8 (default values) - plus a few kilobytes for small objects. For example, if you want to reduce - the default memory requirements from 256K to 128K, compile with - make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7" - Of course this will generally degrade compression (there's no free lunch). - - The memory requirements for inflate are (in bytes) 1 << windowBits - that is, 32K for windowBits=15 (default value) plus a few kilobytes - for small objects. -*/ - - /* Type declarations */ - -#ifndef OF /* function prototypes */ -# ifdef STDC -# define OF(args) args -# else -# define OF(args) () -# endif -#endif - -/* The following definitions for FAR are needed only for MSDOS mixed - * model programming (small or medium model with some far allocations). - * This was tested only with MSC; for other MSDOS compilers you may have - * to define NO_MEMCPY in zutil.h. If you don't need the mixed model, - * just define FAR to be empty. - */ -#ifdef SYS16BIT -# if defined(M_I86SM) || defined(M_I86MM) - /* MSC small or medium model */ -# define SMALL_MEDIUM -# ifdef _MSC_VER -# define FAR _far -# else -# define FAR far -# endif -# endif -# if (defined(__SMALL__) || defined(__MEDIUM__)) - /* Turbo C small or medium model */ -# define SMALL_MEDIUM -# ifdef __BORLANDC__ -# define FAR _far -# else -# define FAR far -# endif -# endif -#endif - -#if defined(WINDOWS) || defined(WIN32) - /* If building or using zlib as a DLL, define ZLIB_DLL. - * This is not mandatory, but it offers a little performance increase. - */ -# ifdef ZLIB_DLL -# if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500)) -# ifdef ZLIB_INTERNAL -# define ZEXTERN extern __declspec(dllexport) -# else -# define ZEXTERN extern __declspec(dllimport) -# endif -# endif -# endif /* ZLIB_DLL */ - /* If building or using zlib with the WINAPI/WINAPIV calling convention, - * define ZLIB_WINAPI. - * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI. - */ -# ifdef ZLIB_WINAPI -# ifdef FAR -# undef FAR -# endif -# include - /* No need for _export, use ZLIB.DEF instead. */ - /* For complete Windows compatibility, use WINAPI, not __stdcall. */ -# define ZEXPORT WINAPI -# ifdef WIN32 -# define ZEXPORTVA WINAPIV -# else -# define ZEXPORTVA FAR CDECL -# endif -# endif -#endif - -#if defined (__BEOS__) -# ifdef ZLIB_DLL -# ifdef ZLIB_INTERNAL -# define ZEXPORT __declspec(dllexport) -# define ZEXPORTVA __declspec(dllexport) -# else -# define ZEXPORT __declspec(dllimport) -# define ZEXPORTVA __declspec(dllimport) -# endif -# endif -#endif - -#ifndef ZEXTERN -# define ZEXTERN extern -#endif -#ifndef ZEXPORT -# define ZEXPORT -#endif -#ifndef ZEXPORTVA -# define ZEXPORTVA -#endif - -#ifndef FAR -# define FAR -#endif - -#if !defined(__MACTYPES__) -typedef unsigned char Byte; /* 8 bits */ -#endif -typedef unsigned int uInt; /* 16 bits or more */ -typedef unsigned long uLong; /* 32 bits or more */ - -#ifdef SMALL_MEDIUM - /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */ -# define Bytef Byte FAR -#else - typedef Byte FAR Bytef; -#endif -typedef char FAR charf; -typedef int FAR intf; -typedef uInt FAR uIntf; -typedef uLong FAR uLongf; - -#ifdef STDC - typedef void const *voidpc; - typedef void FAR *voidpf; - typedef void *voidp; -#else - typedef Byte const *voidpc; - typedef Byte FAR *voidpf; - typedef Byte *voidp; -#endif - -#ifdef HAVE_UNISTD_H /* may be set to #if 1 by ./configure */ -# define Z_HAVE_UNISTD_H -#endif - -#ifdef STDC -# include /* for off_t */ -#endif - -/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and - * "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even - * though the former does not conform to the LFS document), but considering - * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as - * equivalently requesting no 64-bit operations - */ -#if -_LARGEFILE64_SOURCE - -1 == 1 -# undef _LARGEFILE64_SOURCE -#endif - -#if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE) -# include /* for SEEK_* and off_t */ -# ifdef VMS -# include /* for off_t */ -# endif -# ifndef z_off_t -# define z_off_t off_t -# endif -#endif - -#ifndef SEEK_SET -# define SEEK_SET 0 /* Seek from beginning of file. */ -# define SEEK_CUR 1 /* Seek from current position. */ -# define SEEK_END 2 /* Set file pointer to EOF plus "offset" */ -#endif - -#ifndef z_off_t -# define z_off_t long -#endif - -#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0 -# define z_off64_t off64_t -#else -# define z_off64_t z_off_t -#endif - -#if defined(__OS400__) -# define NO_vsnprintf -#endif - -#if defined(__MVS__) -# define NO_vsnprintf -#endif - -/* MVS linker does not support external names larger than 8 bytes */ -#if defined(__MVS__) - #pragma map(deflateInit_,"DEIN") - #pragma map(deflateInit2_,"DEIN2") - #pragma map(deflateEnd,"DEEND") - #pragma map(deflateBound,"DEBND") - #pragma map(inflateInit_,"ININ") - #pragma map(inflateInit2_,"ININ2") - #pragma map(inflateEnd,"INEND") - #pragma map(inflateSync,"INSY") - #pragma map(inflateSetDictionary,"INSEDI") - #pragma map(compressBound,"CMBND") - #pragma map(inflate_table,"INTABL") - #pragma map(inflate_fast,"INFA") - #pragma map(inflate_copyright,"INCOPY") -#endif - -#endif /* ZCONF_H */ diff --git a/libs/libwebsockets/win32port/zlib/zlib.h b/libs/libwebsockets/win32port/zlib/zlib.h deleted file mode 100644 index cba7ab2fb3..0000000000 --- a/libs/libwebsockets/win32port/zlib/zlib.h +++ /dev/null @@ -1,1613 +0,0 @@ -/* zlib.h -- interface of the 'zlib' general purpose compression library - version 1.2.5, April 19th, 2010 - - Copyright (C) 1995-2010 Jean-loup Gailly and Mark Adler - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. - - Jean-loup Gailly Mark Adler - jloup@gzip.org madler@alumni.caltech.edu - - - The data format used by the zlib library is described by RFCs (Request for - Comments) 1950 to 1952 in the files http://www.ietf.org/rfc/rfc1950.txt - (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format). -*/ - -#ifndef ZLIB_H -#define ZLIB_H - -#include "zconf.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#define ZLIB_VERSION "1.2.5" -#define ZLIB_VERNUM 0x1250 -#define ZLIB_VER_MAJOR 1 -#define ZLIB_VER_MINOR 2 -#define ZLIB_VER_REVISION 5 -#define ZLIB_VER_SUBREVISION 0 - -/* - The 'zlib' compression library provides in-memory compression and - decompression functions, including integrity checks of the uncompressed data. - This version of the library supports only one compression method (deflation) - but other algorithms will be added later and will have the same stream - interface. - - Compression can be done in a single step if the buffers are large enough, - or can be done by repeated calls of the compression function. In the latter - case, the application must provide more input and/or consume the output - (providing more output space) before each call. - - The compressed data format used by default by the in-memory functions is - the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped - around a deflate stream, which is itself documented in RFC 1951. - - The library also supports reading and writing files in gzip (.gz) format - with an interface similar to that of stdio using the functions that start - with "gz". The gzip format is different from the zlib format. gzip is a - gzip wrapper, documented in RFC 1952, wrapped around a deflate stream. - - This library can optionally read and write gzip streams in memory as well. - - The zlib format was designed to be compact and fast for use in memory - and on communications channels. The gzip format was designed for single- - file compression on file systems, has a larger header than zlib to maintain - directory information, and uses a different, slower check method than zlib. - - The library does not install any signal handler. The decoder checks - the consistency of the compressed data, so the library should never crash - even in case of corrupted input. -*/ - -typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size)); -typedef void (*free_func) OF((voidpf opaque, voidpf address)); - -struct internal_state; - -typedef struct z_stream_s { - Bytef *next_in; /* next input byte */ - uInt avail_in; /* number of bytes available at next_in */ - uLong total_in; /* total nb of input bytes read so far */ - - Bytef *next_out; /* next output byte should be put there */ - uInt avail_out; /* remaining free space at next_out */ - uLong total_out; /* total nb of bytes output so far */ - - char *msg; /* last error message, NULL if no error */ - struct internal_state FAR *state; /* not visible by applications */ - - alloc_func zalloc; /* used to allocate the internal state */ - free_func zfree; /* used to free the internal state */ - voidpf opaque; /* private data object passed to zalloc and zfree */ - - int data_type; /* best guess about the data type: binary or text */ - uLong adler; /* adler32 value of the uncompressed data */ - uLong reserved; /* reserved for future use */ -} z_stream; - -typedef z_stream FAR *z_streamp; - -/* - gzip header information passed to and from zlib routines. See RFC 1952 - for more details on the meanings of these fields. -*/ -typedef struct gz_header_s { - int text; /* true if compressed data believed to be text */ - uLong time; /* modification time */ - int xflags; /* extra flags (not used when writing a gzip file) */ - int os; /* operating system */ - Bytef *extra; /* pointer to extra field or Z_NULL if none */ - uInt extra_len; /* extra field length (valid if extra != Z_NULL) */ - uInt extra_max; /* space at extra (only when reading header) */ - Bytef *name; /* pointer to zero-terminated file name or Z_NULL */ - uInt name_max; /* space at name (only when reading header) */ - Bytef *comment; /* pointer to zero-terminated comment or Z_NULL */ - uInt comm_max; /* space at comment (only when reading header) */ - int hcrc; /* true if there was or will be a header crc */ - int done; /* true when done reading gzip header (not used - when writing a gzip file) */ -} gz_header; - -typedef gz_header FAR *gz_headerp; - -/* - The application must update next_in and avail_in when avail_in has dropped - to zero. It must update next_out and avail_out when avail_out has dropped - to zero. The application must initialize zalloc, zfree and opaque before - calling the init function. All other fields are set by the compression - library and must not be updated by the application. - - The opaque value provided by the application will be passed as the first - parameter for calls of zalloc and zfree. This can be useful for custom - memory management. The compression library attaches no meaning to the - opaque value. - - zalloc must return Z_NULL if there is not enough memory for the object. - If zlib is used in a multi-threaded application, zalloc and zfree must be - thread safe. - - On 16-bit systems, the functions zalloc and zfree must be able to allocate - exactly 65536 bytes, but will not be required to allocate more than this if - the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS, pointers - returned by zalloc for objects of exactly 65536 bytes *must* have their - offset normalized to zero. The default allocation function provided by this - library ensures this (see zutil.c). To reduce memory requirements and avoid - any allocation of 64K objects, at the expense of compression ratio, compile - the library with -DMAX_WBITS=14 (see zconf.h). - - The fields total_in and total_out can be used for statistics or progress - reports. After compression, total_in holds the total size of the - uncompressed data and may be saved for use in the decompressor (particularly - if the decompressor wants to decompress everything in a single step). -*/ - - /* constants */ - -#define Z_NO_FLUSH 0 -#define Z_PARTIAL_FLUSH 1 -#define Z_SYNC_FLUSH 2 -#define Z_FULL_FLUSH 3 -#define Z_FINISH 4 -#define Z_BLOCK 5 -#define Z_TREES 6 -/* Allowed flush values; see deflate() and inflate() below for details */ - -#define Z_OK 0 -#define Z_STREAM_END 1 -#define Z_NEED_DICT 2 -#define Z_ERRNO (-1) -#define Z_STREAM_ERROR (-2) -#define Z_DATA_ERROR (-3) -#define Z_MEM_ERROR (-4) -#define Z_BUF_ERROR (-5) -#define Z_VERSION_ERROR (-6) -/* Return codes for the compression/decompression functions. Negative values - * are errors, positive values are used for special but normal events. - */ - -#define Z_NO_COMPRESSION 0 -#define Z_BEST_SPEED 1 -#define Z_BEST_COMPRESSION 9 -#define Z_DEFAULT_COMPRESSION (-1) -/* compression levels */ - -#define Z_FILTERED 1 -#define Z_HUFFMAN_ONLY 2 -#define Z_RLE 3 -#define Z_FIXED 4 -#define Z_DEFAULT_STRATEGY 0 -/* compression strategy; see deflateInit2() below for details */ - -#define Z_BINARY 0 -#define Z_TEXT 1 -#define Z_ASCII Z_TEXT /* for compatibility with 1.2.2 and earlier */ -#define Z_UNKNOWN 2 -/* Possible values of the data_type field (though see inflate()) */ - -#define Z_DEFLATED 8 -/* The deflate compression method (the only one supported in this version) */ - -#define Z_NULL 0 /* for initializing zalloc, zfree, opaque */ - -#define zlib_version zlibVersion() -/* for compatibility with versions < 1.0.2 */ - - - /* basic functions */ - -ZEXTERN const char * ZEXPORT zlibVersion OF((void)); -/* The application can compare zlibVersion and ZLIB_VERSION for consistency. - If the first character differs, the library code actually used is not - compatible with the zlib.h header file used by the application. This check - is automatically made by deflateInit and inflateInit. - */ - -/* -ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level)); - - Initializes the internal stream state for compression. The fields - zalloc, zfree and opaque must be initialized before by the caller. If - zalloc and zfree are set to Z_NULL, deflateInit updates them to use default - allocation functions. - - The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9: - 1 gives best speed, 9 gives best compression, 0 gives no compression at all - (the input data is simply copied a block at a time). Z_DEFAULT_COMPRESSION - requests a default compromise between speed and compression (currently - equivalent to level 6). - - deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough - memory, Z_STREAM_ERROR if level is not a valid compression level, or - Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible - with the version assumed by the caller (ZLIB_VERSION). msg is set to null - if there is no error message. deflateInit does not perform any compression: - this will be done by deflate(). -*/ - - -ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush)); -/* - deflate compresses as much data as possible, and stops when the input - buffer becomes empty or the output buffer becomes full. It may introduce - some output latency (reading input without producing any output) except when - forced to flush. - - The detailed semantics are as follows. deflate performs one or both of the - following actions: - - - Compress more input starting at next_in and update next_in and avail_in - accordingly. If not all input can be processed (because there is not - enough room in the output buffer), next_in and avail_in are updated and - processing will resume at this point for the next call of deflate(). - - - Provide more output starting at next_out and update next_out and avail_out - accordingly. This action is forced if the parameter flush is non zero. - Forcing flush frequently degrades the compression ratio, so this parameter - should be set only when necessary (in interactive applications). Some - output may be provided even if flush is not set. - - Before the call of deflate(), the application should ensure that at least - one of the actions is possible, by providing more input and/or consuming more - output, and updating avail_in or avail_out accordingly; avail_out should - never be zero before the call. The application can consume the compressed - output when it wants, for example when the output buffer is full (avail_out - == 0), or after each call of deflate(). If deflate returns Z_OK and with - zero avail_out, it must be called again after making room in the output - buffer because there might be more output pending. - - Normally the parameter flush is set to Z_NO_FLUSH, which allows deflate to - decide how much data to accumulate before producing output, in order to - maximize compression. - - If the parameter flush is set to Z_SYNC_FLUSH, all pending output is - flushed to the output buffer and the output is aligned on a byte boundary, so - that the decompressor can get all input data available so far. (In - particular avail_in is zero after the call if enough output space has been - provided before the call.) Flushing may degrade compression for some - compression algorithms and so it should be used only when necessary. This - completes the current deflate block and follows it with an empty stored block - that is three bits plus filler bits to the next byte, followed by four bytes - (00 00 ff ff). - - If flush is set to Z_PARTIAL_FLUSH, all pending output is flushed to the - output buffer, but the output is not aligned to a byte boundary. All of the - input data so far will be available to the decompressor, as for Z_SYNC_FLUSH. - This completes the current deflate block and follows it with an empty fixed - codes block that is 10 bits long. This assures that enough bytes are output - in order for the decompressor to finish the block before the empty fixed code - block. - - If flush is set to Z_BLOCK, a deflate block is completed and emitted, as - for Z_SYNC_FLUSH, but the output is not aligned on a byte boundary, and up to - seven bits of the current block are held to be written as the next byte after - the next deflate block is completed. In this case, the decompressor may not - be provided enough bits at this point in order to complete decompression of - the data provided so far to the compressor. It may need to wait for the next - block to be emitted. This is for advanced applications that need to control - the emission of deflate blocks. - - If flush is set to Z_FULL_FLUSH, all output is flushed as with - Z_SYNC_FLUSH, and the compression state is reset so that decompression can - restart from this point if previous compressed data has been damaged or if - random access is desired. Using Z_FULL_FLUSH too often can seriously degrade - compression. - - If deflate returns with avail_out == 0, this function must be called again - with the same value of the flush parameter and more output space (updated - avail_out), until the flush is complete (deflate returns with non-zero - avail_out). In the case of a Z_FULL_FLUSH or Z_SYNC_FLUSH, make sure that - avail_out is greater than six to avoid repeated flush markers due to - avail_out == 0 on return. - - If the parameter flush is set to Z_FINISH, pending input is processed, - pending output is flushed and deflate returns with Z_STREAM_END if there was - enough output space; if deflate returns with Z_OK, this function must be - called again with Z_FINISH and more output space (updated avail_out) but no - more input data, until it returns with Z_STREAM_END or an error. After - deflate has returned Z_STREAM_END, the only possible operations on the stream - are deflateReset or deflateEnd. - - Z_FINISH can be used immediately after deflateInit if all the compression - is to be done in a single step. In this case, avail_out must be at least the - value returned by deflateBound (see below). If deflate does not return - Z_STREAM_END, then it must be called again as described above. - - deflate() sets strm->adler to the adler32 checksum of all input read - so far (that is, total_in bytes). - - deflate() may update strm->data_type if it can make a good guess about - the input data type (Z_BINARY or Z_TEXT). In doubt, the data is considered - binary. This field is only for information purposes and does not affect the - compression algorithm in any manner. - - deflate() returns Z_OK if some progress has been made (more input - processed or more output produced), Z_STREAM_END if all input has been - consumed and all output has been produced (only when flush is set to - Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example - if next_in or next_out was Z_NULL), Z_BUF_ERROR if no progress is possible - (for example avail_in or avail_out was zero). Note that Z_BUF_ERROR is not - fatal, and deflate() can be called again with more input and more output - space to continue compressing. -*/ - - -ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm)); -/* - All dynamically allocated data structures for this stream are freed. - This function discards any unprocessed input and does not flush any pending - output. - - deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the - stream state was inconsistent, Z_DATA_ERROR if the stream was freed - prematurely (some input or output was discarded). In the error case, msg - may be set but then points to a static string (which must not be - deallocated). -*/ - - -/* -ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm)); - - Initializes the internal stream state for decompression. The fields - next_in, avail_in, zalloc, zfree and opaque must be initialized before by - the caller. If next_in is not Z_NULL and avail_in is large enough (the - exact value depends on the compression method), inflateInit determines the - compression method from the zlib header and allocates all data structures - accordingly; otherwise the allocation will be deferred to the first call of - inflate. If zalloc and zfree are set to Z_NULL, inflateInit updates them to - use default allocation functions. - - inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough - memory, Z_VERSION_ERROR if the zlib library version is incompatible with the - version assumed by the caller, or Z_STREAM_ERROR if the parameters are - invalid, such as a null pointer to the structure. msg is set to null if - there is no error message. inflateInit does not perform any decompression - apart from possibly reading the zlib header if present: actual decompression - will be done by inflate(). (So next_in and avail_in may be modified, but - next_out and avail_out are unused and unchanged.) The current implementation - of inflateInit() does not process any header information -- that is deferred - until inflate() is called. -*/ - - -ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush)); -/* - inflate decompresses as much data as possible, and stops when the input - buffer becomes empty or the output buffer becomes full. It may introduce - some output latency (reading input without producing any output) except when - forced to flush. - - The detailed semantics are as follows. inflate performs one or both of the - following actions: - - - Decompress more input starting at next_in and update next_in and avail_in - accordingly. If not all input can be processed (because there is not - enough room in the output buffer), next_in is updated and processing will - resume at this point for the next call of inflate(). - - - Provide more output starting at next_out and update next_out and avail_out - accordingly. inflate() provides as much output as possible, until there is - no more input data or no more space in the output buffer (see below about - the flush parameter). - - Before the call of inflate(), the application should ensure that at least - one of the actions is possible, by providing more input and/or consuming more - output, and updating the next_* and avail_* values accordingly. The - application can consume the uncompressed output when it wants, for example - when the output buffer is full (avail_out == 0), or after each call of - inflate(). If inflate returns Z_OK and with zero avail_out, it must be - called again after making room in the output buffer because there might be - more output pending. - - The flush parameter of inflate() can be Z_NO_FLUSH, Z_SYNC_FLUSH, Z_FINISH, - Z_BLOCK, or Z_TREES. Z_SYNC_FLUSH requests that inflate() flush as much - output as possible to the output buffer. Z_BLOCK requests that inflate() - stop if and when it gets to the next deflate block boundary. When decoding - the zlib or gzip format, this will cause inflate() to return immediately - after the header and before the first block. When doing a raw inflate, - inflate() will go ahead and process the first block, and will return when it - gets to the end of that block, or when it runs out of data. - - The Z_BLOCK option assists in appending to or combining deflate streams. - Also to assist in this, on return inflate() will set strm->data_type to the - number of unused bits in the last byte taken from strm->next_in, plus 64 if - inflate() is currently decoding the last block in the deflate stream, plus - 128 if inflate() returned immediately after decoding an end-of-block code or - decoding the complete header up to just before the first byte of the deflate - stream. The end-of-block will not be indicated until all of the uncompressed - data from that block has been written to strm->next_out. The number of - unused bits may in general be greater than seven, except when bit 7 of - data_type is set, in which case the number of unused bits will be less than - eight. data_type is set as noted here every time inflate() returns for all - flush options, and so can be used to determine the amount of currently - consumed input in bits. - - The Z_TREES option behaves as Z_BLOCK does, but it also returns when the - end of each deflate block header is reached, before any actual data in that - block is decoded. This allows the caller to determine the length of the - deflate block header for later use in random access within a deflate block. - 256 is added to the value of strm->data_type when inflate() returns - immediately after reaching the end of the deflate block header. - - inflate() should normally be called until it returns Z_STREAM_END or an - error. However if all decompression is to be performed in a single step (a - single call of inflate), the parameter flush should be set to Z_FINISH. In - this case all pending input is processed and all pending output is flushed; - avail_out must be large enough to hold all the uncompressed data. (The size - of the uncompressed data may have been saved by the compressor for this - purpose.) The next operation on this stream must be inflateEnd to deallocate - the decompression state. The use of Z_FINISH is never required, but can be - used to inform inflate that a faster approach may be used for the single - inflate() call. - - In this implementation, inflate() always flushes as much output as - possible to the output buffer, and always uses the faster approach on the - first call. So the only effect of the flush parameter in this implementation - is on the return value of inflate(), as noted below, or when it returns early - because Z_BLOCK or Z_TREES is used. - - If a preset dictionary is needed after this call (see inflateSetDictionary - below), inflate sets strm->adler to the adler32 checksum of the dictionary - chosen by the compressor and returns Z_NEED_DICT; otherwise it sets - strm->adler to the adler32 checksum of all output produced so far (that is, - total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described - below. At the end of the stream, inflate() checks that its computed adler32 - checksum is equal to that saved by the compressor and returns Z_STREAM_END - only if the checksum is correct. - - inflate() can decompress and check either zlib-wrapped or gzip-wrapped - deflate data. The header type is detected automatically, if requested when - initializing with inflateInit2(). Any information contained in the gzip - header is not retained, so applications that need that information should - instead use raw inflate, see inflateInit2() below, or inflateBack() and - perform their own processing of the gzip header and trailer. - - inflate() returns Z_OK if some progress has been made (more input processed - or more output produced), Z_STREAM_END if the end of the compressed data has - been reached and all uncompressed output has been produced, Z_NEED_DICT if a - preset dictionary is needed at this point, Z_DATA_ERROR if the input data was - corrupted (input stream not conforming to the zlib format or incorrect check - value), Z_STREAM_ERROR if the stream structure was inconsistent (for example - next_in or next_out was Z_NULL), Z_MEM_ERROR if there was not enough memory, - Z_BUF_ERROR if no progress is possible or if there was not enough room in the - output buffer when Z_FINISH is used. Note that Z_BUF_ERROR is not fatal, and - inflate() can be called again with more input and more output space to - continue decompressing. If Z_DATA_ERROR is returned, the application may - then call inflateSync() to look for a good compression block if a partial - recovery of the data is desired. -*/ - - -ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm)); -/* - All dynamically allocated data structures for this stream are freed. - This function discards any unprocessed input and does not flush any pending - output. - - inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state - was inconsistent. In the error case, msg may be set but then points to a - static string (which must not be deallocated). -*/ - - - /* Advanced functions */ - -/* - The following functions are needed only in some special applications. -*/ - -/* -ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm, - int level, - int method, - int windowBits, - int memLevel, - int strategy)); - - This is another version of deflateInit with more compression options. The - fields next_in, zalloc, zfree and opaque must be initialized before by the - caller. - - The method parameter is the compression method. It must be Z_DEFLATED in - this version of the library. - - The windowBits parameter is the base two logarithm of the window size - (the size of the history buffer). It should be in the range 8..15 for this - version of the library. Larger values of this parameter result in better - compression at the expense of memory usage. The default value is 15 if - deflateInit is used instead. - - windowBits can also be -8..-15 for raw deflate. In this case, -windowBits - determines the window size. deflate() will then generate raw deflate data - with no zlib header or trailer, and will not compute an adler32 check value. - - windowBits can also be greater than 15 for optional gzip encoding. Add - 16 to windowBits to write a simple gzip header and trailer around the - compressed data instead of a zlib wrapper. The gzip header will have no - file name, no extra data, no comment, no modification time (set to zero), no - header crc, and the operating system will be set to 255 (unknown). If a - gzip stream is being written, strm->adler is a crc32 instead of an adler32. - - The memLevel parameter specifies how much memory should be allocated - for the internal compression state. memLevel=1 uses minimum memory but is - slow and reduces compression ratio; memLevel=9 uses maximum memory for - optimal speed. The default value is 8. See zconf.h for total memory usage - as a function of windowBits and memLevel. - - The strategy parameter is used to tune the compression algorithm. Use the - value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a - filter (or predictor), Z_HUFFMAN_ONLY to force Huffman encoding only (no - string match), or Z_RLE to limit match distances to one (run-length - encoding). Filtered data consists mostly of small values with a somewhat - random distribution. In this case, the compression algorithm is tuned to - compress them better. The effect of Z_FILTERED is to force more Huffman - coding and less string matching; it is somewhat intermediate between - Z_DEFAULT_STRATEGY and Z_HUFFMAN_ONLY. Z_RLE is designed to be almost as - fast as Z_HUFFMAN_ONLY, but give better compression for PNG image data. The - strategy parameter only affects the compression ratio but not the - correctness of the compressed output even if it is not set appropriately. - Z_FIXED prevents the use of dynamic Huffman codes, allowing for a simpler - decoder for special applications. - - deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough - memory, Z_STREAM_ERROR if any parameter is invalid (such as an invalid - method), or Z_VERSION_ERROR if the zlib library version (zlib_version) is - incompatible with the version assumed by the caller (ZLIB_VERSION). msg is - set to null if there is no error message. deflateInit2 does not perform any - compression: this will be done by deflate(). -*/ - -ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm, - const Bytef *dictionary, - uInt dictLength)); -/* - Initializes the compression dictionary from the given byte sequence - without producing any compressed output. This function must be called - immediately after deflateInit, deflateInit2 or deflateReset, before any call - of deflate. The compressor and decompressor must use exactly the same - dictionary (see inflateSetDictionary). - - The dictionary should consist of strings (byte sequences) that are likely - to be encountered later in the data to be compressed, with the most commonly - used strings preferably put towards the end of the dictionary. Using a - dictionary is most useful when the data to be compressed is short and can be - predicted with good accuracy; the data can then be compressed better than - with the default empty dictionary. - - Depending on the size of the compression data structures selected by - deflateInit or deflateInit2, a part of the dictionary may in effect be - discarded, for example if the dictionary is larger than the window size - provided in deflateInit or deflateInit2. Thus the strings most likely to be - useful should be put at the end of the dictionary, not at the front. In - addition, the current implementation of deflate will use at most the window - size minus 262 bytes of the provided dictionary. - - Upon return of this function, strm->adler is set to the adler32 value - of the dictionary; the decompressor may later use this value to determine - which dictionary has been used by the compressor. (The adler32 value - applies to the whole dictionary even if only a subset of the dictionary is - actually used by the compressor.) If a raw deflate was requested, then the - adler32 value is not computed and strm->adler is not set. - - deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a - parameter is invalid (e.g. dictionary being Z_NULL) or the stream state is - inconsistent (for example if deflate has already been called for this stream - or if the compression method is bsort). deflateSetDictionary does not - perform any compression: this will be done by deflate(). -*/ - -ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest, - z_streamp source)); -/* - Sets the destination stream as a complete copy of the source stream. - - This function can be useful when several compression strategies will be - tried, for example when there are several ways of pre-processing the input - data with a filter. The streams that will be discarded should then be freed - by calling deflateEnd. Note that deflateCopy duplicates the internal - compression state which can be quite large, so this strategy is slow and can - consume lots of memory. - - deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not - enough memory, Z_STREAM_ERROR if the source stream state was inconsistent - (such as zalloc being Z_NULL). msg is left unchanged in both source and - destination. -*/ - -ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm)); -/* - This function is equivalent to deflateEnd followed by deflateInit, - but does not free and reallocate all the internal compression state. The - stream will keep the same compression level and any other attributes that - may have been set by deflateInit2. - - deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source - stream state was inconsistent (such as zalloc or state being Z_NULL). -*/ - -ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm, - int level, - int strategy)); -/* - Dynamically update the compression level and compression strategy. The - interpretation of level and strategy is as in deflateInit2. This can be - used to switch between compression and straight copy of the input data, or - to switch to a different kind of input data requiring a different strategy. - If the compression level is changed, the input available so far is - compressed with the old level (and may be flushed); the new level will take - effect only at the next call of deflate(). - - Before the call of deflateParams, the stream state must be set as for - a call of deflate(), since the currently available input may have to be - compressed and flushed. In particular, strm->avail_out must be non-zero. - - deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source - stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR if - strm->avail_out was zero. -*/ - -ZEXTERN int ZEXPORT deflateTune OF((z_streamp strm, - int good_length, - int max_lazy, - int nice_length, - int max_chain)); -/* - Fine tune deflate's internal compression parameters. This should only be - used by someone who understands the algorithm used by zlib's deflate for - searching for the best matching string, and even then only by the most - fanatic optimizer trying to squeeze out the last compressed bit for their - specific input data. Read the deflate.c source code for the meaning of the - max_lazy, good_length, nice_length, and max_chain parameters. - - deflateTune() can be called after deflateInit() or deflateInit2(), and - returns Z_OK on success, or Z_STREAM_ERROR for an invalid deflate stream. - */ - -ZEXTERN uLong ZEXPORT deflateBound OF((z_streamp strm, - uLong sourceLen)); -/* - deflateBound() returns an upper bound on the compressed size after - deflation of sourceLen bytes. It must be called after deflateInit() or - deflateInit2(), and after deflateSetHeader(), if used. This would be used - to allocate an output buffer for deflation in a single pass, and so would be - called before deflate(). -*/ - -ZEXTERN int ZEXPORT deflatePrime OF((z_streamp strm, - int bits, - int value)); -/* - deflatePrime() inserts bits in the deflate output stream. The intent - is that this function is used to start off the deflate output with the bits - leftover from a previous deflate stream when appending to it. As such, this - function can only be used for raw deflate, and must be used before the first - deflate() call after a deflateInit2() or deflateReset(). bits must be less - than or equal to 16, and that many of the least significant bits of value - will be inserted in the output. - - deflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source - stream state was inconsistent. -*/ - -ZEXTERN int ZEXPORT deflateSetHeader OF((z_streamp strm, - gz_headerp head)); -/* - deflateSetHeader() provides gzip header information for when a gzip - stream is requested by deflateInit2(). deflateSetHeader() may be called - after deflateInit2() or deflateReset() and before the first call of - deflate(). The text, time, os, extra field, name, and comment information - in the provided gz_header structure are written to the gzip header (xflag is - ignored -- the extra flags are set according to the compression level). The - caller must assure that, if not Z_NULL, name and comment are terminated with - a zero byte, and that if extra is not Z_NULL, that extra_len bytes are - available there. If hcrc is true, a gzip header crc is included. Note that - the current versions of the command-line version of gzip (up through version - 1.3.x) do not support header crc's, and will report that it is a "multi-part - gzip file" and give up. - - If deflateSetHeader is not used, the default gzip header has text false, - the time set to zero, and os set to 255, with no extra, name, or comment - fields. The gzip header is returned to the default state by deflateReset(). - - deflateSetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source - stream state was inconsistent. -*/ - -/* -ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm, - int windowBits)); - - This is another version of inflateInit with an extra parameter. The - fields next_in, avail_in, zalloc, zfree and opaque must be initialized - before by the caller. - - The windowBits parameter is the base two logarithm of the maximum window - size (the size of the history buffer). It should be in the range 8..15 for - this version of the library. The default value is 15 if inflateInit is used - instead. windowBits must be greater than or equal to the windowBits value - provided to deflateInit2() while compressing, or it must be equal to 15 if - deflateInit2() was not used. If a compressed stream with a larger window - size is given as input, inflate() will return with the error code - Z_DATA_ERROR instead of trying to allocate a larger window. - - windowBits can also be zero to request that inflate use the window size in - the zlib header of the compressed stream. - - windowBits can also be -8..-15 for raw inflate. In this case, -windowBits - determines the window size. inflate() will then process raw deflate data, - not looking for a zlib or gzip header, not generating a check value, and not - looking for any check values for comparison at the end of the stream. This - is for use with other formats that use the deflate compressed data format - such as zip. Those formats provide their own check values. If a custom - format is developed using the raw deflate format for compressed data, it is - recommended that a check value such as an adler32 or a crc32 be applied to - the uncompressed data as is done in the zlib, gzip, and zip formats. For - most applications, the zlib format should be used as is. Note that comments - above on the use in deflateInit2() applies to the magnitude of windowBits. - - windowBits can also be greater than 15 for optional gzip decoding. Add - 32 to windowBits to enable zlib and gzip decoding with automatic header - detection, or add 16 to decode only the gzip format (the zlib format will - return a Z_DATA_ERROR). If a gzip stream is being decoded, strm->adler is a - crc32 instead of an adler32. - - inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough - memory, Z_VERSION_ERROR if the zlib library version is incompatible with the - version assumed by the caller, or Z_STREAM_ERROR if the parameters are - invalid, such as a null pointer to the structure. msg is set to null if - there is no error message. inflateInit2 does not perform any decompression - apart from possibly reading the zlib header if present: actual decompression - will be done by inflate(). (So next_in and avail_in may be modified, but - next_out and avail_out are unused and unchanged.) The current implementation - of inflateInit2() does not process any header information -- that is - deferred until inflate() is called. -*/ - -ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm, - const Bytef *dictionary, - uInt dictLength)); -/* - Initializes the decompression dictionary from the given uncompressed byte - sequence. This function must be called immediately after a call of inflate, - if that call returned Z_NEED_DICT. The dictionary chosen by the compressor - can be determined from the adler32 value returned by that call of inflate. - The compressor and decompressor must use exactly the same dictionary (see - deflateSetDictionary). For raw inflate, this function can be called - immediately after inflateInit2() or inflateReset() and before any call of - inflate() to set the dictionary. The application must insure that the - dictionary that was used for compression is provided. - - inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a - parameter is invalid (e.g. dictionary being Z_NULL) or the stream state is - inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the - expected one (incorrect adler32 value). inflateSetDictionary does not - perform any decompression: this will be done by subsequent calls of - inflate(). -*/ - -ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm)); -/* - Skips invalid compressed data until a full flush point (see above the - description of deflate with Z_FULL_FLUSH) can be found, or until all - available input is skipped. No output is provided. - - inflateSync returns Z_OK if a full flush point has been found, Z_BUF_ERROR - if no more input was provided, Z_DATA_ERROR if no flush point has been - found, or Z_STREAM_ERROR if the stream structure was inconsistent. In the - success case, the application may save the current current value of total_in - which indicates where valid compressed data was found. In the error case, - the application may repeatedly call inflateSync, providing more input each - time, until success or end of the input data. -*/ - -ZEXTERN int ZEXPORT inflateCopy OF((z_streamp dest, - z_streamp source)); -/* - Sets the destination stream as a complete copy of the source stream. - - This function can be useful when randomly accessing a large stream. The - first pass through the stream can periodically record the inflate state, - allowing restarting inflate at those points when randomly accessing the - stream. - - inflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not - enough memory, Z_STREAM_ERROR if the source stream state was inconsistent - (such as zalloc being Z_NULL). msg is left unchanged in both source and - destination. -*/ - -ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm)); -/* - This function is equivalent to inflateEnd followed by inflateInit, - but does not free and reallocate all the internal decompression state. The - stream will keep attributes that may have been set by inflateInit2. - - inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source - stream state was inconsistent (such as zalloc or state being Z_NULL). -*/ - -ZEXTERN int ZEXPORT inflateReset2 OF((z_streamp strm, - int windowBits)); -/* - This function is the same as inflateReset, but it also permits changing - the wrap and window size requests. The windowBits parameter is interpreted - the same as it is for inflateInit2. - - inflateReset2 returns Z_OK if success, or Z_STREAM_ERROR if the source - stream state was inconsistent (such as zalloc or state being Z_NULL), or if - the windowBits parameter is invalid. -*/ - -ZEXTERN int ZEXPORT inflatePrime OF((z_streamp strm, - int bits, - int value)); -/* - This function inserts bits in the inflate input stream. The intent is - that this function is used to start inflating at a bit position in the - middle of a byte. The provided bits will be used before any bytes are used - from next_in. This function should only be used with raw inflate, and - should be used before the first inflate() call after inflateInit2() or - inflateReset(). bits must be less than or equal to 16, and that many of the - least significant bits of value will be inserted in the input. - - If bits is negative, then the input stream bit buffer is emptied. Then - inflatePrime() can be called again to put bits in the buffer. This is used - to clear out bits leftover after feeding inflate a block description prior - to feeding inflate codes. - - inflatePrime returns Z_OK if success, or Z_STREAM_ERROR if the source - stream state was inconsistent. -*/ - -ZEXTERN long ZEXPORT inflateMark OF((z_streamp strm)); -/* - This function returns two values, one in the lower 16 bits of the return - value, and the other in the remaining upper bits, obtained by shifting the - return value down 16 bits. If the upper value is -1 and the lower value is - zero, then inflate() is currently decoding information outside of a block. - If the upper value is -1 and the lower value is non-zero, then inflate is in - the middle of a stored block, with the lower value equaling the number of - bytes from the input remaining to copy. If the upper value is not -1, then - it is the number of bits back from the current bit position in the input of - the code (literal or length/distance pair) currently being processed. In - that case the lower value is the number of bytes already emitted for that - code. - - A code is being processed if inflate is waiting for more input to complete - decoding of the code, or if it has completed decoding but is waiting for - more output space to write the literal or match data. - - inflateMark() is used to mark locations in the input data for random - access, which may be at bit positions, and to note those cases where the - output of a code may span boundaries of random access blocks. The current - location in the input stream can be determined from avail_in and data_type - as noted in the description for the Z_BLOCK flush parameter for inflate. - - inflateMark returns the value noted above or -1 << 16 if the provided - source stream state was inconsistent. -*/ - -ZEXTERN int ZEXPORT inflateGetHeader OF((z_streamp strm, - gz_headerp head)); -/* - inflateGetHeader() requests that gzip header information be stored in the - provided gz_header structure. inflateGetHeader() may be called after - inflateInit2() or inflateReset(), and before the first call of inflate(). - As inflate() processes the gzip stream, head->done is zero until the header - is completed, at which time head->done is set to one. If a zlib stream is - being decoded, then head->done is set to -1 to indicate that there will be - no gzip header information forthcoming. Note that Z_BLOCK or Z_TREES can be - used to force inflate() to return immediately after header processing is - complete and before any actual data is decompressed. - - The text, time, xflags, and os fields are filled in with the gzip header - contents. hcrc is set to true if there is a header CRC. (The header CRC - was valid if done is set to one.) If extra is not Z_NULL, then extra_max - contains the maximum number of bytes to write to extra. Once done is true, - extra_len contains the actual extra field length, and extra contains the - extra field, or that field truncated if extra_max is less than extra_len. - If name is not Z_NULL, then up to name_max characters are written there, - terminated with a zero unless the length is greater than name_max. If - comment is not Z_NULL, then up to comm_max characters are written there, - terminated with a zero unless the length is greater than comm_max. When any - of extra, name, or comment are not Z_NULL and the respective field is not - present in the header, then that field is set to Z_NULL to signal its - absence. This allows the use of deflateSetHeader() with the returned - structure to duplicate the header. However if those fields are set to - allocated memory, then the application will need to save those pointers - elsewhere so that they can be eventually freed. - - If inflateGetHeader is not used, then the header information is simply - discarded. The header is always checked for validity, including the header - CRC if present. inflateReset() will reset the process to discard the header - information. The application would need to call inflateGetHeader() again to - retrieve the header from the next gzip stream. - - inflateGetHeader returns Z_OK if success, or Z_STREAM_ERROR if the source - stream state was inconsistent. -*/ - -/* -ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits, - unsigned char FAR *window)); - - Initialize the internal stream state for decompression using inflateBack() - calls. The fields zalloc, zfree and opaque in strm must be initialized - before the call. If zalloc and zfree are Z_NULL, then the default library- - derived memory allocation routines are used. windowBits is the base two - logarithm of the window size, in the range 8..15. window is a caller - supplied buffer of that size. Except for special applications where it is - assured that deflate was used with small window sizes, windowBits must be 15 - and a 32K byte window must be supplied to be able to decompress general - deflate streams. - - See inflateBack() for the usage of these routines. - - inflateBackInit will return Z_OK on success, Z_STREAM_ERROR if any of - the paramaters are invalid, Z_MEM_ERROR if the internal state could not be - allocated, or Z_VERSION_ERROR if the version of the library does not match - the version of the header file. -*/ - -typedef unsigned (*in_func) OF((void FAR *, unsigned char FAR * FAR *)); -typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned)); - -ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm, - in_func in, void FAR *in_desc, - out_func out, void FAR *out_desc)); -/* - inflateBack() does a raw inflate with a single call using a call-back - interface for input and output. This is more efficient than inflate() for - file i/o applications in that it avoids copying between the output and the - sliding window by simply making the window itself the output buffer. This - function trusts the application to not change the output buffer passed by - the output function, at least until inflateBack() returns. - - inflateBackInit() must be called first to allocate the internal state - and to initialize the state with the user-provided window buffer. - inflateBack() may then be used multiple times to inflate a complete, raw - deflate stream with each call. inflateBackEnd() is then called to free the - allocated state. - - A raw deflate stream is one with no zlib or gzip header or trailer. - This routine would normally be used in a utility that reads zip or gzip - files and writes out uncompressed files. The utility would decode the - header and process the trailer on its own, hence this routine expects only - the raw deflate stream to decompress. This is different from the normal - behavior of inflate(), which expects either a zlib or gzip header and - trailer around the deflate stream. - - inflateBack() uses two subroutines supplied by the caller that are then - called by inflateBack() for input and output. inflateBack() calls those - routines until it reads a complete deflate stream and writes out all of the - uncompressed data, or until it encounters an error. The function's - parameters and return types are defined above in the in_func and out_func - typedefs. inflateBack() will call in(in_desc, &buf) which should return the - number of bytes of provided input, and a pointer to that input in buf. If - there is no input available, in() must return zero--buf is ignored in that - case--and inflateBack() will return a buffer error. inflateBack() will call - out(out_desc, buf, len) to write the uncompressed data buf[0..len-1]. out() - should return zero on success, or non-zero on failure. If out() returns - non-zero, inflateBack() will return with an error. Neither in() nor out() - are permitted to change the contents of the window provided to - inflateBackInit(), which is also the buffer that out() uses to write from. - The length written by out() will be at most the window size. Any non-zero - amount of input may be provided by in(). - - For convenience, inflateBack() can be provided input on the first call by - setting strm->next_in and strm->avail_in. If that input is exhausted, then - in() will be called. Therefore strm->next_in must be initialized before - calling inflateBack(). If strm->next_in is Z_NULL, then in() will be called - immediately for input. If strm->next_in is not Z_NULL, then strm->avail_in - must also be initialized, and then if strm->avail_in is not zero, input will - initially be taken from strm->next_in[0 .. strm->avail_in - 1]. - - The in_desc and out_desc parameters of inflateBack() is passed as the - first parameter of in() and out() respectively when they are called. These - descriptors can be optionally used to pass any information that the caller- - supplied in() and out() functions need to do their job. - - On return, inflateBack() will set strm->next_in and strm->avail_in to - pass back any unused input that was provided by the last in() call. The - return values of inflateBack() can be Z_STREAM_END on success, Z_BUF_ERROR - if in() or out() returned an error, Z_DATA_ERROR if there was a format error - in the deflate stream (in which case strm->msg is set to indicate the nature - of the error), or Z_STREAM_ERROR if the stream was not properly initialized. - In the case of Z_BUF_ERROR, an input or output error can be distinguished - using strm->next_in which will be Z_NULL only if in() returned an error. If - strm->next_in is not Z_NULL, then the Z_BUF_ERROR was due to out() returning - non-zero. (in() will always be called before out(), so strm->next_in is - assured to be defined if out() returns non-zero.) Note that inflateBack() - cannot return Z_OK. -*/ - -ZEXTERN int ZEXPORT inflateBackEnd OF((z_streamp strm)); -/* - All memory allocated by inflateBackInit() is freed. - - inflateBackEnd() returns Z_OK on success, or Z_STREAM_ERROR if the stream - state was inconsistent. -*/ - -ZEXTERN uLong ZEXPORT zlibCompileFlags OF((void)); -/* Return flags indicating compile-time options. - - Type sizes, two bits each, 00 = 16 bits, 01 = 32, 10 = 64, 11 = other: - 1.0: size of uInt - 3.2: size of uLong - 5.4: size of voidpf (pointer) - 7.6: size of z_off_t - - Compiler, assembler, and debug options: - 8: DEBUG - 9: ASMV or ASMINF -- use ASM code - 10: ZLIB_WINAPI -- exported functions use the WINAPI calling convention - 11: 0 (reserved) - - One-time table building (smaller code, but not thread-safe if true): - 12: BUILDFIXED -- build static block decoding tables when needed - 13: DYNAMIC_CRC_TABLE -- build CRC calculation tables when needed - 14,15: 0 (reserved) - - Library content (indicates missing functionality): - 16: NO_GZCOMPRESS -- gz* functions cannot compress (to avoid linking - deflate code when not needed) - 17: NO_GZIP -- deflate can't write gzip streams, and inflate can't detect - and decode gzip streams (to avoid linking crc code) - 18-19: 0 (reserved) - - Operation variations (changes in library functionality): - 20: PKZIP_BUG_WORKAROUND -- slightly more permissive inflate - 21: FASTEST -- deflate algorithm with only one, lowest compression level - 22,23: 0 (reserved) - - The sprintf variant used by gzprintf (zero is best): - 24: 0 = vs*, 1 = s* -- 1 means limited to 20 arguments after the format - 25: 0 = *nprintf, 1 = *printf -- 1 means gzprintf() not secure! - 26: 0 = returns value, 1 = void -- 1 means inferred string length returned - - Remainder: - 27-31: 0 (reserved) - */ - - - /* utility functions */ - -/* - The following utility functions are implemented on top of the basic - stream-oriented functions. To simplify the interface, some default options - are assumed (compression level and memory usage, standard memory allocation - functions). The source code of these utility functions can be modified if - you need special options. -*/ - -ZEXTERN int ZEXPORT compress OF((Bytef *dest, uLongf *destLen, - const Bytef *source, uLong sourceLen)); -/* - Compresses the source buffer into the destination buffer. sourceLen is - the byte length of the source buffer. Upon entry, destLen is the total size - of the destination buffer, which must be at least the value returned by - compressBound(sourceLen). Upon exit, destLen is the actual size of the - compressed buffer. - - compress returns Z_OK if success, Z_MEM_ERROR if there was not - enough memory, Z_BUF_ERROR if there was not enough room in the output - buffer. -*/ - -ZEXTERN int ZEXPORT compress2 OF((Bytef *dest, uLongf *destLen, - const Bytef *source, uLong sourceLen, - int level)); -/* - Compresses the source buffer into the destination buffer. The level - parameter has the same meaning as in deflateInit. sourceLen is the byte - length of the source buffer. Upon entry, destLen is the total size of the - destination buffer, which must be at least the value returned by - compressBound(sourceLen). Upon exit, destLen is the actual size of the - compressed buffer. - - compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough - memory, Z_BUF_ERROR if there was not enough room in the output buffer, - Z_STREAM_ERROR if the level parameter is invalid. -*/ - -ZEXTERN uLong ZEXPORT compressBound OF((uLong sourceLen)); -/* - compressBound() returns an upper bound on the compressed size after - compress() or compress2() on sourceLen bytes. It would be used before a - compress() or compress2() call to allocate the destination buffer. -*/ - -ZEXTERN int ZEXPORT uncompress OF((Bytef *dest, uLongf *destLen, - const Bytef *source, uLong sourceLen)); -/* - Decompresses the source buffer into the destination buffer. sourceLen is - the byte length of the source buffer. Upon entry, destLen is the total size - of the destination buffer, which must be large enough to hold the entire - uncompressed data. (The size of the uncompressed data must have been saved - previously by the compressor and transmitted to the decompressor by some - mechanism outside the scope of this compression library.) Upon exit, destLen - is the actual size of the uncompressed buffer. - - uncompress returns Z_OK if success, Z_MEM_ERROR if there was not - enough memory, Z_BUF_ERROR if there was not enough room in the output - buffer, or Z_DATA_ERROR if the input data was corrupted or incomplete. -*/ - - - /* gzip file access functions */ - -/* - This library supports reading and writing files in gzip (.gz) format with - an interface similar to that of stdio, using the functions that start with - "gz". The gzip format is different from the zlib format. gzip is a gzip - wrapper, documented in RFC 1952, wrapped around a deflate stream. -*/ - -typedef voidp gzFile; /* opaque gzip file descriptor */ - -/* -ZEXTERN gzFile ZEXPORT gzopen OF((const char *path, const char *mode)); - - Opens a gzip (.gz) file for reading or writing. The mode parameter is as - in fopen ("rb" or "wb") but can also include a compression level ("wb9") or - a strategy: 'f' for filtered data as in "wb6f", 'h' for Huffman-only - compression as in "wb1h", 'R' for run-length encoding as in "wb1R", or 'F' - for fixed code compression as in "wb9F". (See the description of - deflateInit2 for more information about the strategy parameter.) Also "a" - can be used instead of "w" to request that the gzip stream that will be - written be appended to the file. "+" will result in an error, since reading - and writing to the same gzip file is not supported. - - gzopen can be used to read a file which is not in gzip format; in this - case gzread will directly read from the file without decompression. - - gzopen returns NULL if the file could not be opened, if there was - insufficient memory to allocate the gzFile state, or if an invalid mode was - specified (an 'r', 'w', or 'a' was not provided, or '+' was provided). - errno can be checked to determine if the reason gzopen failed was that the - file could not be opened. -*/ - -ZEXTERN gzFile ZEXPORT gzdopen OF((int fd, const char *mode)); -/* - gzdopen associates a gzFile with the file descriptor fd. File descriptors - are obtained from calls like open, dup, creat, pipe or fileno (if the file - has been previously opened with fopen). The mode parameter is as in gzopen. - - The next call of gzclose on the returned gzFile will also close the file - descriptor fd, just like fclose(fdopen(fd, mode)) closes the file descriptor - fd. If you want to keep fd open, use fd = dup(fd_keep); gz = gzdopen(fd, - mode);. The duplicated descriptor should be saved to avoid a leak, since - gzdopen does not close fd if it fails. - - gzdopen returns NULL if there was insufficient memory to allocate the - gzFile state, if an invalid mode was specified (an 'r', 'w', or 'a' was not - provided, or '+' was provided), or if fd is -1. The file descriptor is not - used until the next gz* read, write, seek, or close operation, so gzdopen - will not detect if fd is invalid (unless fd is -1). -*/ - -ZEXTERN int ZEXPORT gzbuffer OF((gzFile file, unsigned size)); -/* - Set the internal buffer size used by this library's functions. The - default buffer size is 8192 bytes. This function must be called after - gzopen() or gzdopen(), and before any other calls that read or write the - file. The buffer memory allocation is always deferred to the first read or - write. Two buffers are allocated, either both of the specified size when - writing, or one of the specified size and the other twice that size when - reading. A larger buffer size of, for example, 64K or 128K bytes will - noticeably increase the speed of decompression (reading). - - The new buffer size also affects the maximum length for gzprintf(). - - gzbuffer() returns 0 on success, or -1 on failure, such as being called - too late. -*/ - -ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy)); -/* - Dynamically update the compression level or strategy. See the description - of deflateInit2 for the meaning of these parameters. - - gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not - opened for writing. -*/ - -ZEXTERN int ZEXPORT gzread OF((gzFile file, voidp buf, unsigned len)); -/* - Reads the given number of uncompressed bytes from the compressed file. If - the input file was not in gzip format, gzread copies the given number of - bytes into the buffer. - - After reaching the end of a gzip stream in the input, gzread will continue - to read, looking for another gzip stream, or failing that, reading the rest - of the input file directly without decompression. The entire input file - will be read if gzread is called until it returns less than the requested - len. - - gzread returns the number of uncompressed bytes actually read, less than - len for end of file, or -1 for error. -*/ - -ZEXTERN int ZEXPORT gzwrite OF((gzFile file, - voidpc buf, unsigned len)); -/* - Writes the given number of uncompressed bytes into the compressed file. - gzwrite returns the number of uncompressed bytes written or 0 in case of - error. -*/ - -ZEXTERN int ZEXPORTVA gzprintf OF((gzFile file, const char *format, ...)); -/* - Converts, formats, and writes the arguments to the compressed file under - control of the format string, as in fprintf. gzprintf returns the number of - uncompressed bytes actually written, or 0 in case of error. The number of - uncompressed bytes written is limited to 8191, or one less than the buffer - size given to gzbuffer(). The caller should assure that this limit is not - exceeded. If it is exceeded, then gzprintf() will return an error (0) with - nothing written. In this case, there may also be a buffer overflow with - unpredictable consequences, which is possible only if zlib was compiled with - the insecure functions sprintf() or vsprintf() because the secure snprintf() - or vsnprintf() functions were not available. This can be determined using - zlibCompileFlags(). -*/ - -ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s)); -/* - Writes the given null-terminated string to the compressed file, excluding - the terminating null character. - - gzputs returns the number of characters written, or -1 in case of error. -*/ - -ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len)); -/* - Reads bytes from the compressed file until len-1 characters are read, or a - newline character is read and transferred to buf, or an end-of-file - condition is encountered. If any characters are read or if len == 1, the - string is terminated with a null character. If no characters are read due - to an end-of-file or len < 1, then the buffer is left untouched. - - gzgets returns buf which is a null-terminated string, or it returns NULL - for end-of-file or in case of error. If there was an error, the contents at - buf are indeterminate. -*/ - -ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c)); -/* - Writes c, converted to an unsigned char, into the compressed file. gzputc - returns the value that was written, or -1 in case of error. -*/ - -ZEXTERN int ZEXPORT gzgetc OF((gzFile file)); -/* - Reads one byte from the compressed file. gzgetc returns this byte or -1 - in case of end of file or error. -*/ - -ZEXTERN int ZEXPORT gzungetc OF((int c, gzFile file)); -/* - Push one character back onto the stream to be read as the first character - on the next read. At least one character of push-back is allowed. - gzungetc() returns the character pushed, or -1 on failure. gzungetc() will - fail if c is -1, and may fail if a character has been pushed but not read - yet. If gzungetc is used immediately after gzopen or gzdopen, at least the - output buffer size of pushed characters is allowed. (See gzbuffer above.) - The pushed character will be discarded if the stream is repositioned with - gzseek() or gzrewind(). -*/ - -ZEXTERN int ZEXPORT gzflush OF((gzFile file, int flush)); -/* - Flushes all pending output into the compressed file. The parameter flush - is as in the deflate() function. The return value is the zlib error number - (see function gzerror below). gzflush is only permitted when writing. - - If the flush parameter is Z_FINISH, the remaining data is written and the - gzip stream is completed in the output. If gzwrite() is called again, a new - gzip stream will be started in the output. gzread() is able to read such - concatented gzip streams. - - gzflush should be called only when strictly necessary because it will - degrade compression if called too often. -*/ - -/* -ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile file, - z_off_t offset, int whence)); - - Sets the starting position for the next gzread or gzwrite on the given - compressed file. The offset represents a number of bytes in the - uncompressed data stream. The whence parameter is defined as in lseek(2); - the value SEEK_END is not supported. - - If the file is opened for reading, this function is emulated but can be - extremely slow. If the file is opened for writing, only forward seeks are - supported; gzseek then compresses a sequence of zeroes up to the new - starting position. - - gzseek returns the resulting offset location as measured in bytes from - the beginning of the uncompressed stream, or -1 in case of error, in - particular if the file is opened for writing and the new starting position - would be before the current position. -*/ - -ZEXTERN int ZEXPORT gzrewind OF((gzFile file)); -/* - Rewinds the given file. This function is supported only for reading. - - gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET) -*/ - -/* -ZEXTERN z_off_t ZEXPORT gztell OF((gzFile file)); - - Returns the starting position for the next gzread or gzwrite on the given - compressed file. This position represents a number of bytes in the - uncompressed data stream, and is zero when starting, even if appending or - reading a gzip stream from the middle of a file using gzdopen(). - - gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR) -*/ - -/* -ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile file)); - - Returns the current offset in the file being read or written. This offset - includes the count of bytes that precede the gzip stream, for example when - appending or when using gzdopen() for reading. When reading, the offset - does not include as yet unused buffered input. This information can be used - for a progress indicator. On error, gzoffset() returns -1. -*/ - -ZEXTERN int ZEXPORT gzeof OF((gzFile file)); -/* - Returns true (1) if the end-of-file indicator has been set while reading, - false (0) otherwise. Note that the end-of-file indicator is set only if the - read tried to go past the end of the input, but came up short. Therefore, - just like feof(), gzeof() may return false even if there is no more data to - read, in the event that the last read request was for the exact number of - bytes remaining in the input file. This will happen if the input file size - is an exact multiple of the buffer size. - - If gzeof() returns true, then the read functions will return no more data, - unless the end-of-file indicator is reset by gzclearerr() and the input file - has grown since the previous end of file was detected. -*/ - -ZEXTERN int ZEXPORT gzdirect OF((gzFile file)); -/* - Returns true (1) if file is being copied directly while reading, or false - (0) if file is a gzip stream being decompressed. This state can change from - false to true while reading the input file if the end of a gzip stream is - reached, but is followed by data that is not another gzip stream. - - If the input file is empty, gzdirect() will return true, since the input - does not contain a gzip stream. - - If gzdirect() is used immediately after gzopen() or gzdopen() it will - cause buffers to be allocated to allow reading the file to determine if it - is a gzip file. Therefore if gzbuffer() is used, it should be called before - gzdirect(). -*/ - -ZEXTERN int ZEXPORT gzclose OF((gzFile file)); -/* - Flushes all pending output if necessary, closes the compressed file and - deallocates the (de)compression state. Note that once file is closed, you - cannot call gzerror with file, since its structures have been deallocated. - gzclose must not be called more than once on the same file, just as free - must not be called more than once on the same allocation. - - gzclose will return Z_STREAM_ERROR if file is not valid, Z_ERRNO on a - file operation error, or Z_OK on success. -*/ - -ZEXTERN int ZEXPORT gzclose_r OF((gzFile file)); -ZEXTERN int ZEXPORT gzclose_w OF((gzFile file)); -/* - Same as gzclose(), but gzclose_r() is only for use when reading, and - gzclose_w() is only for use when writing or appending. The advantage to - using these instead of gzclose() is that they avoid linking in zlib - compression or decompression code that is not used when only reading or only - writing respectively. If gzclose() is used, then both compression and - decompression code will be included the application when linking to a static - zlib library. -*/ - -ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum)); -/* - Returns the error message for the last error which occurred on the given - compressed file. errnum is set to zlib error number. If an error occurred - in the file system and not in the compression library, errnum is set to - Z_ERRNO and the application may consult errno to get the exact error code. - - The application must not modify the returned string. Future calls to - this function may invalidate the previously returned string. If file is - closed, then the string previously returned by gzerror will no longer be - available. - - gzerror() should be used to distinguish errors from end-of-file for those - functions above that do not distinguish those cases in their return values. -*/ - -ZEXTERN void ZEXPORT gzclearerr OF((gzFile file)); -/* - Clears the error and end-of-file flags for file. This is analogous to the - clearerr() function in stdio. This is useful for continuing to read a gzip - file that is being written concurrently. -*/ - - - /* checksum functions */ - -/* - These functions are not related to compression but are exported - anyway because they might be useful in applications using the compression - library. -*/ - -ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len)); -/* - Update a running Adler-32 checksum with the bytes buf[0..len-1] and - return the updated checksum. If buf is Z_NULL, this function returns the - required initial value for the checksum. - - An Adler-32 checksum is almost as reliable as a CRC32 but can be computed - much faster. - - Usage example: - - uLong adler = adler32(0L, Z_NULL, 0); - - while (read_buffer(buffer, length) != EOF) { - adler = adler32(adler, buffer, length); - } - if (adler != original_adler) error(); -*/ - -/* -ZEXTERN uLong ZEXPORT adler32_combine OF((uLong adler1, uLong adler2, - z_off_t len2)); - - Combine two Adler-32 checksums into one. For two sequences of bytes, seq1 - and seq2 with lengths len1 and len2, Adler-32 checksums were calculated for - each, adler1 and adler2. adler32_combine() returns the Adler-32 checksum of - seq1 and seq2 concatenated, requiring only adler1, adler2, and len2. -*/ - -ZEXTERN uLong ZEXPORT crc32 OF((uLong crc, const Bytef *buf, uInt len)); -/* - Update a running CRC-32 with the bytes buf[0..len-1] and return the - updated CRC-32. If buf is Z_NULL, this function returns the required - initial value for the for the crc. Pre- and post-conditioning (one's - complement) is performed within this function so it shouldn't be done by the - application. - - Usage example: - - uLong crc = crc32(0L, Z_NULL, 0); - - while (read_buffer(buffer, length) != EOF) { - crc = crc32(crc, buffer, length); - } - if (crc != original_crc) error(); -*/ - -/* -ZEXTERN uLong ZEXPORT crc32_combine OF((uLong crc1, uLong crc2, z_off_t len2)); - - Combine two CRC-32 check values into one. For two sequences of bytes, - seq1 and seq2 with lengths len1 and len2, CRC-32 check values were - calculated for each, crc1 and crc2. crc32_combine() returns the CRC-32 - check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and - len2. -*/ - - - /* various hacks, don't look :) */ - -/* deflateInit and inflateInit are macros to allow checking the zlib version - * and the compiler's view of z_stream: - */ -ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level, - const char *version, int stream_size)); -ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm, - const char *version, int stream_size)); -ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int level, int method, - int windowBits, int memLevel, - int strategy, const char *version, - int stream_size)); -ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int windowBits, - const char *version, int stream_size)); -ZEXTERN int ZEXPORT inflateBackInit_ OF((z_streamp strm, int windowBits, - unsigned char FAR *window, - const char *version, - int stream_size)); -#define deflateInit(strm, level) \ - deflateInit_((strm), (level), ZLIB_VERSION, sizeof(z_stream)) -#define inflateInit(strm) \ - inflateInit_((strm), ZLIB_VERSION, sizeof(z_stream)) -#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \ - deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\ - (strategy), ZLIB_VERSION, sizeof(z_stream)) -#define inflateInit2(strm, windowBits) \ - inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream)) -#define inflateBackInit(strm, windowBits, window) \ - inflateBackInit_((strm), (windowBits), (window), \ - ZLIB_VERSION, sizeof(z_stream)) - -/* provide 64-bit offset functions if _LARGEFILE64_SOURCE defined, and/or - * change the regular functions to 64 bits if _FILE_OFFSET_BITS is 64 (if - * both are true, the application gets the *64 functions, and the regular - * functions are changed to 64 bits) -- in case these are set on systems - * without large file support, _LFS64_LARGEFILE must also be true - */ -#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0 - ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); - ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int)); - ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile)); - ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile)); - ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off64_t)); - ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off64_t)); -#endif - -#if !defined(ZLIB_INTERNAL) && _FILE_OFFSET_BITS-0 == 64 && _LFS64_LARGEFILE-0 -# define gzopen gzopen64 -# define gzseek gzseek64 -# define gztell gztell64 -# define gzoffset gzoffset64 -# define adler32_combine adler32_combine64 -# define crc32_combine crc32_combine64 -# ifdef _LARGEFILE64_SOURCE - ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); - ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int)); - ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile)); - ZEXTERN z_off_t ZEXPORT gzoffset64 OF((gzFile)); - ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t)); - ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t)); -# endif -#else - ZEXTERN gzFile ZEXPORT gzopen OF((const char *, const char *)); - ZEXTERN z_off_t ZEXPORT gzseek OF((gzFile, z_off_t, int)); - ZEXTERN z_off_t ZEXPORT gztell OF((gzFile)); - ZEXTERN z_off_t ZEXPORT gzoffset OF((gzFile)); - ZEXTERN uLong ZEXPORT adler32_combine OF((uLong, uLong, z_off_t)); - ZEXTERN uLong ZEXPORT crc32_combine OF((uLong, uLong, z_off_t)); -#endif - -/* hack for buggy compilers */ -#if !defined(ZUTIL_H) && !defined(NO_DUMMY_DECL) - struct internal_state {int dummy;}; -#endif - -/* undocumented functions */ -ZEXTERN const char * ZEXPORT zError OF((int)); -ZEXTERN int ZEXPORT inflateSyncPoint OF((z_streamp)); -ZEXTERN const uLongf * ZEXPORT get_crc_table OF((void)); -ZEXTERN int ZEXPORT inflateUndermine OF((z_streamp, int)); - -#ifdef __cplusplus -} -#endif - -#endif /* ZLIB_H */ diff --git a/libs/libwebsockets/win32port/zlib/zutil.c b/libs/libwebsockets/win32port/zlib/zutil.c deleted file mode 100644 index e33ae8bb5a..0000000000 --- a/libs/libwebsockets/win32port/zlib/zutil.c +++ /dev/null @@ -1,318 +0,0 @@ -/* zutil.c -- target dependent utility functions for the compression library - * Copyright (C) 1995-2005, 2010 Jean-loup Gailly. - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -/* @(#) $Id$ */ - -#include "zutil.h" - -#ifndef NO_DUMMY_DECL -struct internal_state {int dummy;}; /* for buggy compilers */ -#endif - -const char * const z_errmsg[10] = { -"need dictionary", /* Z_NEED_DICT 2 */ -"stream end", /* Z_STREAM_END 1 */ -"", /* Z_OK 0 */ -"file error", /* Z_ERRNO (-1) */ -"stream error", /* Z_STREAM_ERROR (-2) */ -"data error", /* Z_DATA_ERROR (-3) */ -"insufficient memory", /* Z_MEM_ERROR (-4) */ -"buffer error", /* Z_BUF_ERROR (-5) */ -"incompatible version",/* Z_VERSION_ERROR (-6) */ -""}; - - -const char * ZEXPORT zlibVersion() -{ - return ZLIB_VERSION; -} - -uLong ZEXPORT zlibCompileFlags() -{ - uLong flags; - - flags = 0; - switch ((int)(sizeof(uInt))) { - case 2: break; - case 4: flags += 1; break; - case 8: flags += 2; break; - default: flags += 3; - } - switch ((int)(sizeof(uLong))) { - case 2: break; - case 4: flags += 1 << 2; break; - case 8: flags += 2 << 2; break; - default: flags += 3 << 2; - } - switch ((int)(sizeof(voidpf))) { - case 2: break; - case 4: flags += 1 << 4; break; - case 8: flags += 2 << 4; break; - default: flags += 3 << 4; - } - switch ((int)(sizeof(z_off_t))) { - case 2: break; - case 4: flags += 1 << 6; break; - case 8: flags += 2 << 6; break; - default: flags += 3 << 6; - } -#ifdef DEBUG - flags += 1 << 8; -#endif -#if defined(ASMV) || defined(ASMINF) - flags += 1 << 9; -#endif -#ifdef ZLIB_WINAPI - flags += 1 << 10; -#endif -#ifdef BUILDFIXED - flags += 1 << 12; -#endif -#ifdef DYNAMIC_CRC_TABLE - flags += 1 << 13; -#endif -#ifdef NO_GZCOMPRESS - flags += 1L << 16; -#endif -#ifdef NO_GZIP - flags += 1L << 17; -#endif -#ifdef PKZIP_BUG_WORKAROUND - flags += 1L << 20; -#endif -#ifdef FASTEST - flags += 1L << 21; -#endif -#ifdef STDC -# ifdef NO_vsnprintf - flags += 1L << 25; -# ifdef HAS_vsprintf_void - flags += 1L << 26; -# endif -# else -# ifdef HAS_vsnprintf_void - flags += 1L << 26; -# endif -# endif -#else - flags += 1L << 24; -# ifdef NO_snprintf - flags += 1L << 25; -# ifdef HAS_sprintf_void - flags += 1L << 26; -# endif -# else -# ifdef HAS_snprintf_void - flags += 1L << 26; -# endif -# endif -#endif - return flags; -} - -#ifdef DEBUG - -# ifndef verbose -# define verbose 0 -# endif -int ZLIB_INTERNAL z_verbose = verbose; - -void ZLIB_INTERNAL z_error (m) - char *m; -{ - fprintf(stderr, "%s\n", m); - exit(1); -} -#endif - -/* exported to allow conversion of error code to string for compress() and - * uncompress() - */ -const char * ZEXPORT zError(err) - int err; -{ - return ERR_MSG(err); -} - -#if defined(_WIN32_WCE) - /* The Microsoft C Run-Time Library for Windows CE doesn't have - * errno. We define it as a global variable to simplify porting. - * Its value is always 0 and should not be used. - */ - int errno = 0; -#endif - -#ifndef HAVE_MEMCPY - -void ZLIB_INTERNAL zmemcpy(dest, source, len) - Bytef* dest; - const Bytef* source; - uInt len; -{ - if (len == 0) return; - do { - *dest++ = *source++; /* ??? to be unrolled */ - } while (--len != 0); -} - -int ZLIB_INTERNAL zmemcmp(s1, s2, len) - const Bytef* s1; - const Bytef* s2; - uInt len; -{ - uInt j; - - for (j = 0; j < len; j++) { - if (s1[j] != s2[j]) return 2*(s1[j] > s2[j])-1; - } - return 0; -} - -void ZLIB_INTERNAL zmemzero(dest, len) - Bytef* dest; - uInt len; -{ - if (len == 0) return; - do { - *dest++ = 0; /* ??? to be unrolled */ - } while (--len != 0); -} -#endif - - -#ifdef SYS16BIT - -#ifdef __TURBOC__ -/* Turbo C in 16-bit mode */ - -# define MY_ZCALLOC - -/* Turbo C malloc() does not allow dynamic allocation of 64K bytes - * and farmalloc(64K) returns a pointer with an offset of 8, so we - * must fix the pointer. Warning: the pointer must be put back to its - * original form in order to free it, use zcfree(). - */ - -#define MAX_PTR 10 -/* 10*64K = 640K */ - -local int next_ptr = 0; - -typedef struct ptr_table_s { - voidpf org_ptr; - voidpf new_ptr; -} ptr_table; - -local ptr_table table[MAX_PTR]; -/* This table is used to remember the original form of pointers - * to large buffers (64K). Such pointers are normalized with a zero offset. - * Since MSDOS is not a preemptive multitasking OS, this table is not - * protected from concurrent access. This hack doesn't work anyway on - * a protected system like OS/2. Use Microsoft C instead. - */ - -voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size) -{ - voidpf buf = opaque; /* just to make some compilers happy */ - ulg bsize = (ulg)items*size; - - /* If we allocate less than 65520 bytes, we assume that farmalloc - * will return a usable pointer which doesn't have to be normalized. - */ - if (bsize < 65520L) { - buf = farmalloc(bsize); - if (*(ush*)&buf != 0) return buf; - } else { - buf = farmalloc(bsize + 16L); - } - if (buf == NULL || next_ptr >= MAX_PTR) return NULL; - table[next_ptr].org_ptr = buf; - - /* Normalize the pointer to seg:0 */ - *((ush*)&buf+1) += ((ush)((uch*)buf-0) + 15) >> 4; - *(ush*)&buf = 0; - table[next_ptr++].new_ptr = buf; - return buf; -} - -void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr) -{ - int n; - if (*(ush*)&ptr != 0) { /* object < 64K */ - farfree(ptr); - return; - } - /* Find the original pointer */ - for (n = 0; n < next_ptr; n++) { - if (ptr != table[n].new_ptr) continue; - - farfree(table[n].org_ptr); - while (++n < next_ptr) { - table[n-1] = table[n]; - } - next_ptr--; - return; - } - ptr = opaque; /* just to make some compilers happy */ - Assert(0, "zcfree: ptr not found"); -} - -#endif /* __TURBOC__ */ - - -#ifdef M_I86 -/* Microsoft C in 16-bit mode */ - -# define MY_ZCALLOC - -#if (!defined(_MSC_VER) || (_MSC_VER <= 600)) -# define _halloc halloc -# define _hfree hfree -#endif - -voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, uInt items, uInt size) -{ - if (opaque) opaque = 0; /* to make compiler happy */ - return _halloc((long)items, size); -} - -void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr) -{ - if (opaque) opaque = 0; /* to make compiler happy */ - _hfree(ptr); -} - -#endif /* M_I86 */ - -#endif /* SYS16BIT */ - - -#ifndef MY_ZCALLOC /* Any system without a special alloc function */ - -#ifndef STDC -extern voidp malloc OF((uInt size)); -extern voidp calloc OF((uInt items, uInt size)); -extern void free OF((voidpf ptr)); -#endif - -voidpf ZLIB_INTERNAL zcalloc (opaque, items, size) - voidpf opaque; - unsigned items; - unsigned size; -{ - if (opaque) items += size - size; /* make compiler happy */ - return sizeof(uInt) > 2 ? (voidpf)malloc(items * size) : - (voidpf)calloc(items, size); -} - -void ZLIB_INTERNAL zcfree (opaque, ptr) - voidpf opaque; - voidpf ptr; -{ - free(ptr); - if (opaque) return; /* make compiler happy */ -} - -#endif /* MY_ZCALLOC */ diff --git a/libs/libwebsockets/win32port/zlib/zutil.h b/libs/libwebsockets/win32port/zlib/zutil.h deleted file mode 100644 index a36a406ed9..0000000000 --- a/libs/libwebsockets/win32port/zlib/zutil.h +++ /dev/null @@ -1,274 +0,0 @@ -/* zutil.h -- internal interface and configuration of the compression library - * Copyright (C) 1995-2010 Jean-loup Gailly. - * For conditions of distribution and use, see copyright notice in zlib.h - */ - -/* WARNING: this file should *not* be used by applications. It is - part of the implementation of the compression library and is - subject to change. Applications should only use zlib.h. - */ - -/* @(#) $Id$ */ - -#ifndef ZUTIL_H -#define ZUTIL_H - -#if ((__GNUC__-0) * 10 + __GNUC_MINOR__-0 >= 33) && !defined(NO_VIZ) -# define ZLIB_INTERNAL __attribute__((visibility ("hidden"))) -#else -# define ZLIB_INTERNAL -#endif - -#include "zlib.h" - -#ifdef STDC -# if !(defined(_WIN32_WCE) && defined(_MSC_VER)) -# include -# endif -# include -# include -#endif - -#ifndef local -# define local static -#endif -/* compile with -Dlocal if your debugger can't find static symbols */ - -typedef unsigned char uch; -typedef uch FAR uchf; -typedef unsigned short ush; -typedef ush FAR ushf; -typedef unsigned long ulg; - -extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ -/* (size given to avoid silly warnings with Visual C++) */ - -#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)] - -#define ERR_RETURN(strm,err) \ - return (strm->msg = (char*)ERR_MSG(err), (err)) -/* To be used only when the state is known to be valid */ - - /* common constants */ - -#ifndef DEF_WBITS -# define DEF_WBITS MAX_WBITS -#endif -/* default windowBits for decompression. MAX_WBITS is for compression only */ - -#if MAX_MEM_LEVEL >= 8 -# define DEF_MEM_LEVEL 8 -#else -# define DEF_MEM_LEVEL MAX_MEM_LEVEL -#endif -/* default memLevel */ - -#define STORED_BLOCK 0 -#define STATIC_TREES 1 -#define DYN_TREES 2 -/* The three kinds of block type */ - -#define MIN_MATCH 3 -#define MAX_MATCH 258 -/* The minimum and maximum match lengths */ - -#define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */ - - /* target dependencies */ - -#if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32)) -# define OS_CODE 0x00 -# if defined(__TURBOC__) || defined(__BORLANDC__) -# if (__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__)) - /* Allow compilation with ANSI keywords only enabled */ - void _Cdecl farfree( void *block ); - void *_Cdecl farmalloc( unsigned long nbytes ); -# else -# include -# endif -# else /* MSC or DJGPP */ -# include -# endif -#endif - -#ifdef AMIGA -# define OS_CODE 0x01 -#endif - -#if defined(VAXC) || defined(VMS) -# define OS_CODE 0x02 -# define F_OPEN(name, mode) \ - fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512") -#endif - -#if defined(ATARI) || defined(atarist) -# define OS_CODE 0x05 -#endif - -#ifdef OS2 -# define OS_CODE 0x06 -# ifdef M_I86 -# include -# endif -#endif - -#if defined(MACOS) || defined(TARGET_OS_MAC) -# define OS_CODE 0x07 -# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os -# include /* for fdopen */ -# else -# ifndef fdopen -# define fdopen(fd,mode) NULL /* No fdopen() */ -# endif -# endif -#endif - -#ifdef TOPS20 -# define OS_CODE 0x0a -#endif - -#ifdef WIN32 -# ifndef __CYGWIN__ /* Cygwin is Unix, not Win32 */ -# define OS_CODE 0x0b -# endif -#endif - -#ifdef __50SERIES /* Prime/PRIMOS */ -# define OS_CODE 0x0f -#endif - -#if defined(_BEOS_) || defined(RISCOS) -# define fdopen(fd,mode) NULL /* No fdopen() */ -#endif - -#if (defined(_MSC_VER) && (_MSC_VER > 600)) && !defined __INTERIX -# if defined(_WIN32_WCE) -# define fdopen(fd,mode) NULL /* No fdopen() */ -# ifndef _PTRDIFF_T_DEFINED - typedef int ptrdiff_t; -# define _PTRDIFF_T_DEFINED -# endif -# else -# define fdopen(fd,type) _fdopen(fd,type) -# endif -#endif - -#if defined(__BORLANDC__) - #pragma warn -8004 - #pragma warn -8008 - #pragma warn -8066 -#endif - -/* provide prototypes for these when building zlib without LFS */ -#if !defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0 - ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t)); - ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t)); -#endif - - /* common defaults */ - -#ifndef OS_CODE -# define OS_CODE 0x03 /* assume Unix */ -#endif - -#ifndef F_OPEN -# define F_OPEN(name, mode) fopen((name), (mode)) -#endif - - /* functions */ - -#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550) -# ifndef HAVE_VSNPRINTF -# define HAVE_VSNPRINTF -# endif -#endif -#if defined(__CYGWIN__) -# ifndef HAVE_VSNPRINTF -# define HAVE_VSNPRINTF -# endif -#endif -#ifndef HAVE_VSNPRINTF -# ifdef MSDOS - /* vsnprintf may exist on some MS-DOS compilers (DJGPP?), - but for now we just assume it doesn't. */ -# define NO_vsnprintf -# endif -# ifdef __TURBOC__ -# define NO_vsnprintf -# endif -# ifdef WIN32 - /* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */ -# if !defined(vsnprintf) && !defined(NO_vsnprintf) -# if !defined(_MSC_VER) || ( defined(_MSC_VER) && _MSC_VER < 1500 ) -# define vsnprintf _vsnprintf -# endif -# endif -# endif -# ifdef __SASC -# define NO_vsnprintf -# endif -#endif -#ifdef VMS -# define NO_vsnprintf -#endif - -#if defined(pyr) -# define NO_MEMCPY -#endif -#if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__) - /* Use our own functions for small and medium model with MSC <= 5.0. - * You may have to use the same strategy for Borland C (untested). - * The __SC__ check is for Symantec. - */ -# define NO_MEMCPY -#endif -#if defined(STDC) && !defined(HAVE_MEMCPY) && !defined(NO_MEMCPY) -# define HAVE_MEMCPY -#endif -#ifdef HAVE_MEMCPY -# ifdef SMALL_MEDIUM /* MSDOS small or medium model */ -# define zmemcpy _fmemcpy -# define zmemcmp _fmemcmp -# define zmemzero(dest, len) _fmemset(dest, 0, len) -# else -# define zmemcpy memcpy -# define zmemcmp memcmp -# define zmemzero(dest, len) memset(dest, 0, len) -# endif -#else - void ZLIB_INTERNAL zmemcpy OF((Bytef* dest, const Bytef* source, uInt len)); - int ZLIB_INTERNAL zmemcmp OF((const Bytef* s1, const Bytef* s2, uInt len)); - void ZLIB_INTERNAL zmemzero OF((Bytef* dest, uInt len)); -#endif - -/* Diagnostic functions */ -#ifdef DEBUG -# include - extern int ZLIB_INTERNAL z_verbose; - extern void ZLIB_INTERNAL z_error OF((char *m)); -# define Assert(cond,msg) {if(!(cond)) z_error(msg);} -# define Trace(x) {if (z_verbose>=0) fprintf x ;} -# define Tracev(x) {if (z_verbose>0) fprintf x ;} -# define Tracevv(x) {if (z_verbose>1) fprintf x ;} -# define Tracec(c,x) {if (z_verbose>0 && (c)) fprintf x ;} -# define Tracecv(c,x) {if (z_verbose>1 && (c)) fprintf x ;} -#else -# define Assert(cond,msg) -# define Trace(x) -# define Tracev(x) -# define Tracevv(x) -# define Tracec(c,x) -# define Tracecv(c,x) -#endif - - -voidpf ZLIB_INTERNAL zcalloc OF((voidpf opaque, unsigned items, - unsigned size)); -void ZLIB_INTERNAL zcfree OF((voidpf opaque, voidpf ptr)); - -#define ZALLOC(strm, items, size) \ - (*((strm)->zalloc))((strm)->opaque, (items), (size)) -#define ZFREE(strm, addr) (*((strm)->zfree))((strm)->opaque, (voidpf)(addr)) -#define TRY_FREE(s, p) {if (p) ZFREE(s, p);} - -#endif /* ZUTIL_H */ diff --git a/libs/libzrtp/configure.in b/libs/libzrtp/configure.ac similarity index 99% rename from libs/libzrtp/configure.in rename to libs/libzrtp/configure.ac index 2d10359a08..d1c40b7e3d 100644 --- a/libs/libzrtp/configure.in +++ b/libs/libzrtp/configure.ac @@ -47,6 +47,7 @@ echo "================================ done =================================== AC_PROG_CC AC_PROG_CXX AC_PROG_RANLIB +AM_PROG_CC_C_O # Checks for header files. AC_HEADER_STDC diff --git a/libs/libzrtp/third_party/bnlib/configure.in b/libs/libzrtp/third_party/bnlib/configure.ac similarity index 100% rename from libs/libzrtp/third_party/bnlib/configure.in rename to libs/libzrtp/third_party/bnlib/configure.ac diff --git a/libs/openzap/configure.ac b/libs/openzap/configure.ac index 187c419a79..c16e11b97f 100644 --- a/libs/openzap/configure.ac +++ b/libs/openzap/configure.ac @@ -2,11 +2,11 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([openzap],[pre-alpha],[bugs@freeswitch.org]) +AC_INIT([openzap],[0.1],[bugs@freeswitch.org]) AC_CONFIG_SRCDIR([src/zap_io.c]) AC_CONFIG_AUX_DIR(build) -AM_INIT_AUTOMAKE(libopenzap,0.1) +AM_INIT_AUTOMAKE # Checks for programs. AC_PROG_CC diff --git a/libs/pcre/configure.ac b/libs/pcre/configure.ac index b6f79f98cf..cc01267b4d 100644 --- a/libs/pcre/configure.ac +++ b/libs/pcre/configure.ac @@ -67,7 +67,7 @@ fi # AC_PROG_CXX will return "g++" even if no c++ compiler is installed. # Check for that case, and just disable c++ code if g++ doesn't run. AC_LANG_PUSH(C++) -AC_COMPILE_IFELSE(AC_LANG_PROGRAM([],[]),, CXX=""; CXXCP=""; CXXFLAGS="") +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],[[]])],, CXX=""; CXXCP=""; CXXFLAGS="") AC_LANG_POP AC_PROG_INSTALL @@ -334,11 +334,11 @@ for flag in "-alias,__ZN7pcrecpp2RE6no_argE,__ZN7pcrecpp6no_argE" \ LDFLAGS="$OLD_LDFLAGS -Wl,$flag" # We try to run the linker with this new ld flag. If the link fails, # we give up and remove the new flag from LDFLAGS. - AC_LINK_IFELSE(AC_LANG_PROGRAM([namespace pcrecpp { + AC_LINK_IFELSE([AC_LANG_PROGRAM([[namespace pcrecpp { class RE { static int no_arg; }; int RE::no_arg; - }], - []), + }]], + [[]])], [AC_MSG_RESULT([yes]); EXTRA_LIBPCRECPP_LDFLAGS="$EXTRA_LIBPCRECPP_LDFLAGS -Wl,$flag"; break;], diff --git a/libs/portaudio/configure.in b/libs/portaudio/configure.ac similarity index 100% rename from libs/portaudio/configure.in rename to libs/portaudio/configure.ac diff --git a/libs/silk/configure.in b/libs/silk/configure.ac similarity index 93% rename from libs/silk/configure.in rename to libs/silk/configure.ac index 5075677c33..29ea7027a4 100644 --- a/libs/silk/configure.in +++ b/libs/silk/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.59]) AC_INIT(libSKP_SILK_SDK, 1.0.8, brian@freeswitch.org, libSKP_SILK_SDK) -AM_INIT_AUTOMAKE(libSKP_SILK_SDK,1.0.8) +AM_INIT_AUTOMAKE # Checks for programs. AC_PROG_CC diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update index 548e466bd2..c2cc70f57c 100644 --- a/libs/sofia-sip/.update +++ b/libs/sofia-sip/.update @@ -1 +1 @@ -Fri Feb 21 16:38:32 EST 2014 +Thu Mar 6 00:30:51 CDT 2014 diff --git a/libs/sofia-sip/configure.ac b/libs/sofia-sip/configure.ac index f882bc76b4..e20ddcb4c6 100644 --- a/libs/sofia-sip/configure.ac +++ b/libs/sofia-sip/configure.ac @@ -255,7 +255,11 @@ fi AC_CHECK_HEADERS([fnmatch.h]) AC_CHECK_LIB(pthread, pthread_setschedparam, [AC_DEFINE(HAVE_PTHREAD_SETSCHEDPARAM, 1, [Define if you have pthread_setschedparam()])]) - +AC_CHECK_LIB(z, compress, [have_zlib=yes],[have_zlib=no]) +if test x"$have_zlib" = "xyes"; then + AC_DEFINE(HAVE_ZLIB_COMPRESS, 1, [Define if you have zlib compress]) +fi +AM_CONDITIONAL([HAVE_ZLIB], [test "x$have_zlib" = xyes]) dnl dl is currently used only in testing AC_CHECK_LIB([dl], [dlopen], [ diff --git a/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/Makefile.am b/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/Makefile.am index c099e43a16..6f54d34128 100644 --- a/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/Makefile.am +++ b/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/Makefile.am @@ -12,7 +12,7 @@ S_BASE = $(top_srcdir)/libsofia-sip-ua B_BASE = $(top_builddir)/libsofia-sip-ua -INCLUDES = -I$(S_BASE)/su -I$(B_BASE)/su $(GLIB_CFLAGS) \ +AM_CPPFLAGS = -I$(S_BASE)/su -I$(B_BASE)/su $(GLIB_CFLAGS) \ $(SOFIA_GLIB_CFLAGS) # ---------------------------------------------------------------------- diff --git a/libs/sofia-sip/libsofia-sip-ua/Makefile.am b/libs/sofia-sip/libsofia-sip-ua/Makefile.am index 78a8307392..d2855be4bf 100644 --- a/libs/sofia-sip/libsofia-sip-ua/Makefile.am +++ b/libs/sofia-sip/libsofia-sip-ua/Makefile.am @@ -58,7 +58,11 @@ libsofia_sip_ua_la_LIBADD = bnf/libbnf.la \ # set the libtool version info version:revision:age for libsofia-sip-ua # - soname to 'libsofia-sip-ua.so.(CUR-AGE)' libsofia_sip_ua_la_LDFLAGS = \ - -version-info $(LIBVER_SOFIA_SIP_UA_CUR):$(LIBVER_SOFIA_SIP_UA_REV):$(LIBVER_SOFIA_SIP_UA_AGE) + -version-info $(LIBVER_SOFIA_SIP_UA_CUR):$(LIBVER_SOFIA_SIP_UA_REV):$(LIBVER_SOFIA_SIP_UA_AGE) + +if HAVE_ZLIB +libsofia_sip_ua_la_LDFLAGS += -lz +endif PHONY = doxygen built-sources diff --git a/libs/sofia-sip/libsofia-sip-ua/bnf/Makefile.am b/libs/sofia-sip/libsofia-sip-ua/bnf/Makefile.am index e64f7a3b09..01f87d9451 100644 --- a/libs/sofia-sip/libsofia-sip-ua/bnf/Makefile.am +++ b/libs/sofia-sip/libsofia-sip-ua/bnf/Makefile.am @@ -8,7 +8,7 @@ # ---------------------------------------------------------------------- # Header paths -INCLUDES = -I$(srcdir)/../su -I../su +AM_CPPFLAGS = -I$(srcdir)/../su -I../su # ---------------------------------------------------------------------- # Build targets diff --git a/libs/sofia-sip/libsofia-sip-ua/features/Makefile.am b/libs/sofia-sip/libsofia-sip-ua/features/Makefile.am index eefbfaaffe..bbc1c78517 100644 --- a/libs/sofia-sip/libsofia-sip-ua/features/Makefile.am +++ b/libs/sofia-sip/libsofia-sip-ua/features/Makefile.am @@ -8,7 +8,7 @@ # ---------------------------------------------------------------------- # Header paths -INCLUDES = $(INTERNAL_INCLUDES) +AM_CPPFLAGS = $(INTERNAL_INCLUDES) # ---------------------------------------------------------------------- # Build targets diff --git a/libs/sofia-sip/libsofia-sip-ua/http/Makefile.am b/libs/sofia-sip/libsofia-sip-ua/http/Makefile.am index d683c7132a..0e56d800c1 100644 --- a/libs/sofia-sip/libsofia-sip-ua/http/Makefile.am +++ b/libs/sofia-sip/libsofia-sip-ua/http/Makefile.am @@ -8,7 +8,7 @@ # ---------------------------------------------------------------------- # Header paths -INCLUDES = -I$(srcdir)/../bnf -I../bnf \ +AM_CPPFLAGS = -I$(srcdir)/../bnf -I../bnf \ -I$(srcdir)/../msg -I../msg \ -I$(srcdir)/../url -I../url \ -I$(srcdir)/../su -I../su -I../su diff --git a/libs/sofia-sip/libsofia-sip-ua/ipt/Makefile.am b/libs/sofia-sip/libsofia-sip-ua/ipt/Makefile.am index aa7358ba43..69f2f15a55 100644 --- a/libs/sofia-sip/libsofia-sip-ua/ipt/Makefile.am +++ b/libs/sofia-sip/libsofia-sip-ua/ipt/Makefile.am @@ -8,7 +8,7 @@ # ---------------------------------------------------------------------- # Header paths -INCLUDES = -I$(srcdir)/../su -I../su +AM_CPPFLAGS = -I$(srcdir)/../su -I../su # ---------------------------------------------------------------------- # Build targets diff --git a/libs/sofia-sip/libsofia-sip-ua/iptsec/Makefile.am b/libs/sofia-sip/libsofia-sip-ua/iptsec/Makefile.am index ed2129f820..ff10add512 100644 --- a/libs/sofia-sip/libsofia-sip-ua/iptsec/Makefile.am +++ b/libs/sofia-sip/libsofia-sip-ua/iptsec/Makefile.am @@ -8,7 +8,7 @@ # ---------------------------------------------------------------------- # Header paths -INCLUDES = -I$(srcdir)/../bnf -I../bnf \ +AM_CPPFLAGS = -I$(srcdir)/../bnf -I../bnf \ -I$(srcdir)/../ipt -I../ipt \ -I$(srcdir)/../http -I../http \ -I$(srcdir)/../msg -I../msg \ diff --git a/libs/sofia-sip/libsofia-sip-ua/msg/Makefile.am b/libs/sofia-sip/libsofia-sip-ua/msg/Makefile.am index 33f139bc23..b0e7a84abb 100644 --- a/libs/sofia-sip/libsofia-sip-ua/msg/Makefile.am +++ b/libs/sofia-sip/libsofia-sip-ua/msg/Makefile.am @@ -8,7 +8,7 @@ # ---------------------------------------------------------------------- # Header paths -INCLUDES = -I$(srcdir)/../url -I../url \ +AM_CPPFLAGS = -I$(srcdir)/../url -I../url \ -I$(srcdir)/../bnf -I../bnf \ -I$(srcdir)/../su -I../su diff --git a/libs/sofia-sip/libsofia-sip-ua/nea/Makefile.am b/libs/sofia-sip/libsofia-sip-ua/nea/Makefile.am index c538214ed4..8cc73afcdc 100644 --- a/libs/sofia-sip/libsofia-sip-ua/nea/Makefile.am +++ b/libs/sofia-sip/libsofia-sip-ua/nea/Makefile.am @@ -8,7 +8,7 @@ # ---------------------------------------------------------------------- # Header paths -INCLUDES = -I$(srcdir)/../ipt -I../ipt \ +AM_CPPFLAGS = -I$(srcdir)/../ipt -I../ipt \ -I$(srcdir)/../msg -I../msg \ -I$(srcdir)/../nta -I../nta \ -I$(srcdir)/../sip -I../sip \ diff --git a/libs/sofia-sip/libsofia-sip-ua/nta/Makefile.am b/libs/sofia-sip/libsofia-sip-ua/nta/Makefile.am index 5665257b22..07ca4a440b 100644 --- a/libs/sofia-sip/libsofia-sip-ua/nta/Makefile.am +++ b/libs/sofia-sip/libsofia-sip-ua/nta/Makefile.am @@ -8,7 +8,7 @@ # ---------------------------------------------------------------------- # Header paths -INCLUDES = -I$(srcdir)/../ipt -I../ipt \ +AM_CPPFLAGS = -I$(srcdir)/../ipt -I../ipt \ -I$(srcdir)/../msg -I../msg \ -I$(srcdir)/../sip -I../sip \ -I$(srcdir)/../bnf -I../bnf \ @@ -92,4 +92,4 @@ EXTRA_DIST = nta.docs sl_utils.docs \ include $(top_srcdir)/rules/sofia.am # Generate list of nta tags -TAG_DLL_FLAGS = LIST=nta_tag_list \ No newline at end of file +TAG_DLL_FLAGS = LIST=nta_tag_list diff --git a/libs/sofia-sip/libsofia-sip-ua/nta/nta.c b/libs/sofia-sip/libsofia-sip-ua/nta/nta.c index 5c8a98df0b..71f742e941 100644 --- a/libs/sofia-sip/libsofia-sip-ua/nta/nta.c +++ b/libs/sofia-sip/libsofia-sip-ua/nta/nta.c @@ -47,7 +47,9 @@ */ #include "config.h" - +#ifdef HAVE_ZLIB_COMPRESS +#include +#endif #include /** @internal SU message argument structure type */ @@ -379,6 +381,7 @@ struct nta_leg_s * Request missing @To tag matches * a tagged leg even after tagging. */ + unsigned leg_compressed:1; unsigned:0; nta_request_f *leg_callback; nta_leg_magic_t *leg_magic; @@ -450,6 +453,7 @@ struct nta_incoming_s unsigned irq_must_100rel:1; /**< 100rel is required */ unsigned irq_extra_100:1; /**< 100 Trying should be sent */ unsigned irq_tag_set:1; /**< Tag is not from request */ + unsigned irq_compressed:1; unsigned :0; tp_name_t irq_tpn[1]; @@ -2788,6 +2792,71 @@ void agent_recv_message(nta_agent_t *agent, } } +#ifdef HAVE_ZLIB_COMPRESS +int sip_content_encoding_Xflate(msg_t *msg, sip_t *sip, int inflate, int check) +{ + char const *method_name; + unsigned cseq = sip->sip_cseq ? sip->sip_cseq->cs_seq : 0; + int ok = !check; + + if (!sip->sip_payload) { + return 0; + } + + if (sip->sip_request) { + method_name = sip->sip_request->rq_method_name; + } else if (sip->sip_cseq) { + method_name = sip->sip_cseq->cs_method_name; + } else { + method_name = "Unknown"; + } + + if (!ok) { + if (sip->sip_content_encoding && sip->sip_content_encoding->k_items) { + const char *val = sip->sip_content_encoding->k_items[0]; + if (val && (!strcasecmp(val, "gzip") || !strcasecmp(val, "deflate"))) { + ok = 1; + } + } + } + + if (ok) { + unsigned long n = 0; + void *decoded = NULL; + const char *id = "N/A"; + const char *orig_payload = sip->sip_payload->pl_data; + + n = sip->sip_payload->pl_len * 10; + + decoded = su_alloc(msg_home(msg), n); + assert(decoded); + + if (inflate) { + uncompress(decoded, &n, (void *)sip->sip_payload->pl_data, (unsigned long)sip->sip_payload->pl_len); + } else { + compress(decoded, &n, (void *)sip->sip_payload->pl_data, (unsigned long)sip->sip_payload->pl_len); + } + + sip->sip_payload = sip_payload_create(msg_home(msg), decoded, n); + sip->sip_content_encoding = sip_content_encoding_make(msg_home(msg), "deflate"); + + if (sip->sip_call_id) { + id = sip->sip_call_id->i_id; + } + + if (inflate) { + SU_DEBUG_1(("nta: %s (%u) (%s) Inflating compressed body:\n%s\n", method_name, cseq, id, (char *)decoded)); + } else { + SU_DEBUG_1(("nta: %s (%u) (%s) Deflating compressed body:\n%s\n", method_name, cseq, id, orig_payload)); + } + + return 1; + } + + return 0; +} +#endif + /** @internal Handle incoming requests. */ static void agent_recv_request(nta_agent_t *agent, @@ -2802,6 +2871,7 @@ void agent_recv_request(nta_agent_t *agent, url_t url[1]; unsigned cseq = sip->sip_cseq ? sip->sip_cseq->cs_seq : 0; int insane, errors, stream; + unsigned compressed = 0; agent->sa_stats->as_recv_msg++; agent->sa_stats->as_recv_request++; @@ -2924,6 +2994,10 @@ void agent_recv_request(nta_agent_t *agent, return; } +#ifdef HAVE_ZLIB_COMPRESS + compressed = sip_content_encoding_Xflate(msg, sip, 1, 1); +#endif + /* First, try existing incoming requests */ irq = incoming_find(agent, sip, sip->sip_via, agent->sa_merge_482 && @@ -2986,6 +3060,7 @@ void agent_recv_request(nta_agent_t *agent, /* Try existing dialog */ SU_DEBUG_5(("nta: %s (%u) %s\n", method_name, cseq, "going to existing leg")); + leg->leg_compressed = compressed; leg_recv(leg, msg, sip, tport); return; } @@ -2994,6 +3069,7 @@ void agent_recv_request(nta_agent_t *agent, /* Dialogless legs - let application process transactions statefully */ SU_DEBUG_5(("nta: %s (%u) %s\n", method_name, cseq, "going to a dialogless leg")); + leg->leg_compressed = compressed; leg_recv(leg, msg, sip, tport); } else if (!agent->sa_is_stateless && (leg = agent->sa_default_leg)) { @@ -3009,6 +3085,7 @@ void agent_recv_request(nta_agent_t *agent, else { SU_DEBUG_5(("nta: %s (%u) %s\n", method_name, cseq, "going to a default leg")); + leg->leg_compressed = compressed; leg_recv(leg, msg, sip, tport); } } @@ -3280,6 +3357,10 @@ void agent_recv_response(nta_agent_t *agent, /* XXX - should check if msg should be discarded based on via? */ +#ifdef HAVE_ZLIB_COMPRESS + sip_content_encoding_Xflate(msg, sip, 1, 1); +#endif + if ((orq = outgoing_find(agent, msg, sip, sip->sip_via))) { SU_DEBUG_5(("nta: %03d %s %s\n", status, phrase, "is going to a transaction")); @@ -4767,6 +4848,7 @@ void leg_recv(nta_leg_t *leg, msg_t *msg, sip_t *sip, tport_t *tport) return; } + irq->irq_compressed = leg->leg_compressed; irq->irq_in_callback = 1; status = incoming_callback(leg, irq, sip); irq->irq_in_callback = 0; @@ -6566,6 +6648,12 @@ int nta_incoming_mreply(nta_incoming_t *irq, msg_t *msg) return -1; } +#ifdef HAVE_ZLIB_COMPRESS + if (irq->irq_compressed) { + sip_content_encoding_Xflate(msg, sip, 0, 0); + } +#endif + if (irq->irq_must_100rel && !sip->sip_rseq && status > 100 && status < 200) { /* This nta_reliable_t object will be destroyed by PRACK or timeout */ if (nta_reliable_mreply(irq, NULL, NULL, msg)) @@ -7738,6 +7826,10 @@ nta_outgoing_t *outgoing_create(nta_agent_t *agent, sip = sip_object(msg); home = msg_home(msg); +#ifdef HAVE_ZLIB_COMPRESS + sip_content_encoding_Xflate(msg, sip_object(msg), 0, 1); +#endif + if (!sip->sip_request || sip_complete_message(msg) < 0) { SU_DEBUG_3(("nta: outgoing_create: incomplete request\n" VA_NONE)); return NULL; diff --git a/libs/sofia-sip/libsofia-sip-ua/nta/nta_check.c b/libs/sofia-sip/libsofia-sip-ua/nta/nta_check.c index 8d1d4d490c..d3c8094821 100644 --- a/libs/sofia-sip/libsofia-sip-ua/nta/nta_check.c +++ b/libs/sofia-sip/libsofia-sip-ua/nta/nta_check.c @@ -248,7 +248,9 @@ int nta_check_session_content(nta_incoming_t *irq, if (!sip->sip_content_encoding || !sip->sip_content_encoding->k_items || !sip->sip_content_encoding->k_items[0] || - !sip->sip_content_encoding->k_items[0][0]) + !sip->sip_content_encoding->k_items[0][0] || + !strcasecmp(sip->sip_content_encoding->k_items[0], "gzip") || + !strcasecmp(sip->sip_content_encoding->k_items[0], "deflate")) acceptable_encoding = 1; if (acceptable_type && acceptable_encoding) diff --git a/libs/sofia-sip/libsofia-sip-ua/nth/Makefile.am b/libs/sofia-sip/libsofia-sip-ua/nth/Makefile.am index 2048d53968..0ac4b9f39c 100644 --- a/libs/sofia-sip/libsofia-sip-ua/nth/Makefile.am +++ b/libs/sofia-sip/libsofia-sip-ua/nth/Makefile.am @@ -8,7 +8,7 @@ # ---------------------------------------------------------------------- # Header paths -INCLUDES = -I$(srcdir)/../ipt -I../ipt \ +AM_CPPFLAGS = -I$(srcdir)/../ipt -I../ipt \ -I$(srcdir)/../iptsec -I../iptsec \ -I$(srcdir)/../msg -I../msg \ -I$(srcdir)/../bnf -I../bnf \ diff --git a/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am b/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am index 9709173caa..eb2d1acb24 100644 --- a/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am +++ b/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am @@ -81,6 +81,6 @@ EXTRA_DIST = nua.docs $(BUILT_SOURCES) include $(top_srcdir)/rules/sofia.am -INCLUDES = ${INTERNAL_INCLUDES} -I$(top_srcdir)/s2check +AM_CPPFLAGS = ${INTERNAL_INCLUDES} -I$(top_srcdir)/s2check TAG_DLL_FLAGS = LIST=nua_tag_list diff --git a/libs/sofia-sip/libsofia-sip-ua/sdp/Makefile.am b/libs/sofia-sip/libsofia-sip-ua/sdp/Makefile.am index 0143fbcfe2..1e06912dd7 100644 --- a/libs/sofia-sip/libsofia-sip-ua/sdp/Makefile.am +++ b/libs/sofia-sip/libsofia-sip-ua/sdp/Makefile.am @@ -8,7 +8,7 @@ # ---------------------------------------------------------------------- # Header paths -INCLUDES = -I$(srcdir)/../su -I../su +AM_CPPFLAGS = -I$(srcdir)/../su -I../su # ---------------------------------------------------------------------- # Build targets diff --git a/libs/sofia-sip/libsofia-sip-ua/sip/Makefile.am b/libs/sofia-sip/libsofia-sip-ua/sip/Makefile.am index 5b1cb0c071..19fa9b545d 100644 --- a/libs/sofia-sip/libsofia-sip-ua/sip/Makefile.am +++ b/libs/sofia-sip/libsofia-sip-ua/sip/Makefile.am @@ -5,7 +5,7 @@ # ---------------------------------------------------------------------- # Header paths -INCLUDES = -I$(srcdir)/../bnf -I../bnf \ +AM_CPPFLAGS = -I$(srcdir)/../bnf -I../bnf \ -I$(srcdir)/../ipt -I../ipt \ -I$(srcdir)/../msg -I../msg \ -I$(srcdir)/../url -I../url \ diff --git a/libs/sofia-sip/libsofia-sip-ua/soa/Makefile.am b/libs/sofia-sip/libsofia-sip-ua/soa/Makefile.am index 595cde538a..2bd09594d8 100644 --- a/libs/sofia-sip/libsofia-sip-ua/soa/Makefile.am +++ b/libs/sofia-sip/libsofia-sip-ua/soa/Makefile.am @@ -8,7 +8,7 @@ # ---------------------------------------------------------------------- # Header paths -INCLUDES = -I$(srcdir)/../sdp -I../sdp \ +AM_CPPFLAGS = -I$(srcdir)/../sdp -I../sdp \ -I$(srcdir)/../sip -I../sip \ -I$(srcdir)/../msg -I../msg \ -I$(srcdir)/../url -I../url \ @@ -62,4 +62,4 @@ EXTRA_DIST = soa.docs $(BUILT_SOURCES) include $(top_srcdir)/rules/sofia.am -TAG_DLL_FLAGS = LIST=soa_tag_list \ No newline at end of file +TAG_DLL_FLAGS = LIST=soa_tag_list diff --git a/libs/sofia-sip/libsofia-sip-ua/sresolv/Makefile.am b/libs/sofia-sip/libsofia-sip-ua/sresolv/Makefile.am index 819281a4cc..b80ec5863c 100644 --- a/libs/sofia-sip/libsofia-sip-ua/sresolv/Makefile.am +++ b/libs/sofia-sip/libsofia-sip-ua/sresolv/Makefile.am @@ -8,7 +8,7 @@ # ---------------------------------------------------------------------- # Header paths -INCLUDES = -I$(srcdir)/../url -I../url \ +AM_CPPFLAGS = -I$(srcdir)/../url -I../url \ -I$(srcdir)/../bnf -I../bnf \ -I$(srcdir)/../su -I../su @@ -24,7 +24,7 @@ TESTS = check_PROGRAMS += check_sres_sip TESTS += check_sres_sip check_sres_sip_LDADD = $(LDADD) ${top_builddir}/s2check/libs2.a @CHECK_LIBS@ -INCLUDES += -I${top_srcdir}/s2check +AM_CPPFLAGS += -I${top_srcdir}/s2check TESTS += torture_sresolv run_test_sresolv diff --git a/libs/sofia-sip/libsofia-sip-ua/stun/Makefile.am b/libs/sofia-sip/libsofia-sip-ua/stun/Makefile.am index cd77ba4df3..b3d6e69ac5 100644 --- a/libs/sofia-sip/libsofia-sip-ua/stun/Makefile.am +++ b/libs/sofia-sip/libsofia-sip-ua/stun/Makefile.am @@ -13,7 +13,7 @@ AUTOMAKE_OPTIONS = foreign # ---------------------------------------------------------------------- # Header paths -INCLUDES = $(INTERNAL_INCLUDES) +AM_CPPFLAGS = $(INTERNAL_INCLUDES) # ---------------------------------------------------------------------- # Build targets diff --git a/libs/sofia-sip/libsofia-sip-ua/su/su_time0.c b/libs/sofia-sip/libsofia-sip-ua/su/su_time0.c index cae14a35a8..45b07dd1d4 100644 --- a/libs/sofia-sip/libsofia-sip-ua/su/su_time0.c +++ b/libs/sofia-sip/libsofia-sip-ua/su/su_time0.c @@ -106,10 +106,10 @@ void su_time(su_time_t *tv) ltv.tv_usec = ctv.tv_nsec / 1000; } #elif HAVE_GETTIMEOFDAY - - gettimeofday((struct timeval *)<v, NULL); - ltv.tv_sec += NTP_EPOCH; - + struct timeval tmp_tv = {0,0}; + gettimeofday(&tmp_tv, NULL); + ltv.tv_sec = tmp_tv.tv_sec + NTP_EPOCH; + ltv.tv_usec = (unsigned long)tmp_tv.tv_usec; #elif HAVE_FILETIME GetSystemTimeAsFileTime(date.ft); diff --git a/libs/sofia-sip/libsofia-sip-ua/tport/Makefile.am b/libs/sofia-sip/libsofia-sip-ua/tport/Makefile.am index e9aec1c997..6eb9a4ae85 100644 --- a/libs/sofia-sip/libsofia-sip-ua/tport/Makefile.am +++ b/libs/sofia-sip/libsofia-sip-ua/tport/Makefile.am @@ -8,12 +8,13 @@ # ---------------------------------------------------------------------- # Header paths -INCLUDES = -I$(srcdir)/../bnf -I../bnf \ +AM_CPPFLAGS = -I$(srcdir)/../bnf -I../bnf \ -I$(srcdir)/../stun -I../stun \ -I$(srcdir)/../ipt -I../ipt \ -I$(srcdir)/../msg -I../msg \ -I$(srcdir)/../http -I../http \ -I$(srcdir)/../url -I../url \ + -I$(srcdir)/../sip -I../sip \ -I$(srcdir)/../su -I../su # ---------------------------------------------------------------------- diff --git a/libs/sofia-sip/libsofia-sip-ua/tport/tport_logging.c b/libs/sofia-sip/libsofia-sip-ua/tport/tport_logging.c index acb8e186dc..6931ba13f3 100644 --- a/libs/sofia-sip/libsofia-sip-ua/tport/tport_logging.c +++ b/libs/sofia-sip/libsofia-sip-ua/tport/tport_logging.c @@ -478,7 +478,7 @@ void tport_log_msg(tport_t *self, msg_t *msg, size_t i, iovlen = msg_iovec(msg, iov, 80); size_t linelen = 0, n, logged = 0, truncated = 0; int skip_lf = 0; - + int j, unprintable = 0; #define MSG_SEPARATOR \ "------------------------------------------------------------------------\n" @@ -496,39 +496,57 @@ void tport_log_msg(tport_t *self, msg_t *msg, if (skip_lf && s < end && s[0] == '\n') { s++; logged++; skip_lf = 0; } while (s < end) { - if (s[0] == '\0') { - truncated = logged; - break; - } + if (s[0] == '\0') { + truncated = logged; + break; + } - n = su_strncspn(s, end - s, "\r\n"); + n = su_strncspn(s, end - s, "\r\n"); - if (linelen + n > MAX_LINELEN) { - n = MAX_LINELEN - linelen; - truncated = logged + n; - } + if (linelen + n > MAX_LINELEN) { + n = MAX_LINELEN - linelen; + truncated = logged + n; + } + + if (!unprintable) { + for (j = 0; j < 4; j++) { + if (s[j] == 0) break; + if (s[j] != 9 && s[j] != 10 && s[j] != 13 && (s[j] < 32 || s[j] > 126)) { + unprintable++; + } + } + } - su_log("%s%.*s", linelen > 0 ? "" : " ", (int)n, s); - s += n, linelen += n, logged += n; + if (unprintable) { + if (unprintable == 1) + su_log("\n "); + unprintable++; + } else { + su_log("%s%.*s", linelen > 0 ? "" : " ", (int)n, s); + } - if (truncated) - break; - if (s == end) - break; + s += n, linelen += n, logged += n; - linelen = 0; - su_log("\n"); + if (truncated) + break; + if (s == end) + break; + + linelen = 0; + su_log("\n"); + + /* Skip eol */ + if (s[0] == '\r') { + s++, logged++; + if (s == end) { + skip_lf = 1; + continue; + } + } - /* Skip eol */ - if (s[0] == '\r') { - s++, logged++; - if (s == end) { - skip_lf = 1; - continue; - } - } - if (s[0] == '\n') - s++, logged++; + if (s[0] == '\n') { + s++, logged++; + } } } diff --git a/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.c b/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.c index a63963b58e..07218159db 100644 --- a/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.c +++ b/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.c @@ -202,7 +202,7 @@ void tls_set_default(tls_issues_t *i) i->key = i->key ? i->key : i->cert; i->randFile = i->randFile ? i->randFile : "tls_seed.dat"; i->CAfile = i->CAfile ? i->CAfile : "cafile.pem"; - i->ciphers = i->ciphers ? i->ciphers : "ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH"; + i->ciphers = i->ciphers ? i->ciphers : "!eNULL:!aNULL:!EXP:!LOW:!MD5:ALL:@STRENGTH"; /* Default SIP cipher */ /* "RSA-WITH-AES-128-CBC-SHA"; */ /* RFC-2543-compatibility ciphersuite */ diff --git a/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.h b/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.h index 47d330a146..74a8db6a15 100644 --- a/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.h +++ b/libs/sofia-sip/libsofia-sip-ua/tport/tport_tls.h @@ -61,7 +61,7 @@ typedef struct tls_issues_s { char *CAfile; /* PEM file of CA's */ char *CApath; /* PEM file path of CA's */ char *ciphers; /* Should be one of the above defined ciphers * - * or NULL (default: "ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH + * or NULL (default: !eNULL:!aNULL:!EXP:!LOW:!MD5:ALL:@STRENGTH) */ int version; /* For tls1, version is 1. When ssl3/ssl2 is * used, it is 0. */ diff --git a/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_ws.c b/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_ws.c index a6cb2ba85b..c943ee0317 100644 --- a/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_ws.c +++ b/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_ws.c @@ -395,7 +395,7 @@ static int tport_ws_init_primary_secure(tport_primary_t *pri, goto done; } - SSL_CTX_set_cipher_list(wspri->ssl_ctx, "HIGH:!DSS:!aNULL@STRENGTH"); + SSL_CTX_set_cipher_list(wspri->ssl_ctx, "!eNULL:!aNULL:!DSS:HIGH:@STRENGTH"); ret = tport_ws_init_primary(pri, tpn, ai, tags, return_culprit); diff --git a/libs/sofia-sip/libsofia-sip-ua/url/Makefile.am b/libs/sofia-sip/libsofia-sip-ua/url/Makefile.am index 20bbef8b5b..cc8b47c927 100644 --- a/libs/sofia-sip/libsofia-sip-ua/url/Makefile.am +++ b/libs/sofia-sip/libsofia-sip-ua/url/Makefile.am @@ -8,7 +8,7 @@ # ---------------------------------------------------------------------- # Header paths -INCLUDES = -I$(srcdir)/../bnf -I../bnf \ +AM_CPPFLAGS = -I$(srcdir)/../bnf -I../bnf \ -I$(srcdir)/../ipt -I../ipt \ -I$(srcdir)/../su -I../su diff --git a/libs/sofia-sip/m4/sac-general.m4 b/libs/sofia-sip/m4/sac-general.m4 index b494de1efe..e0fbe5a91b 100644 --- a/libs/sofia-sip/m4/sac-general.m4 +++ b/libs/sofia-sip/m4/sac-general.m4 @@ -89,7 +89,7 @@ dnl ====================================================================== AC_DEFUN([SAC_TOOL_CC], [ AC_REQUIRE([SAC_CANONICAL_SYSTEM_CACHE_CHECK]) -AC_BEFORE([$0], [AC_PROG_CPP])dnl +#AC_BEFORE([$0], [AC_PROG_CPP])dnl AC_CHECK_TOOL(CC, gcc, gcc) if test -z "$CC"; then @@ -351,7 +351,7 @@ dnl ====================================================================== AC_DEFUN([AC_CHECK_COMPILATION_ENVIRONMENT], [ AC_REQUIRE([AC_PROG_CC]) AC_CACHE_CHECK([for compilation environment], - ac_cc_environment, [ + ac_cv_cc_environment, [ machine=`$CC -dumpmachine` if test "$machine" = mingw32 ; then ac_cc_environment=$machine diff --git a/libs/sofia-sip/m4/sac-su2.m4 b/libs/sofia-sip/m4/sac-su2.m4 index cd477331c4..46e6cd19f6 100644 --- a/libs/sofia-sip/m4/sac-su2.m4 +++ b/libs/sofia-sip/m4/sac-su2.m4 @@ -594,7 +594,7 @@ Define to 1 if you have working pthread_rwlock_t implementation. if test x$HAVE_PTHREADS = x1 ; then -AC_RUN_IFELSE([ +AC_RUN_IFELSE([AC_LANG_SOURCE([[ #define _XOPEN_SOURCE (500) #include @@ -610,7 +610,7 @@ int main() /* pthread_rwlock_trywrlock() should fail (not return 0) */ return pthread_rwlock_trywrlock(&rw) != 0 ? 0 : 1; } -],[AC_DEFINE_HAVE_PTHREAD_RWLOCK],[ +]])],[AC_DEFINE_HAVE_PTHREAD_RWLOCK],[ AC_MSG_WARN([Recursive pthread_rwlock_rdlock() does not work!!! ]) ],[AC_DEFINE_HAVE_PTHREAD_RWLOCK]) diff --git a/libs/sofia-sip/s2check/Makefile.am b/libs/sofia-sip/s2check/Makefile.am index 1f4e10d81b..b2851c591e 100644 --- a/libs/sofia-sip/s2check/Makefile.am +++ b/libs/sofia-sip/s2check/Makefile.am @@ -8,7 +8,7 @@ # ---------------------------------------------------------------------- # Header paths -INCLUDES = $(INTERNAL_INCLUDES) +AM_CPPFLAGS = $(INTERNAL_INCLUDES) # ---------------------------------------------------------------------- # Build targets diff --git a/libs/sofia-sip/tests/Makefile.am b/libs/sofia-sip/tests/Makefile.am index 45773d70b7..6839d6a132 100644 --- a/libs/sofia-sip/tests/Makefile.am +++ b/libs/sofia-sip/tests/Makefile.am @@ -56,4 +56,4 @@ CLEANFILES = tmp_sippasswd.?????? include $(top_srcdir)/rules/sofia.am -INCLUDES = ${INTERNAL_INCLUDES} +AM_CPPFLAGS = ${INTERNAL_INCLUDES} diff --git a/libs/sofia-sip/utils/Makefile.am b/libs/sofia-sip/utils/Makefile.am index 124a17e34a..0b725a38fc 100644 --- a/libs/sofia-sip/utils/Makefile.am +++ b/libs/sofia-sip/utils/Makefile.am @@ -12,7 +12,7 @@ include $(top_srcdir)/rules/sofia.am -INCLUDES = ${INTERNAL_INCLUDES} +AM_CPPFLAGS = ${INTERNAL_INCLUDES} # ---------------------------------------------------------------------- # Build targets @@ -27,4 +27,4 @@ LDADD = ../libsofia-sip-ua/libsofia-sip-ua.la $(GLIB_LIBS) # Dist and install EXTRA_DIST = utils.docs -CLEANFILES = utils.doxytags \ No newline at end of file +CLEANFILES = utils.doxytags diff --git a/libs/speex/configure.ac b/libs/speex/configure.ac index 12dcc6d6e0..c9f34068ee 100644 --- a/libs/speex/configure.ac +++ b/libs/speex/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -*-m4-*- -AC_INIT(libspeex/speex.c) +AC_INIT(speex, 1.2rc1) AC_CONFIG_HEADERS([config.h]) @@ -26,7 +26,7 @@ PACKAGE=speex AC_SUBST(SPEEX_VERSION) -AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define) +AM_INIT_AUTOMAKE([no-define]) AM_MAINTAINER_MODE CFLAGS="$CFLAGS $CONFIGURE_CFLAGS" diff --git a/libs/speex/libspeex/Makefile.am b/libs/speex/libspeex/Makefile.am index 1eeb33f96c..8762bdd098 100644 --- a/libs/speex/libspeex/Makefile.am +++ b/libs/speex/libspeex/Makefile.am @@ -4,7 +4,7 @@ EXTRA_DIST=echo_diagnostic.m -INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) @FFT_CFLAGS@ +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) @FFT_CFLAGS@ lib_LTLIBRARIES = libspeex.la libspeexdsp.la diff --git a/libs/speex/src/Makefile.am b/libs/speex/src/Makefile.am index e5f75913d5..654062654e 100644 --- a/libs/speex/src/Makefile.am +++ b/libs/speex/src/Makefile.am @@ -5,7 +5,7 @@ # Disable automatic dependency tracking if using other tools than gcc and gmake #AUTOMAKE_OPTIONS = no-dependencies -INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) @OGG_CFLAGS@ +AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_builddir) @OGG_CFLAGS@ man_MANS = speexenc.1 speexdec.1 diff --git a/libs/sqlite/tool/lemon.c b/libs/sqlite/tool/lemon.c index 19c2e42a60..b724ca0f93 100644 --- a/libs/sqlite/tool/lemon.c +++ b/libs/sqlite/tool/lemon.c @@ -3001,6 +3001,7 @@ struct lemon *lemp; FILE *in; char *tpltname; char *cp; + extern int access(); cp = strrchr(lemp->filename,'.'); if( cp ){ diff --git a/libs/srtp/configure.in b/libs/srtp/configure.ac similarity index 98% rename from libs/srtp/configure.in rename to libs/srtp/configure.ac index b4245f495c..3ddc2147b2 100644 --- a/libs/srtp/configure.in +++ b/libs/srtp/configure.ac @@ -1,7 +1,7 @@ AC_PREREQ(2.59) AC_INIT(srtp, 1.4.2, mcgrew@cisco.com) AC_CONFIG_AUX_DIR(build) -AM_INIT_AUTOMAKE(libsrtp,1.4.2) +AM_INIT_AUTOMAKE CFLAGS="$CFLAGS $CONFIGURE_CFLAGS" CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS" @@ -152,13 +152,13 @@ AC_CHECK_HEADERS(sys/types.h) AC_CHECK_HEADERS(machine/types.h) AC_CHECK_HEADERS(sys/int_types.h) -AC_LINK_IFELSE(AC_LANG_PROGRAM([ +AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include #include -],[ +]],[[ uint64_t y = 0x1122334455667788LL; bswap_64(y); -]),byteswap_cv_bswap_64_usable=yes,byteswap_cv_bswap_64_usable=no) +]])],byteswap_cv_bswap_64_usable=yes,byteswap_cv_bswap_64_usable=no) if test "x${byteswap_cv_bswap_64_usable}" = "xyes" ; then AC_DEFINE([HAVE_BYTESWAP_H],1,[define if you have a usable bswap_64 in byteswap.h]) diff --git a/libs/stfu/stfu.c b/libs/stfu/stfu.c index 374185ac9f..8bf8fa8bfe 100644 --- a/libs/stfu/stfu.c +++ b/libs/stfu/stfu.c @@ -339,10 +339,10 @@ static void stfu_n_reset_counters(stfu_instance_t *i) } -void stfu_n_reset(stfu_instance_t *i) +void _stfu_n_reset(stfu_instance_t *i, const char *file, const char *func, int line) { if (stfu_log != null_logger && i->debug) { - stfu_log(STFU_LOG_EMERG, "%s RESET\n", i->name); + stfu_log(file, func, line, STFU_LOG_LEVEL_EMERG, "%s RESET\n", i->name); } i->ready = 0; @@ -447,14 +447,11 @@ stfu_status_t stfu_n_add_data(stfu_instance_t *i, uint32_t ts, uint16_t seq, uin if (i->max_drift) { - if (i->drift_dropped_packets > 500) { - stfu_n_reset(i); - } - if (i->ts_drift < i->max_drift) { if (++i->drift_dropped_packets < i->drift_max_dropped) { stfu_log(STFU_LOG_EMERG, "%s TOO LATE !!! %u \n\n\n", i->name, ts); - return STFU_ITS_TOO_LATE; + stfu_n_sync(i, 1); + //return STFU_ITS_TOO_LATE; } } else { i->drift_dropped_packets = 0; @@ -479,7 +476,8 @@ stfu_status_t stfu_n_add_data(stfu_instance_t *i, uint32_t ts, uint16_t seq, uin if (i->in_queue->array_len < i->in_queue->array_size) { i->in_queue->array_len++; } - return STFU_ITS_TOO_LATE; + stfu_n_sync(i, 1); + //return STFU_ITS_TOO_LATE; } } } @@ -522,10 +520,6 @@ stfu_status_t stfu_n_add_data(stfu_instance_t *i, uint32_t ts, uint16_t seq, uin i->diff_total += i->diff; if ((i->period_packet_in_count > i->period_time)) { - //uint32_t avg; - - //avg = i->diff_total / least1(i->period_packet_in_count); - i->period_packet_in_count = 0; if (i->period_missing_count == 0 && i->qlen > i->orig_qlen) { @@ -535,10 +529,7 @@ stfu_status_t stfu_n_add_data(stfu_instance_t *i, uint32_t ts, uint16_t seq, uin stfu_n_reset_counters(i); } - - - if (stfu_log != null_logger && i->debug) { stfu_log(STFU_LOG_EMERG, "I: %s %u/%u i=%u/%u - g:%u/%u c:%u/%u b:%u - %u:%u - %u %d %u %u %d %d %d/%d\n", i->name, i->qlen, i->max_qlen, i->period_packet_in_count, i->period_time, i->consecutive_good_count, @@ -584,8 +575,9 @@ stfu_status_t stfu_n_add_data(stfu_instance_t *i, uint32_t ts, uint16_t seq, uin static int stfu_n_find_any_frame(stfu_instance_t *in, stfu_queue_t *queue, stfu_frame_t **r_frame) { - uint32_t i = 0; - stfu_frame_t *frame = NULL; + uint32_t i = 0, best_index = 0; + int best_diff = 1000000, cur_diff = 0; + stfu_frame_t *frame = NULL, *best_frame = NULL; stfu_assert(r_frame); @@ -593,16 +585,25 @@ static int stfu_n_find_any_frame(stfu_instance_t *in, stfu_queue_t *queue, stfu_ for(i = 0; i < queue->real_array_size; i++) { frame = &queue->array[i]; - if (!frame->was_read) { - *r_frame = frame; - queue->last_index = i; - frame->was_read = 1; - in->period_packet_out_count++; - in->session_packet_out_count++; - return 1; + cur_diff = abs(frame->ts - in->cur_ts); + + if (!frame->was_read && cur_diff < best_diff) { + best_diff = cur_diff; + best_frame = frame; + best_index = i; } } + if (best_frame) { + *r_frame = best_frame; + queue->last_index = best_index; + best_frame->was_read = 1; + in->period_packet_out_count++; + in->session_packet_out_count++; + return 1; + } + + return 0; } @@ -717,8 +718,8 @@ stfu_frame_t *stfu_n_read_a_frame(stfu_instance_t *i) uint32_t y; stfu_frame_t *frame = NULL; - int32_t delay = i->last_rd_ts - i->cur_ts; - uint32_t need = abs(i->last_rd_ts - i->cur_ts) / i->samples_per_packet; + int32_t delay = i->cur_ts - i->last_rd_ts; + uint32_t need = abs(delay) / i->samples_per_packet; i->period_missing_count++; @@ -735,21 +736,20 @@ stfu_frame_t *stfu_n_read_a_frame(stfu_instance_t *i) } if (stfu_log != null_logger && i->debug) { - stfu_log(STFU_LOG_EMERG, "%s ", i->name); + stfu_log(STFU_LOG_EMERG, "%s ------------\n", i->name); for(y = 0; y < i->out_queue->array_size; y++) { - if ((y % 5) == 0) stfu_log(STFU_LOG_EMERG, "\n%s ", i->name); frame = &i->out_queue->array[y]; - stfu_log(STFU_LOG_EMERG, "%u:%u\t", frame->ts, frame->ts / i->samples_per_packet); + stfu_log(STFU_LOG_EMERG, "%s\t%u:%u\n", i->name, frame->ts, frame->ts / i->samples_per_packet); } - stfu_log(STFU_LOG_EMERG, "\n%s ", i->name); + stfu_log(STFU_LOG_EMERG, "%s ------------\n\n\n", i->name); + stfu_log(STFU_LOG_EMERG, "%s ------------\n", i->name); for(y = 0; y < i->in_queue->array_size; y++) { - if ((y % 5) == 0) stfu_log(STFU_LOG_EMERG, "\n%s ", i->name); frame = &i->in_queue->array[y]; - stfu_log(STFU_LOG_EMERG, "%u:%u\t", frame->ts, frame->ts / i->samples_per_packet); + stfu_log(STFU_LOG_EMERG, "%s\t%u:%u\n", i->name, frame->ts, frame->ts / i->samples_per_packet); } - stfu_log(STFU_LOG_EMERG, "\n%s\n\n\n", i->name); + stfu_log(STFU_LOG_EMERG, "%s\n\n\n", i->name); } @@ -788,23 +788,37 @@ stfu_frame_t *stfu_n_read_a_frame(stfu_instance_t *i) i->plc_pt = rframe->pt; } else { - i->last_wr_ts = i->cur_ts; - rframe = &i->out_queue->int_frame; - rframe->dlen = i->plc_len; - rframe->pt = i->plc_pt; - rframe->ts = i->cur_ts; - rframe->seq = i->cur_seq; - i->miss_count++; - - if (stfu_log != null_logger && i->debug) { - stfu_log(STFU_LOG_EMERG, "%s PLC %d %d %ld %u:%u\n", i->name, - i->miss_count, rframe->plc, rframe->dlen, rframe->ts, rframe->ts / i->samples_per_packet); + if (stfu_n_find_any_frame(i, i->out_queue, &rframe)) { + i->cur_ts = rframe->ts; + i->cur_seq = rframe->seq; + i->last_wr_ts = i->cur_ts; + i->miss_count++; + + if (stfu_log != null_logger && i->debug) { + stfu_log(STFU_LOG_EMERG, "%s AUTOCORRECT %d %d %ld %u:%u\n", i->name, + i->miss_count, rframe->plc, rframe->dlen, rframe->ts, rframe->ts / i->samples_per_packet); + } + + } else { + i->last_wr_ts = i->cur_ts; + rframe = &i->out_queue->int_frame; + rframe->dlen = i->plc_len; + rframe->pt = i->plc_pt; + rframe->ts = i->cur_ts; + rframe->seq = i->cur_seq; + i->miss_count++; + + if (stfu_log != null_logger && i->debug) { + stfu_log(STFU_LOG_EMERG, "%s PLC %d %d %ld %u:%u\n", i->name, + i->miss_count, rframe->plc, rframe->dlen, rframe->ts, rframe->ts / i->samples_per_packet); + } } if (i->miss_count > i->max_plc) { stfu_n_reset(i); rframe = NULL; } + } return rframe; diff --git a/libs/stfu/stfu.h b/libs/stfu/stfu.h index 3ff5326271..1434699522 100644 --- a/libs/stfu/stfu.h +++ b/libs/stfu/stfu.h @@ -35,6 +35,10 @@ extern "C" { } #endif +#if !defined(MACOSX) && !defined(_XOPEN_SOURCE) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__cplusplus) +#define _XOPEN_SOURCE 600 +#endif + #include #include #include @@ -194,7 +198,8 @@ stfu_status_t stfu_n_resize(stfu_instance_t *i, uint32_t qlen); stfu_status_t stfu_n_add_data(stfu_instance_t *i, uint32_t ts, uint16_t seq, uint32_t pt, void *data, size_t datalen, uint32_t timer_ts, int last); stfu_frame_t *stfu_n_read_a_frame(stfu_instance_t *i); STFU_DECLARE(int32_t) stfu_n_copy_next_frame(stfu_instance_t *jb, uint32_t timestamp, uint16_t seq, uint16_t distance, stfu_frame_t *next_frame); -void stfu_n_reset(stfu_instance_t *i); +void _stfu_n_reset(stfu_instance_t *i, const char *file, const char *func, int line); +#define stfu_n_reset(_i) _stfu_n_reset(_i, STFU_PRE) stfu_status_t stfu_n_sync(stfu_instance_t *i, uint32_t packets); void stfu_n_call_me(stfu_instance_t *i, stfu_n_call_me_t callback, void *udata); void stfu_n_debug(stfu_instance_t *i, const char *name); diff --git a/libs/tiff-4.0.2/configure.ac b/libs/tiff-4.0.2/configure.ac index 164b08a059..72989e760e 100644 --- a/libs/tiff-4.0.2/configure.ac +++ b/libs/tiff-4.0.2/configure.ac @@ -106,6 +106,7 @@ AC_SUBST(LIBTIFF_RELEASE_DATE) dnl Checks for programs. AC_PROG_CC +AC_PROG_CXX AM_PROG_CC_C_O dnl We want warnings. As many warnings as possible. diff --git a/libs/tiff-4.0.2/contrib/addtiffo/Makefile.am b/libs/tiff-4.0.2/contrib/addtiffo/Makefile.am index aed05b8204..d634a152d3 100644 --- a/libs/tiff-4.0.2/contrib/addtiffo/Makefile.am +++ b/libs/tiff-4.0.2/contrib/addtiffo/Makefile.am @@ -32,5 +32,5 @@ noinst_PROGRAMS = addtiffo addtiffo_SOURCES = addtiffo.c tif_overview.c tif_ovrcache.c tif_ovrcache.h addtiffo_LDADD = $(LIBTIFF) -INCLUDES = -I$(top_srcdir)/libtiff +AM_CPPFLAGS = -I$(top_srcdir)/libtiff diff --git a/libs/tiff-4.0.2/contrib/dbs/Makefile.am b/libs/tiff-4.0.2/contrib/dbs/Makefile.am index 0346471951..0787377913 100644 --- a/libs/tiff-4.0.2/contrib/dbs/Makefile.am +++ b/libs/tiff-4.0.2/contrib/dbs/Makefile.am @@ -40,5 +40,5 @@ tiff_palette_LDADD = $(LIBTIFF) tiff_rgb_SOURCES = tiff-rgb.c tiff_rgb_LDADD = $(LIBTIFF) -INCLUDES = -I$(top_srcdir)/libtiff +AM_CPPFLAGS = -I$(top_srcdir)/libtiff diff --git a/libs/tiff-4.0.2/contrib/iptcutil/Makefile.am b/libs/tiff-4.0.2/contrib/iptcutil/Makefile.am index 9b94ed79a2..9caedf1472 100644 --- a/libs/tiff-4.0.2/contrib/iptcutil/Makefile.am +++ b/libs/tiff-4.0.2/contrib/iptcutil/Makefile.am @@ -32,5 +32,5 @@ noinst_PROGRAMS = iptcutil iptcutil_SOURCES = iptcutil.c iptcutil_LDADD = $(LIBTIFF) -INCLUDES = -I$(top_srcdir)/libtiff +AM_CPPFLAGS = -I$(top_srcdir)/libtiff diff --git a/libs/tiff-4.0.2/test/Makefile.am b/libs/tiff-4.0.2/test/Makefile.am index 4a1dea4411..ac9f5fa668 100644 --- a/libs/tiff-4.0.2/test/Makefile.am +++ b/libs/tiff-4.0.2/test/Makefile.am @@ -182,7 +182,7 @@ raw_decode_LDADD = $(LIBTIFF) custom_dir_SOURCES = custom_dir.c custom_dir_LDADD = $(LIBTIFF) -INCLUDES = -I$(top_srcdir)/libtiff +AM_CPPFLAGS = -I$(top_srcdir)/libtiff # memcheck: valgrind's memory access checker memcheck: diff --git a/libs/tiff-4.0.2/tools/Makefile.am b/libs/tiff-4.0.2/tools/Makefile.am index c2b735c445..6497f2dca1 100644 --- a/libs/tiff-4.0.2/tools/Makefile.am +++ b/libs/tiff-4.0.2/tools/Makefile.am @@ -135,7 +135,7 @@ tiffgt_SOURCES = tiffgt.c tiffgt_CFLAGS = $(CFLAGS) $(GLUT_CFLAGS) $(AM_CFLAGS) tiffgt_LDADD = $(LIBTIFF) $(LIBPORT) $(X_LIBS) $(GLUT_LIBS) -INCLUDES = -I$(top_srcdir)/libtiff +AM_CPPFLAGS = -I$(top_srcdir)/libtiff echo: (echo $(CFLAGS)) diff --git a/libs/unimrcp/build/svnrev/Makefile.am b/libs/unimrcp/build/svnrev/Makefile.am index 5ce3ff2644..78f9a457c5 100644 --- a/libs/unimrcp/build/svnrev/Makefile.am +++ b/libs/unimrcp/build/svnrev/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -INCLUDES = $(UNIMRCP_APR_INCLUDES) $(UNIMRCP_APU_INCLUDES) +AM_CPPFLAGS = $(UNIMRCP_APR_INCLUDES) $(UNIMRCP_APU_INCLUDES) noinst_PROGRAMS = svnrev svnrev_LDADD = $(UNIMRCP_APR_LIBS) $(UNIMRCP_APU_LIBS) diff --git a/libs/unimrcp/libs/apr-toolkit/Makefile.am b/libs/unimrcp/libs/apr-toolkit/Makefile.am index 0647143824..1b78fdf6eb 100644 --- a/libs/unimrcp/libs/apr-toolkit/Makefile.am +++ b/libs/unimrcp/libs/apr-toolkit/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -INCLUDES = -I$(top_srcdir)/libs/apr-toolkit/include \ +AM_CPPFLAGS = -I$(top_srcdir)/libs/apr-toolkit/include \ $(UNIMRCP_APR_INCLUDES) $(UNIMRCP_APU_INCLUDES) noinst_LTLIBRARIES = libaprtoolkit.la diff --git a/libs/unimrcp/libs/mpf/Makefile.am b/libs/unimrcp/libs/mpf/Makefile.am index 0e904a46ed..15d97dcc14 100644 --- a/libs/unimrcp/libs/mpf/Makefile.am +++ b/libs/unimrcp/libs/mpf/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -INCLUDES = -I$(top_srcdir)/libs/mpf/codecs \ +AM_CPPFLAGS = -I$(top_srcdir)/libs/mpf/codecs \ -I$(top_srcdir)/libs/mpf/include \ -I$(top_srcdir)/libs/apr-toolkit/include \ $(UNIMRCP_APR_INCLUDES) $(UNIMRCP_APU_INCLUDES) diff --git a/libs/unimrcp/libs/mrcp-client/Makefile.am b/libs/unimrcp/libs/mrcp-client/Makefile.am index f2d306fb96..6cc15f0566 100644 --- a/libs/unimrcp/libs/mrcp-client/Makefile.am +++ b/libs/unimrcp/libs/mrcp-client/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -INCLUDES = -I$(top_srcdir)/libs/mrcp-client/include \ +AM_CPPFLAGS = -I$(top_srcdir)/libs/mrcp-client/include \ -I$(top_srcdir)/libs/mrcp-signaling/include \ -I$(top_srcdir)/libs/mrcpv2-transport/include \ -I$(top_srcdir)/libs/mrcp/include \ diff --git a/libs/unimrcp/libs/mrcp-engine/Makefile.am b/libs/unimrcp/libs/mrcp-engine/Makefile.am index f30e21a2bd..f8edd77ba6 100644 --- a/libs/unimrcp/libs/mrcp-engine/Makefile.am +++ b/libs/unimrcp/libs/mrcp-engine/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -INCLUDES = -I$(top_srcdir)/libs/mrcp-engine/include \ +AM_CPPFLAGS = -I$(top_srcdir)/libs/mrcp-engine/include \ -I$(top_srcdir)/libs/mrcp/include \ -I$(top_srcdir)/libs/mrcp/message/include \ -I$(top_srcdir)/libs/mrcp/control/include \ diff --git a/libs/unimrcp/libs/mrcp-server/Makefile.am b/libs/unimrcp/libs/mrcp-server/Makefile.am index ba1c8ae83d..14a90285ca 100644 --- a/libs/unimrcp/libs/mrcp-server/Makefile.am +++ b/libs/unimrcp/libs/mrcp-server/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -INCLUDES = -I$(top_srcdir)/libs/mrcp-server/include \ +AM_CPPFLAGS = -I$(top_srcdir)/libs/mrcp-server/include \ -I$(top_srcdir)/libs/mrcp-engine/include \ -I$(top_srcdir)/libs/mrcp-signaling/include \ -I$(top_srcdir)/libs/mrcpv2-transport/include \ diff --git a/libs/unimrcp/libs/mrcp-signaling/Makefile.am b/libs/unimrcp/libs/mrcp-signaling/Makefile.am index 4a7458dbd6..0ce6432740 100644 --- a/libs/unimrcp/libs/mrcp-signaling/Makefile.am +++ b/libs/unimrcp/libs/mrcp-signaling/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -INCLUDES = -I$(top_srcdir)/libs/mrcp-signaling/include \ +AM_CPPFLAGS = -I$(top_srcdir)/libs/mrcp-signaling/include \ -I$(top_srcdir)/libs/mrcp/include \ -I$(top_srcdir)/libs/mpf/include \ -I$(top_srcdir)/libs/apr-toolkit/include \ @@ -14,4 +14,4 @@ include_HEADERS = include/mrcp_sig_types.h \ include/mrcp_session_descriptor.h libmrcpsignaling_la_SOURCES = src/mrcp_sig_agent.c \ - src/mrcp_session_descriptor.c \ No newline at end of file + src/mrcp_session_descriptor.c diff --git a/libs/unimrcp/libs/mrcp/Makefile.am b/libs/unimrcp/libs/mrcp/Makefile.am index 7528d04928..ade1e4408d 100644 --- a/libs/unimrcp/libs/mrcp/Makefile.am +++ b/libs/unimrcp/libs/mrcp/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -INCLUDES = -I$(top_srcdir)/libs/mrcp/include \ +AM_CPPFLAGS = -I$(top_srcdir)/libs/mrcp/include \ -I$(top_srcdir)/libs/mrcp/message/include \ -I$(top_srcdir)/libs/mrcp/control/include \ -I$(top_srcdir)/libs/mrcp/resources/include \ diff --git a/libs/unimrcp/libs/mrcpv2-transport/Makefile.am b/libs/unimrcp/libs/mrcpv2-transport/Makefile.am index e86055da62..f70441e402 100644 --- a/libs/unimrcp/libs/mrcpv2-transport/Makefile.am +++ b/libs/unimrcp/libs/mrcpv2-transport/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -INCLUDES = -I$(top_srcdir)/libs/mrcpv2-transport/include \ +AM_CPPFLAGS = -I$(top_srcdir)/libs/mrcpv2-transport/include \ -I$(top_srcdir)/libs/mrcp/include \ -I$(top_srcdir)/libs/mrcp/message/include \ -I$(top_srcdir)/libs/mrcp/control/include \ diff --git a/libs/unimrcp/libs/uni-rtsp/Makefile.am b/libs/unimrcp/libs/uni-rtsp/Makefile.am index 00f5ec5189..45c7442a61 100644 --- a/libs/unimrcp/libs/uni-rtsp/Makefile.am +++ b/libs/unimrcp/libs/uni-rtsp/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -INCLUDES = -I$(top_srcdir)/libs/uni-rtsp/include \ +AM_CPPFLAGS = -I$(top_srcdir)/libs/uni-rtsp/include \ -I$(top_srcdir)/libs/apr-toolkit/include \ $(UNIMRCP_APR_INCLUDES) $(UNIMRCP_APU_INCLUDES) diff --git a/libs/unimrcp/modules/mrcp-sofiasip/Makefile.am b/libs/unimrcp/modules/mrcp-sofiasip/Makefile.am index 9bae7e3300..841a220971 100644 --- a/libs/unimrcp/modules/mrcp-sofiasip/Makefile.am +++ b/libs/unimrcp/modules/mrcp-sofiasip/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -INCLUDES = -Iinclude \ +AM_CPPFLAGS = -Iinclude \ -I$(top_srcdir)/libs/mrcpv2-transport/include \ -I$(top_srcdir)/libs/mrcp-signaling/include \ -I$(top_srcdir)/libs/mrcp/include \ diff --git a/libs/unimrcp/modules/mrcp-unirtsp/Makefile.am b/libs/unimrcp/modules/mrcp-unirtsp/Makefile.am index ad7d54afe1..3879890d2f 100644 --- a/libs/unimrcp/modules/mrcp-unirtsp/Makefile.am +++ b/libs/unimrcp/modules/mrcp-unirtsp/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -INCLUDES = -Iinclude \ +AM_CPPFLAGS = -Iinclude \ -I$(top_srcdir)/libs/mrcp-signaling/include \ -I$(top_srcdir)/libs/mrcp/include \ -I$(top_srcdir)/libs/mrcp/message/include \ diff --git a/libs/unimrcp/platforms/asr-client/Makefile.am b/libs/unimrcp/platforms/asr-client/Makefile.am index 02f6a0a6a9..b0f057a2b4 100644 --- a/libs/unimrcp/platforms/asr-client/Makefile.am +++ b/libs/unimrcp/platforms/asr-client/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -INCLUDES = -Iinclude \ +AM_CPPFLAGS = -Iinclude \ -I$(top_srcdir)/platforms/libasr-client/include \ -I$(top_srcdir)/platforms/libunimrcp-client/include \ -I$(top_srcdir)/libs/mrcp-client/include \ diff --git a/libs/unimrcp/platforms/libasr-client/Makefile.am b/libs/unimrcp/platforms/libasr-client/Makefile.am index 468846b3c1..cf89280e35 100644 --- a/libs/unimrcp/platforms/libasr-client/Makefile.am +++ b/libs/unimrcp/platforms/libasr-client/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -INCLUDES = -Iinclude \ +AM_CPPFLAGS = -Iinclude \ -I$(top_srcdir)/platforms/libunimrcp-client/include \ -I$(top_srcdir)/libs/mrcp-client/include \ -I$(top_srcdir)/libs/mrcp-signaling/include \ diff --git a/libs/unimrcp/platforms/libunimrcp-client/Makefile.am b/libs/unimrcp/platforms/libunimrcp-client/Makefile.am index f1cbd3fe57..a30db7b112 100644 --- a/libs/unimrcp/platforms/libunimrcp-client/Makefile.am +++ b/libs/unimrcp/platforms/libunimrcp-client/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -INCLUDES = -I$(top_srcdir)/platforms/libunimrcp-client/include \ +AM_CPPFLAGS = -I$(top_srcdir)/platforms/libunimrcp-client/include \ -I$(top_srcdir)/modules/mrcp-sofiasip/include \ -I$(top_srcdir)/modules/mrcp-unirtsp/include \ -I$(top_srcdir)/libs/mrcp-client/include \ diff --git a/libs/unimrcp/platforms/libunimrcp-server/Makefile.am b/libs/unimrcp/platforms/libunimrcp-server/Makefile.am index b20402b015..4c8d91e205 100644 --- a/libs/unimrcp/platforms/libunimrcp-server/Makefile.am +++ b/libs/unimrcp/platforms/libunimrcp-server/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -INCLUDES = -I$(top_srcdir)/platforms/libunimrcp-server/include \ +AM_CPPFLAGS = -I$(top_srcdir)/platforms/libunimrcp-server/include \ -I$(top_srcdir)/modules/mrcp-sofiasip/include \ -I$(top_srcdir)/modules/mrcp-unirtsp/include \ -I$(top_srcdir)/libs/mrcp-server/include \ diff --git a/libs/unimrcp/platforms/umc/Makefile.am b/libs/unimrcp/platforms/umc/Makefile.am index a33ddfdd0f..fa38077648 100644 --- a/libs/unimrcp/platforms/umc/Makefile.am +++ b/libs/unimrcp/platforms/umc/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -INCLUDES = -Iinclude \ +AM_CPPFLAGS = -Iinclude \ -I$(top_srcdir)/platforms/libunimrcp-client/include \ -I$(top_srcdir)/libs/mrcp-client/include \ -I$(top_srcdir)/libs/mrcp-signaling/include \ diff --git a/libs/unimrcp/platforms/unimrcp-client/Makefile.am b/libs/unimrcp/platforms/unimrcp-client/Makefile.am index e49fbfd355..a8d86c6450 100644 --- a/libs/unimrcp/platforms/unimrcp-client/Makefile.am +++ b/libs/unimrcp/platforms/unimrcp-client/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -INCLUDES = -Iinclude \ +AM_CPPFLAGS = -Iinclude \ -I$(top_srcdir)/platforms/libunimrcp-client/include \ -I$(top_srcdir)/libs/mrcp-client/include \ -I$(top_srcdir)/libs/mrcp-signaling/include \ diff --git a/libs/unimrcp/platforms/unimrcp-server/Makefile.am b/libs/unimrcp/platforms/unimrcp-server/Makefile.am index c7ba123342..b3d5218052 100644 --- a/libs/unimrcp/platforms/unimrcp-server/Makefile.am +++ b/libs/unimrcp/platforms/unimrcp-server/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -INCLUDES = -Iinclude \ +AM_CPPFLAGS = -Iinclude \ -I$(top_srcdir)/platforms/libunimrcp-server/include \ -I$(top_srcdir)/libs/mrcp-server/include \ -I$(top_srcdir)/libs/mrcp-engine/include \ diff --git a/libs/unimrcp/plugins/demo-recog/Makefile.am b/libs/unimrcp/plugins/demo-recog/Makefile.am index ebf041f36b..dea736be69 100644 --- a/libs/unimrcp/plugins/demo-recog/Makefile.am +++ b/libs/unimrcp/plugins/demo-recog/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -INCLUDES = -Iinclude \ +AM_CPPFLAGS = -Iinclude \ -I$(top_srcdir)/libs/mrcp-engine/include \ -I$(top_srcdir)/libs/mrcp/include \ -I$(top_srcdir)/libs/mrcp/message/include \ diff --git a/libs/unimrcp/plugins/demo-synth/Makefile.am b/libs/unimrcp/plugins/demo-synth/Makefile.am index 0cb6d84166..72f251d2a8 100644 --- a/libs/unimrcp/plugins/demo-synth/Makefile.am +++ b/libs/unimrcp/plugins/demo-synth/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -INCLUDES = -Iinclude \ +AM_CPPFLAGS = -Iinclude \ -I$(top_srcdir)/libs/mrcp-engine/include \ -I$(top_srcdir)/libs/mrcp/include \ -I$(top_srcdir)/libs/mrcp/message/include \ diff --git a/libs/unimrcp/plugins/demo-verifier/Makefile.am b/libs/unimrcp/plugins/demo-verifier/Makefile.am index 175950a055..25266f604c 100644 --- a/libs/unimrcp/plugins/demo-verifier/Makefile.am +++ b/libs/unimrcp/plugins/demo-verifier/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -INCLUDES = -Iinclude \ +AM_CPPFLAGS = -Iinclude \ -I$(top_srcdir)/libs/mrcp-engine/include \ -I$(top_srcdir)/libs/mrcp/include \ -I$(top_srcdir)/libs/mrcp/message/include \ diff --git a/libs/unimrcp/plugins/mrcp-flite/Makefile.am b/libs/unimrcp/plugins/mrcp-flite/Makefile.am index 0e1dcbd58f..d2cec23779 100644 --- a/libs/unimrcp/plugins/mrcp-flite/Makefile.am +++ b/libs/unimrcp/plugins/mrcp-flite/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -INCLUDES = -Iinclude \ +AM_CPPFLAGS = -Iinclude \ -I$(top_srcdir)/libs/mrcp-engine/include \ -I$(top_srcdir)/libs/mrcp/include \ -I$(top_srcdir)/libs/mrcp/message/include \ diff --git a/libs/unimrcp/plugins/mrcp-pocketsphinx/Makefile.am b/libs/unimrcp/plugins/mrcp-pocketsphinx/Makefile.am index 4cdfb7cf3c..1f0edf7d4e 100644 --- a/libs/unimrcp/plugins/mrcp-pocketsphinx/Makefile.am +++ b/libs/unimrcp/plugins/mrcp-pocketsphinx/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -INCLUDES = -Iinclude \ +AM_CPPFLAGS = -Iinclude \ -I$(top_srcdir)/libs/mrcp-engine/include \ -I$(top_srcdir)/libs/mrcp/include \ -I$(top_srcdir)/libs/mrcp/message/include \ diff --git a/libs/unimrcp/plugins/mrcp-recorder/Makefile.am b/libs/unimrcp/plugins/mrcp-recorder/Makefile.am index bdb22748ab..68ec9e4e7c 100644 --- a/libs/unimrcp/plugins/mrcp-recorder/Makefile.am +++ b/libs/unimrcp/plugins/mrcp-recorder/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -INCLUDES = -Iinclude \ +AM_CPPFLAGS = -Iinclude \ -I$(top_srcdir)/libs/mrcp-engine/include \ -I$(top_srcdir)/libs/mrcp/include \ -I$(top_srcdir)/libs/mrcp/message/include \ diff --git a/libs/unimrcp/tests/apttest/Makefile.am b/libs/unimrcp/tests/apttest/Makefile.am index 97cc56da99..bf8783d5b0 100644 --- a/libs/unimrcp/tests/apttest/Makefile.am +++ b/libs/unimrcp/tests/apttest/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -INCLUDES = -I$(top_srcdir)/libs/apr-toolkit/include \ +AM_CPPFLAGS = -I$(top_srcdir)/libs/apr-toolkit/include \ $(UNIMRCP_APR_INCLUDES) $(UNIMRCP_APU_INCLUDES) noinst_PROGRAMS = apttest diff --git a/libs/unimrcp/tests/mpftest/Makefile.am b/libs/unimrcp/tests/mpftest/Makefile.am index 7f5c7b3310..b4bf49da64 100644 --- a/libs/unimrcp/tests/mpftest/Makefile.am +++ b/libs/unimrcp/tests/mpftest/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -INCLUDES = -I$(top_srcdir)/libs/mpf/include \ +AM_CPPFLAGS = -I$(top_srcdir)/libs/mpf/include \ -I$(top_srcdir)/libs/apr-toolkit/include \ $(UNIMRCP_APR_INCLUDES) $(UNIMRCP_APU_INCLUDES) diff --git a/libs/unimrcp/tests/mrcptest/Makefile.am b/libs/unimrcp/tests/mrcptest/Makefile.am index f74a2ed86a..83e91b413f 100644 --- a/libs/unimrcp/tests/mrcptest/Makefile.am +++ b/libs/unimrcp/tests/mrcptest/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -INCLUDES = -I$(top_srcdir)/libs/mrcp/include \ +AM_CPPFLAGS = -I$(top_srcdir)/libs/mrcp/include \ -I$(top_srcdir)/libs/mrcp/message/include \ -I$(top_srcdir)/libs/mrcp/control/include \ -I$(top_srcdir)/libs/mrcp/resources/include \ diff --git a/libs/unimrcp/tests/rtsptest/Makefile.am b/libs/unimrcp/tests/rtsptest/Makefile.am index 4821917b5e..7dbc6432d8 100644 --- a/libs/unimrcp/tests/rtsptest/Makefile.am +++ b/libs/unimrcp/tests/rtsptest/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -INCLUDES = -I$(top_srcdir)/libs/uni-rtsp/include \ +AM_CPPFLAGS = -I$(top_srcdir)/libs/uni-rtsp/include \ -I$(top_srcdir)/libs/apr-toolkit/include \ $(UNIMRCP_APR_INCLUDES) $(UNIMRCP_APU_INCLUDES) diff --git a/libs/unimrcp/tests/strtablegen/Makefile.am b/libs/unimrcp/tests/strtablegen/Makefile.am index b3508c27ec..ab25346b74 100644 --- a/libs/unimrcp/tests/strtablegen/Makefile.am +++ b/libs/unimrcp/tests/strtablegen/Makefile.am @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -INCLUDES = -I$(top_srcdir)/libs/apr-toolkit/include \ +AM_CPPFLAGS = -I$(top_srcdir)/libs/apr-toolkit/include \ $(UNIMRCP_APR_INCLUDES) $(UNIMRCP_APU_INCLUDES) noinst_PROGRAMS = strtablegen diff --git a/libs/win32/util.vbs b/libs/win32/util.vbs index f22d9dd284..032d1bbf5b 100644 --- a/libs/win32/util.vbs +++ b/libs/win32/util.vbs @@ -369,11 +369,11 @@ Sub CreateVersion(tmpFolder, VersionDir, includebase, includedest) Wscript.echo("Checking if we're building a newer git version") - strVerMajor = FindVersionStringInConfigure(VersionDir & "configure.in", "SWITCH_VERSION_MAJOR") - strVerMinor = FindVersionStringInConfigure(VersionDir & "configure.in", "SWITCH_VERSION_MINOR") - strVerMicro = FindVersionStringInConfigure(VersionDir & "configure.in", "SWITCH_VERSION_MICRO") - strVerRev = FindVersionStringInConfigure(VersionDir & "configure.in", "SWITCH_VERSION_REVISION") - strVerHuman = FindVersionStringInConfigure(VersionDir & "configure.in", "SWITCH_VERSION_REVISION_HUMAN") + strVerMajor = FindVersionStringInConfigure(VersionDir & "configure.ac", "SWITCH_VERSION_MAJOR") + strVerMinor = FindVersionStringInConfigure(VersionDir & "configure.ac", "SWITCH_VERSION_MINOR") + strVerMicro = FindVersionStringInConfigure(VersionDir & "configure.ac", "SWITCH_VERSION_MICRO") + strVerRev = FindVersionStringInConfigure(VersionDir & "configure.ac", "SWITCH_VERSION_REVISION") + strVerHuman = FindVersionStringInConfigure(VersionDir & "configure.ac", "SWITCH_VERSION_REVISION_HUMAN") 'Set version to the one reported by configure.in If strVerRev <> "" Then diff --git a/libs/win32/xmlrpc-c/xmlrpc.2010.vcxproj b/libs/win32/xmlrpc-c/xmlrpc.2010.vcxproj index 1c481f2b22..34dc894edd 100644 --- a/libs/win32/xmlrpc-c/xmlrpc.2010.vcxproj +++ b/libs/win32/xmlrpc-c/xmlrpc.2010.vcxproj @@ -214,7 +214,7 @@ - + diff --git a/libs/win32/xmlrpc-c/xmlrpc.2010.vcxproj.filters b/libs/win32/xmlrpc-c/xmlrpc.2010.vcxproj.filters index ac7abdea72..8b6a1834a1 100644 --- a/libs/win32/xmlrpc-c/xmlrpc.2010.vcxproj.filters +++ b/libs/win32/xmlrpc-c/xmlrpc.2010.vcxproj.filters @@ -1,125 +1,125 @@ - - - - - {7ca2b8b9-bf59-4407-aedf-588e548fe34a} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;cc - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - + + + + + {7ca2b8b9-bf59-4407-aedf-588e548fe34a} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;cc + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + \ No newline at end of file diff --git a/libs/win32/xmlrpc-c/xmlrpc.2012.vcxproj b/libs/win32/xmlrpc-c/xmlrpc.2012.vcxproj index b5c2998870..c47c26fb34 100644 --- a/libs/win32/xmlrpc-c/xmlrpc.2012.vcxproj +++ b/libs/win32/xmlrpc-c/xmlrpc.2012.vcxproj @@ -222,7 +222,7 @@ - + diff --git a/libs/win32/xmlrpc-c/xmlrpc.2012.vcxproj.filters b/libs/win32/xmlrpc-c/xmlrpc.2012.vcxproj.filters index ac7abdea72..8b6a1834a1 100644 --- a/libs/win32/xmlrpc-c/xmlrpc.2012.vcxproj.filters +++ b/libs/win32/xmlrpc-c/xmlrpc.2012.vcxproj.filters @@ -1,125 +1,125 @@ - - - - - {7ca2b8b9-bf59-4407-aedf-588e548fe34a} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;cc - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - + + + + + {7ca2b8b9-bf59-4407-aedf-588e548fe34a} + cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;cc + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + \ No newline at end of file diff --git a/libs/xmlrpc-c/configure.in b/libs/xmlrpc-c/configure.ac similarity index 100% rename from libs/xmlrpc-c/configure.in rename to libs/xmlrpc-c/configure.ac diff --git a/libs/xmlrpc-c/src/Makefile b/libs/xmlrpc-c/src/Makefile index 36300e91f0..726abba90f 100644 --- a/libs/xmlrpc-c/src/Makefile +++ b/libs/xmlrpc-c/src/Makefile @@ -83,7 +83,7 @@ LIBXMLRPC_MODS = \ parse_datetime \ parse_value \ resource \ - trace \ + xml_trace \ version \ xmlrpc_data \ xmlrpc_datetime \ diff --git a/libs/xmlrpc-c/src/trace.c b/libs/xmlrpc-c/src/xml_trace.c similarity index 100% rename from libs/xmlrpc-c/src/trace.c rename to libs/xmlrpc-c/src/xml_trace.c diff --git a/patches/FS-2746.diff b/patches/FS-2746.diff index ce22bcfb57..28652625b7 100644 --- a/patches/FS-2746.diff +++ b/patches/FS-2746.diff @@ -76183,7 +76183,7 @@ index 9b20546..4489cfc 100644 - MIMETypeAdd("text/html", "html"); + for (hi = switch_core_mime_index(); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, &var, NULL, &val); + switch_core_hash_this(hi, &var, NULL, &val); if (var && val) { @@ -955,38 +1042,52 @@ SWITCH_MODULE_RUNTIME_FUNCTION(mod_xml_rpc_runtime) switch_snprintf(logfile, sizeof(logfile), "%s%s%s", SWITCH_GLOBAL_dirs.log_dir, SWITCH_PATH_SEPARATOR, "freeswitch_http.log"); diff --git a/src/include/private/switch_hashtable_private.h b/src/include/private/switch_hashtable_private.h new file mode 100644 index 0000000000..d8220310a0 --- /dev/null +++ b/src/include/private/switch_hashtable_private.h @@ -0,0 +1,130 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * switch_hashtable_private.h -- Hashtable + * + */ + +/* hashtable_private.h -- Copyright (C) 2002, 2004 Christopher Clark */ + +#ifndef __HASHTABLE_PRIVATE_CWC22_H__ +#define __HASHTABLE_PRIVATE_CWC22_H__ + +#include "switch_hashtable.h" + +#ifdef __cplusplus +extern "C" { +#endif +/*****************************************************************************/ + +struct entry +{ + void *k, *v; + unsigned int h; + hashtable_flag_t flags; + struct entry *next; +}; + +struct switch_hashtable_iterator { + unsigned int pos; + struct entry *e; + struct switch_hashtable *h; +}; + +struct switch_hashtable { + unsigned int tablelength; + struct entry **table; + unsigned int entrycount; + unsigned int loadlimit; + unsigned int primeindex; + unsigned int (*hashfn) (void *k); + int (*eqfn) (void *k1, void *k2); + struct switch_hashtable_iterator iterator; +}; + +/*****************************************************************************/ + +/*****************************************************************************/ +static inline unsigned int +hash(switch_hashtable_t *h, void *k) +{ + /* Aim to protect against poor hash functions by adding logic here + * - logic taken from java 1.4 hashtable source */ + unsigned int i = h->hashfn(k); + i += ~(i << 9); + i ^= ((i >> 14) | (i << 18)); /* >>> */ + i += (i << 4); + i ^= ((i >> 10) | (i << 22)); /* >>> */ + return i; +} + + +/*****************************************************************************/ +/* indexFor */ +static __inline__ unsigned int +indexFor(unsigned int tablelength, unsigned int hashvalue) { + return (hashvalue % tablelength); +} + +/* Only works if tablelength == 2^N */ +/*static inline unsigned int + indexFor(unsigned int tablelength, unsigned int hashvalue) + { + return (hashvalue & (tablelength - 1u)); + } +*/ + +/*****************************************************************************/ +#define freekey(X) free(X) +/*define freekey(X) ; */ + +#ifdef __cplusplus +} +#endif + +/*****************************************************************************/ + +#endif /* __HASHTABLE_PRIVATE_CWC22_H__*/ + +/* + * Copyright (c) 2002, Christopher Clark + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * * Neither the name of the original author; nor the names of any contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER + * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet: + */ diff --git a/src/include/switch_apr.h b/src/include/switch_apr.h index dc6769d267..fee9ed1924 100644 --- a/src/include/switch_apr.h +++ b/src/include/switch_apr.h @@ -186,7 +186,7 @@ SWITCH_DECLARE(char *) switch_copy_string(_Out_z_cap_(dst_size) * progress at the same time. */ -SWITCH_DECLARE(switch_hash_index_t *) switch_hash_first(switch_memory_pool_t *p, switch_hash_t *ht); +SWITCH_DECLARE(switch_hash_index_t *) switch_core_hash_first(switch_memory_pool_t *p, switch_hash_t *ht); /** * Continue iterating over the entries in a hash table. @@ -194,7 +194,7 @@ SWITCH_DECLARE(switch_hash_index_t *) switch_hash_first(switch_memory_pool_t *p, * @return a pointer to the updated iteration state. NULL if there are no more * entries. */ -SWITCH_DECLARE(switch_hash_index_t *) switch_hash_next(switch_hash_index_t *ht); +SWITCH_DECLARE(switch_hash_index_t *) switch_core_hash_next(switch_hash_index_t *ht); /** * Get the current entry's details from the iteration state. @@ -205,7 +205,7 @@ SWITCH_DECLARE(switch_hash_index_t *) switch_hash_next(switch_hash_index_t *ht); * @remark The return pointers should point to a variable that will be set to the * corresponding data, or they may be NULL if the data isn't interesting. */ -SWITCH_DECLARE(void) switch_hash_this(switch_hash_index_t *hi, const void **key, switch_ssize_t *klen, void **val); +SWITCH_DECLARE(void) switch_core_hash_this(switch_hash_index_t *hi, const void **key, switch_ssize_t *klen, void **val); diff --git a/src/include/switch_core.h b/src/include/switch_core.h index db4c4f34ca..564694dbac 100644 --- a/src/include/switch_core.h +++ b/src/include/switch_core.h @@ -1350,9 +1350,9 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_recv_dtmf(_In_ switch_core_s \param pool the pool to use for the new hash \return SWITCH_STATUS_SUCCESS if the hash is created */ -SWITCH_DECLARE(switch_status_t) switch_core_hash_init_case(_Out_ switch_hash_t **hash, _In_ switch_memory_pool_t *pool, switch_bool_t case_sensitive); -#define switch_core_hash_init(_hash, _pool) switch_core_hash_init_case(_hash, _pool, SWITCH_TRUE) -#define switch_core_hash_init_nocase(_hash, _pool) switch_core_hash_init_case(_hash, _pool, SWITCH_FALSE) +SWITCH_DECLARE(switch_status_t) switch_core_hash_init_case(_Out_ switch_hash_t **hash, switch_bool_t case_sensitive); +#define switch_core_hash_init(_hash) switch_core_hash_init_case(_hash, SWITCH_TRUE) +#define switch_core_hash_init_nocase(_hash) switch_core_hash_init_case(_hash, SWITCH_FALSE) @@ -1479,30 +1479,7 @@ SWITCH_DECLARE(switch_hash_index_t *) switch_core_hash_next(_In_ switch_hash_ind SWITCH_DECLARE(void) switch_core_hash_this(_In_ switch_hash_index_t *hi, _Out_opt_ptrdiff_cap_(klen) const void **key, _Out_opt_ switch_ssize_t *klen, _Out_ void **val); -/*! - \brief DEPRECATED in favor of switch_core_hash_first(). Gets the first element of a hashtable. - \param deprecate_me [deprecated] NULL - \param hash the hashtable to use - \return The element, or NULL if it wasn't found -*/ -SWITCH_DECLARE(switch_hash_index_t *) switch_hash_first(char *deprecate_me, _In_ switch_hash_t *hash); -/*! - \brief DEPRECATED in favor of switch_core_hash_next(). Gets the next element of a hashtable. - \param hi The current element - \return The next element, or NULL if there are no more -*/ -SWITCH_DECLARE(switch_hash_index_t *) switch_hash_next(_In_ switch_hash_index_t *hi); - -/*! - \brief DEPRECATED in favor of switch_core_hash_this(). Gets the key and value of the current hash element. - \param hi The current element - \param key [out] the key - \param klen [out] the key's size - \param val [out] the value -*/ -SWITCH_DECLARE(void) switch_hash_this(_In_ switch_hash_index_t *hi, _Out_opt_ptrdiff_cap_(klen) - const void **key, _Out_opt_ switch_ssize_t *klen, _Out_ void **val); ///\} diff --git a/src/include/switch_core_media.h b/src/include/switch_core_media.h index d9183405ea..722b1e9aa4 100644 --- a/src/include/switch_core_media.h +++ b/src/include/switch_core_media.h @@ -169,7 +169,7 @@ SWITCH_DECLARE(void) switch_media_handle_set_media_flag(switch_media_handle_t *s SWITCH_DECLARE(void) switch_media_handle_clear_media_flag(switch_media_handle_t *smh, switch_core_media_flag_t flag); SWITCH_DECLARE(int32_t) switch_media_handle_test_media_flag(switch_media_handle_t *smh, switch_core_media_flag_t flag); SWITCH_DECLARE(void) switch_media_handle_set_media_flags(switch_media_handle_t *smh, switch_core_media_flag_t flags[]); -SWITCH_DECLARE(void) switch_core_session_check_outgoing_crypto(switch_core_session_t *session, const char *sec_var); +SWITCH_DECLARE(void) switch_core_session_check_outgoing_crypto(switch_core_session_t *session); SWITCH_DECLARE(const char *) switch_core_session_local_crypto_key(switch_core_session_t *session, switch_media_type_t type); SWITCH_DECLARE(int) switch_core_session_check_incoming_crypto(switch_core_session_t *session, const char *varname, diff --git a/src/include/switch_hashtable.h b/src/include/switch_hashtable.h new file mode 100644 index 0000000000..4056064a32 --- /dev/null +++ b/src/include/switch_hashtable.h @@ -0,0 +1,281 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * switch_hashtable.h -- Hashtable + * + */ + + +/* hashtable.h Copyright (C) 2002 Christopher Clark */ + +#ifndef __HASHTABLE_CWC22_H__ +#define __HASHTABLE_CWC22_H__ +#ifdef _MSC_VER +#ifndef __inline__ +#define __inline__ __inline +#endif +#endif +#include "switch.h" + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct switch_hashtable switch_hashtable_t; +typedef struct switch_hashtable_iterator switch_hashtable_iterator_t; + + +/* Example of use: + * + * switch_hashtable_t *h; + * struct some_key *k; + * struct some_value *v; + * + * static unsigned int hash_from_key_fn( void *k ); + * static int keys_equal_fn ( void *key1, void *key2 ); + * + * h = create_hashtable(16, hash_from_key_fn, keys_equal_fn); + * k = (struct some_key *) malloc(sizeof(struct some_key)); + * v = (struct some_value *) malloc(sizeof(struct some_value)); + * + * (initialise k and v to suitable values) + * + * if (! hashtable_insert(h,k,v) ) + * { exit(-1); } + * + * if (NULL == (found = hashtable_search(h,k) )) + * { printf("not found!"); } + * + * if (NULL == (found = hashtable_remove(h,k) )) + * { printf("Not found\n"); } + * + */ + +/* Macros may be used to define type-safe(r) hashtable access functions, with + * methods specialized to take known key and value types as parameters. + * + * Example: + * + * Insert this at the start of your file: + * + * DEFINE_HASHTABLE_INSERT(insert_some, struct some_key, struct some_value); + * DEFINE_HASHTABLE_SEARCH(search_some, struct some_key, struct some_value); + * DEFINE_HASHTABLE_REMOVE(remove_some, struct some_key, struct some_value); + * + * This defines the functions 'insert_some', 'search_some' and 'remove_some'. + * These operate just like hashtable_insert etc., with the same parameters, + * but their function signatures have 'struct some_key *' rather than + * 'void *', and hence can generate compile time errors if your program is + * supplying incorrect data as a key (and similarly for value). + * + * Note that the hash and key equality functions passed to create_hashtable + * still take 'void *' parameters instead of 'some key *'. This shouldn't be + * a difficult issue as they're only defined and passed once, and the other + * functions will ensure that only valid keys are supplied to them. + * + * The cost for this checking is increased code size and runtime overhead + * - if performance is important, it may be worth switching back to the + * unsafe methods once your program has been debugged with the safe methods. + * This just requires switching to some simple alternative defines - eg: + * #define insert_some hashtable_insert + * + */ + +/***************************************************************************** + * create_hashtable + + * @name create_hashtable + * @param minsize minimum initial size of hashtable + * @param hashfunction function for hashing keys + * @param key_eq_fn function for determining key equality + * @return newly created hashtable or NULL on failure + */ + +SWITCH_DECLARE(switch_status_t) +switch_create_hashtable(switch_hashtable_t **hp, unsigned int minsize, + unsigned int (*hashfunction) (void*), + int (*key_eq_fn) (void*,void*)); + +/***************************************************************************** + * hashtable_insert + + * @name hashtable_insert + * @param h the hashtable to insert into + * @param k the key - hashtable claims ownership and will free on removal + * @param v the value - does not claim ownership + * @return non-zero for successful insertion + * + * This function will cause the table to expand if the insertion would take + * the ratio of entries to table size over the maximum load factor. + * + * This function does not check for repeated insertions with a duplicate key. + * The value returned when using a duplicate key is undefined -- when + * the hashtable changes size, the order of retrieval of duplicate key + * entries is reversed. + * If in doubt, remove before insert. + */ + + +typedef enum { + HASHTABLE_FLAG_NONE = 0, + HASHTABLE_FLAG_FREE_KEY = (1 << 0), + HASHTABLE_FLAG_FREE_VALUE = (1 << 1) +} hashtable_flag_t; + +SWITCH_DECLARE(int) +switch_hashtable_insert(switch_hashtable_t *h, void *k, void *v, hashtable_flag_t flags); + +#define DEFINE_HASHTABLE_INSERT(fnname, keytype, valuetype) \ + int fnname (switch_hashtable_t *h, keytype *k, valuetype *v) \ + { \ + return hashtable_insert(h,k,v); \ + } + +/***************************************************************************** + * hashtable_search + + * @name hashtable_search + * @param h the hashtable to search + * @param k the key to search for - does not claim ownership + * @return the value associated with the key, or NULL if none found + */ + +SWITCH_DECLARE(void *) +switch_hashtable_search(switch_hashtable_t *h, void *k); + +#define DEFINE_HASHTABLE_SEARCH(fnname, keytype, valuetype) \ + valuetype * fnname (switch_hashtable_t *h, keytype *k) \ + { \ + return (valuetype *) (hashtable_search(h,k)); \ + } + +/***************************************************************************** + * hashtable_remove + + * @name hashtable_remove + * @param h the hashtable to remove the item from + * @param k the key to search for - does not claim ownership + * @return the value associated with the key, or NULL if none found + */ + +SWITCH_DECLARE(void *) /* returns value */ +switch_hashtable_remove(switch_hashtable_t *h, void *k); + +#define DEFINE_HASHTABLE_REMOVE(fnname, keytype, valuetype) \ + valuetype * fnname (switch_hashtable_t *h, keytype *k) \ + { \ + return (valuetype *) (hashtable_remove(h,k)); \ + } + + +/***************************************************************************** + * hashtable_count + + * @name hashtable_count + * @param h the hashtable + * @return the number of items stored in the hashtable + */ +SWITCH_DECLARE(unsigned int) +switch_hashtable_count(switch_hashtable_t *h); + + +/***************************************************************************** + * hashtable_destroy + + * @name hashtable_destroy + * @param h the hashtable + * @param free_values whether to call 'free' on the remaining values + */ + +SWITCH_DECLARE(void) +switch_hashtable_destroy(switch_hashtable_t **h); + +SWITCH_DECLARE(switch_hashtable_iterator_t*) switch_hashtable_first(switch_hashtable_t *h); +SWITCH_DECLARE(switch_hashtable_iterator_t*) switch_hashtable_next(switch_hashtable_iterator_t *i); +SWITCH_DECLARE(void) switch_hashtable_this(switch_hashtable_iterator_t *i, const void **key, switch_ssize_t *klen, void **val); + +static inline int switch_hash_equalkeys(void *k1, void *k2) +{ + return strcmp((char *) k1, (char *) k2) ? 0 : 1; +} + +static inline uint32_t switch_hash_default(void *ky) +{ + unsigned char *str = (unsigned char *) ky; + uint32_t hash = 0; + int c; + + while ((c = *str)) { + str++; + hash = c + (hash << 6) + (hash << 16) - hash; + } + + return hash; +} + +static inline uint32_t switch_hash_default_ci(void *ky) +{ + unsigned char *str = (unsigned char *) ky; + uint32_t hash = 0; + int c; + + while ((c = switch_tolower(*str))) { + str++; + hash = c + (hash << 6) + (hash << 16) - hash; + } + + return hash; +} + + + + +#ifdef __cplusplus +} /* extern C */ +#endif + +#endif /* __HASHTABLE_CWC22_H__ */ + +/* + * Copyright (c) 2002, Christopher Clark + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * * Neither the name of the original author; nor the names of any contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER + * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet: + */ diff --git a/src/include/switch_types.h b/src/include/switch_types.h index 9dfe04b5eb..c373804c08 100644 --- a/src/include/switch_types.h +++ b/src/include/switch_types.h @@ -1013,6 +1013,7 @@ typedef enum { SWITCH_MESSAGE_ANSWER_EVENT, SWITCH_MESSAGE_PROGRESS_EVENT, SWITCH_MESSAGE_RING_EVENT, + SWITCH_MESSAGE_RESAMPLE_EVENT, SWITCH_MESSAGE_INVALID } switch_core_session_message_types_t; @@ -1407,6 +1408,7 @@ typedef enum { CF_VIDEO_PAUSE, CF_BYPASS_MEDIA_AFTER_HOLD, CF_HANGUP_HELD, + CF_CONFERENCE_RESET_MEDIA, /* WARNING: DO NOT ADD ANY FLAGS BELOW THIS LINE */ /* IF YOU ADD NEW ONES CHECK IF THEY SHOULD PERSIST OR ZERO THEM IN switch_core_session.c switch_core_session_request_xml() */ CF_FLAG_MAX @@ -2237,9 +2239,10 @@ typedef switch_xml_t(*switch_xml_search_function_t) (const char *section, const char *tag_name, const char *key_name, const char *key_value, switch_event_t *params, void *user_data); -typedef struct switch_hash switch_hash_t; -struct HashElem; -typedef struct HashElem switch_hash_index_t; +struct switch_hashtable; +struct switch_hashtable_iterator; +typedef struct switch_hashtable switch_hash_t; +typedef struct switch_hashtable_iterator switch_hash_index_t; struct switch_network_list; typedef struct switch_network_list switch_network_list_t; diff --git a/src/mod/.gitignore b/src/mod/.gitignore index d58ffe7245..319e1e6991 100644 --- a/src/mod/.gitignore +++ b/src/mod/.gitignore @@ -76,3 +76,6 @@ /timers/mod_posix_timer/Makefile /timers/mod_timerfd/Makefile /endpoints/mod_unicall/Makefile +*/*/Makefile.in +*/*/Makefile +*/*/mod_*.log diff --git a/src/mod/applications/.gitignore b/src/mod/applications/.gitignore new file mode 100644 index 0000000000..0913e98d0a --- /dev/null +++ b/src/mod/applications/.gitignore @@ -0,0 +1,3 @@ +*/Makefile.in +*/Makefile +*/mod_*.log diff --git a/src/mod/applications/mod_abstraction/Makefile b/src/mod/applications/mod_abstraction/Makefile deleted file mode 100644 index 53a1f3700f..0000000000 --- a/src/mod/applications/mod_abstraction/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -BASE=../../../.. -include $(BASE)/build/modmake.rules \ No newline at end of file diff --git a/src/mod/applications/mod_abstraction/Makefile.am b/src/mod/applications/mod_abstraction/Makefile.am new file mode 100644 index 0000000000..8ab961eeb2 --- /dev/null +++ b/src/mod/applications/mod_abstraction/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_abstraction + +mod_LTLIBRARIES = mod_abstraction.la +mod_abstraction_la_SOURCES = mod_abstraction.c +mod_abstraction_la_CFLAGS = $(AM_CFLAGS) +mod_abstraction_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_abstraction_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/applications/mod_avmd/Makefile b/src/mod/applications/mod_avmd/Makefile deleted file mode 100644 index c4a62d4120..0000000000 --- a/src/mod/applications/mod_avmd/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -BASE=../../../.. -MOD_CFLAGS= -O2 -#MOD_CFLAGS= -march=core2 -g -O2 -malign-double -mtune=core2 -mmmx -msse -msse2 -msse3 -mssse3 -mfpmath=sse -ffast-math -funroll-loops -fprefetch-loop-arrays -funit-at-a-time -ftracer --save-temps -#MOD_LDFLAGS= --save-temps -LOCAL_SOURCES=amplitude.c buffer.c desa2.c goertzel.c fast_acosf.c -LOCAL_OBJS=amplitude.o buffer.o desa2.o goertzel.o fast_acosf.o -include $(BASE)/build/modmake.rules - -#compute_table: compute_table.o -# gcc -o compute_table compute_table.o -lm -# -#compute_table.o: compute_table.c -# gcc -c compute_table.c -# - diff --git a/src/mod/applications/mod_avmd/Makefile.am b/src/mod/applications/mod_avmd/Makefile.am new file mode 100644 index 0000000000..0387fee18f --- /dev/null +++ b/src/mod/applications/mod_avmd/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_avmd + +mod_LTLIBRARIES = mod_avmd.la +mod_avmd_la_SOURCES = mod_avmd.c amplitude.c buffer.c desa2.c goertzel.c fast_acosf.c +mod_avmd_la_CFLAGS = $(AM_CFLAGS) +mod_avmd_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_avmd_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/applications/mod_blacklist/Makefile.am b/src/mod/applications/mod_blacklist/Makefile.am new file mode 100644 index 0000000000..9a3de4c1a8 --- /dev/null +++ b/src/mod/applications/mod_blacklist/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_blacklist + +mod_LTLIBRARIES = mod_blacklist.la +mod_blacklist_la_SOURCES = mod_blacklist.c +mod_blacklist_la_CFLAGS = $(AM_CFLAGS) +mod_blacklist_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_blacklist_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/applications/mod_blacklist/mod_blacklist.c b/src/mod/applications/mod_blacklist/mod_blacklist.c index 850be619af..f1a5b72a48 100644 --- a/src/mod/applications/mod_blacklist/mod_blacklist.c +++ b/src/mod/applications/mod_blacklist/mod_blacklist.c @@ -63,7 +63,7 @@ blacklist_t *blacklist_create(const char *name) switch_assert(bl); bl->pool = pool; - switch_core_hash_init(&bl->list, pool); + switch_core_hash_init(&bl->list); switch_mutex_init(&bl->list_mutex, SWITCH_MUTEX_NESTED, pool); return bl; @@ -126,10 +126,10 @@ static switch_status_t do_config(switch_bool_t reload) switch_mutex_lock(globals.lists_mutex); /* Destroy any active lists */ - while ((hi = switch_hash_first(NULL, globals.lists))) { + while ((hi = switch_core_hash_first( globals.lists))) { const void *key; void *val; - switch_hash_this(hi, &key, NULL, &val); + switch_core_hash_this(hi, &key, NULL, &val); blacklist_free((blacklist_t*)val); switch_core_hash_delete(globals.lists, (const char*)key); } @@ -282,8 +282,8 @@ SWITCH_STANDARD_API(blacklist_api_function) switch_mutex_lock(globals.lists_mutex); if (switch_file_open(&fd, filename, SWITCH_FOPEN_WRITE | SWITCH_FOPEN_TRUNCATE | SWITCH_FOPEN_CREATE, SWITCH_FPROT_OS_DEFAULT, globals.pool) == SWITCH_STATUS_SUCCESS) { - for (hi = switch_hash_first(NULL, bl->list); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, &var, NULL, &val); + for (hi = switch_core_hash_first( bl->list); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, &var, NULL, &val); switch_file_printf(fd, "%s\n", (char *)var); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "adding %s to the dump file\n", (char *)var); } @@ -317,10 +317,10 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_blacklist_load) memset(&globals, 0, sizeof(globals)); globals.pool = pool; - switch_core_hash_init(&globals.files, globals.pool); + switch_core_hash_init(&globals.files); switch_mutex_init(&globals.files_mutex, SWITCH_MUTEX_NESTED, globals.pool); - switch_core_hash_init(&globals.lists, globals.pool); + switch_core_hash_init(&globals.lists); switch_mutex_init(&globals.lists_mutex, SWITCH_MUTEX_NESTED, globals.pool); do_config(SWITCH_FALSE); diff --git a/src/mod/applications/mod_callcenter/Makefile b/src/mod/applications/mod_callcenter/Makefile deleted file mode 100644 index 53a1f3700f..0000000000 --- a/src/mod/applications/mod_callcenter/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -BASE=../../../.. -include $(BASE)/build/modmake.rules \ No newline at end of file diff --git a/src/mod/applications/mod_callcenter/Makefile.am b/src/mod/applications/mod_callcenter/Makefile.am new file mode 100644 index 0000000000..313a440d39 --- /dev/null +++ b/src/mod/applications/mod_callcenter/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_callcenter + +mod_LTLIBRARIES = mod_callcenter.la +mod_callcenter_la_SOURCES = mod_callcenter.c +mod_callcenter_la_CFLAGS = $(AM_CFLAGS) +mod_callcenter_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_callcenter_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/applications/mod_callcenter/mod_callcenter.c b/src/mod/applications/mod_callcenter/mod_callcenter.c index 3a357a10d9..44a675addb 100644 --- a/src/mod/applications/mod_callcenter/mod_callcenter.c +++ b/src/mod/applications/mod_callcenter/mod_callcenter.c @@ -3198,12 +3198,12 @@ SWITCH_STANDARD_API(cc_config_api_function) switch_hash_index_t *hi; stream->write_function(stream, "%s", "name|strategy|moh_sound|time_base_score|tier_rules_apply|tier_rule_wait_second|tier_rule_wait_multiply_level|tier_rule_no_agent_no_wait|discard_abandoned_after|abandoned_resume_allowed|max_wait_time|max_wait_time_with_no_agent|max_wait_time_with_no_agent_time_reached|record_template\n"); switch_mutex_lock(globals.mutex); - for (hi = switch_hash_first(NULL, globals.queue_hash); hi; hi = switch_hash_next(hi)) { + for (hi = switch_core_hash_first( globals.queue_hash); hi; hi = switch_core_hash_next(hi)) { void *val = NULL; const void *key; switch_ssize_t keylen; cc_queue_t *queue; - switch_hash_this(hi, &key, &keylen, &val); + switch_core_hash_this(hi, &key, &keylen, &val); queue = (cc_queue_t *) val; stream->write_function(stream, "%s|%s|%s|%s|%s|%d|%s|%s|%d|%s|%d|%d|%d|%s\n", queue->name, queue->strategy, queue->moh, queue->time_base_score, (queue->tier_rules_apply?"true":"false"), queue->tier_rule_wait_second, (queue->tier_rule_wait_multiply_level?"true":"false"), (queue->tier_rule_no_agent_no_wait?"true":"false"), queue->discard_abandoned_after, (queue->abandoned_resume_allowed?"true":"false"), queue->max_wait_time, queue->max_wait_time_with_no_agent, queue->max_wait_time_with_no_agent_time_reached, queue->record_template); queue = NULL; @@ -3251,7 +3251,7 @@ SWITCH_STANDARD_API(cc_config_api_function) switch_hash_index_t *hi; int queue_count = 0; switch_mutex_lock(globals.mutex); - for (hi = switch_hash_first(NULL, globals.queue_hash); hi; hi = switch_hash_next(hi)) { + for (hi = switch_core_hash_first( globals.queue_hash); hi; hi = switch_core_hash_next(hi)) { queue_count++; } switch_mutex_unlock(globals.mutex); @@ -3309,7 +3309,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_callcenter_load) memset(&globals, 0, sizeof(globals)); globals.pool = pool; - switch_core_hash_init(&globals.queue_hash, globals.pool); + switch_core_hash_init(&globals.queue_hash); switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, globals.pool); if ((status = load_config()) != SWITCH_STATUS_SUCCESS) { @@ -3394,8 +3394,8 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_callcenter_shutdown) } switch_mutex_lock(globals.mutex); - while ((hi = switch_hash_first(NULL, globals.queue_hash))) { - switch_hash_this(hi, &key, &keylen, &val); + while ((hi = switch_core_hash_first( globals.queue_hash))) { + switch_core_hash_this(hi, &key, &keylen, &val); queue = (cc_queue_t *) val; switch_core_hash_delete(globals.queue_hash, queue->name); diff --git a/src/mod/applications/mod_cidlookup/Makefile b/src/mod/applications/mod_cidlookup/Makefile deleted file mode 100644 index 24790d0d39..0000000000 --- a/src/mod/applications/mod_cidlookup/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -BASE=../../../.. -include $(BASE)/build/modmake.rules - diff --git a/src/mod/applications/mod_cidlookup/Makefile.am b/src/mod/applications/mod_cidlookup/Makefile.am new file mode 100644 index 0000000000..c908e2717a --- /dev/null +++ b/src/mod/applications/mod_cidlookup/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_cidlookup + +mod_LTLIBRARIES = mod_cidlookup.la +mod_cidlookup_la_SOURCES = mod_cidlookup.c +mod_cidlookup_la_CFLAGS = $(AM_CFLAGS) +mod_cidlookup_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_cidlookup_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/applications/mod_cluechoo/Makefile b/src/mod/applications/mod_cluechoo/Makefile deleted file mode 100644 index d96278fdcd..0000000000 --- a/src/mod/applications/mod_cluechoo/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -LOCAL_LDFLAGS=-lncurses -BASE=../../../.. -include $(BASE)/build/modmake.rules diff --git a/src/mod/applications/mod_cluechoo/Makefile.am b/src/mod/applications/mod_cluechoo/Makefile.am new file mode 100644 index 0000000000..4c71aa5611 --- /dev/null +++ b/src/mod/applications/mod_cluechoo/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_cluechoo + +mod_LTLIBRARIES = mod_cluechoo.la +mod_cluechoo_la_SOURCES = mod_cluechoo.c +mod_cluechoo_la_CFLAGS = $(AM_CFLAGS) +mod_cluechoo_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_cluechoo_la_LDFLAGS = -avoid-version -module -no-undefined -shared -lncurses diff --git a/src/mod/applications/mod_commands/Makefile.am b/src/mod/applications/mod_commands/Makefile.am new file mode 100644 index 0000000000..82cfe69a4d --- /dev/null +++ b/src/mod/applications/mod_commands/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_commands + +mod_LTLIBRARIES = mod_commands.la +mod_commands_la_SOURCES = mod_commands.c +mod_commands_la_CFLAGS = $(AM_CFLAGS) +mod_commands_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_commands_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/applications/mod_conference/Makefile.am b/src/mod/applications/mod_conference/Makefile.am new file mode 100644 index 0000000000..b0ffced6f5 --- /dev/null +++ b/src/mod/applications/mod_conference/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_conference + +mod_LTLIBRARIES = mod_conference.la +mod_conference_la_SOURCES = mod_conference.c +mod_conference_la_CFLAGS = $(AM_CFLAGS) +mod_conference_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_conference_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c index 9c6c2419d9..f94547b7e9 100644 --- a/src/mod/applications/mod_conference/mod_conference.c +++ b/src/mod/applications/mod_conference/mod_conference.c @@ -485,6 +485,7 @@ struct conference_member { switch_thread_t *input_thread; cJSON *json; cJSON *status_field; + uint8_t loop_loop; }; typedef enum { @@ -3659,7 +3660,7 @@ static void *SWITCH_THREAD_FUNC conference_loop_input(switch_thread_t *thread, v switch_frame_t *read_frame = NULL; uint32_t hangover = 40, hangunder = 5, hangover_hits = 0, hangunder_hits = 0, diff_level = 400; switch_core_session_t *session = member->session; - uint32_t flush_len; + uint32_t flush_len, loops = 0; if (switch_core_session_read_lock(session) != SWITCH_STATUS_SUCCESS) { goto end; @@ -3922,6 +3923,21 @@ static void *SWITCH_THREAD_FUNC conference_loop_input(switch_thread_t *thread, v member->last_score = member->score; } + loops++; + + if (switch_channel_test_flag(member->channel, CF_CONFERENCE_RESET_MEDIA)) { + switch_channel_clear_flag(member->channel, CF_CONFERENCE_RESET_MEDIA); + + if (loops > 500) { + member->loop_loop = 1; + + if (setup_media(member, member->conference)) { + break; + } + } + + } + /* skip frames that are not actual media or when we are muted or silent */ if ((switch_test_flag(member, MFLAG_TALKING) || member->energy_level == 0 || switch_test_flag(member->conference, CFLAG_AUDIO_ALWAYS)) && switch_test_flag(member, MFLAG_CAN_SPEAK) && !switch_test_flag(member->conference, CFLAG_WAIT_MOD) @@ -4072,7 +4088,7 @@ static void launch_conference_loop_input(conference_member_t *member, switch_mem { switch_threadattr_t *thd_attr = NULL; - if (member == NULL) + if (member == NULL || member->input_thread) return; switch_threadattr_create(&thd_attr, pool); @@ -4116,7 +4132,7 @@ static void conference_loop_output(conference_member_t *member) call_list = NULL; cp = NULL; - + member->loop_loop = 0; switch_assert(member->conference != NULL); @@ -4229,7 +4245,7 @@ static void conference_loop_output(conference_member_t *member) /* Fair WARNING, If you expect the caller to hear anything or for digit handling to be processed, */ /* you better not block this thread loop for more than the duration of member->conference->timer_name! */ - while (switch_test_flag(member, MFLAG_RUNNING) && switch_test_flag(member, MFLAG_ITHREAD) + while (!member->loop_loop && switch_test_flag(member, MFLAG_RUNNING) && switch_test_flag(member, MFLAG_ITHREAD) && switch_channel_ready(channel)) { switch_event_t *event; int use_timer = 0; @@ -4429,15 +4445,21 @@ static void conference_loop_output(conference_member_t *member) end: - switch_clear_flag_locked(member, MFLAG_RUNNING); + if (!member->loop_loop) { + switch_clear_flag_locked(member, MFLAG_RUNNING); - /* Wait for the input thread to end */ - if (member->input_thread) { - switch_thread_join(&st, member->input_thread); + /* Wait for the input thread to end */ + if (member->input_thread) { + switch_thread_join(&st, member->input_thread); + } } switch_core_timer_destroy(&timer); + if (member->loop_loop) { + return; + } + switch_log_printf(SWITCH_CHANNEL_CHANNEL_LOG(channel), SWITCH_LOG_DEBUG, "Channel leaving conference, cause: %s\n", switch_channel_cause2str(switch_channel_get_cause(channel))); @@ -5256,8 +5278,8 @@ static switch_status_t list_conferences(const char *line, const char *cursor, sw const void *vvar; switch_mutex_lock(globals.hash_mutex); - for (hi = switch_hash_first(NULL, globals.conference_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, &vvar, NULL, &val); + for (hi = switch_core_hash_first( globals.conference_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, &vvar, NULL, &val); switch_console_push_match(&my_matches, (const char *) vvar); } switch_mutex_unlock(globals.hash_mutex); @@ -5748,9 +5770,9 @@ static switch_status_t conf_api_sub_list(conference_obj_t *conference, switch_st if (conference == NULL) { switch_mutex_lock(globals.hash_mutex); - for (hi = switch_hash_first(NULL, globals.conference_hash); hi; hi = switch_hash_next(hi)) { + for (hi = switch_core_hash_first( globals.conference_hash); hi; hi = switch_core_hash_next(hi)) { int fcount = 0; - switch_hash_this(hi, NULL, NULL, &val); + switch_core_hash_this(hi, NULL, NULL, &val); conference = (conference_obj_t *) val; stream->write_function(stream, "Conference %s (%u member%s rate: %u%s flags: ", @@ -6227,8 +6249,8 @@ static switch_status_t conf_api_sub_xml_list(conference_obj_t *conference, switc if (conference == NULL) { switch_mutex_lock(globals.hash_mutex); - for (hi = switch_hash_first(NULL, globals.conference_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, NULL, NULL, &val); + for (hi = switch_core_hash_first( globals.conference_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, NULL, NULL, &val); conference = (conference_obj_t *) val; x_conference = switch_xml_add_child_d(x_conferences, "conference", off++); @@ -7037,8 +7059,6 @@ static switch_status_t conf_api_sub_file_vol(conference_obj_t *conference, switc } } - printf("WTF %p %p\n", (void *) conference, (void *) fnode); - if (fnode && fnode->type == NODE_TYPE_FILE) { fnode->fh.vol = vol; ok = 1; @@ -8006,10 +8026,14 @@ static int setup_media(conference_member_t *member, conference_obj_t *conference switch_codec_implementation_t read_impl = { 0 }; switch_core_session_get_read_impl(member->session, &read_impl); - switch_core_session_reset(member->session, SWITCH_TRUE, SWITCH_FALSE); - if (switch_core_codec_ready(&member->read_codec)) { switch_core_codec_destroy(&member->read_codec); + memset(&member->read_codec, 0, sizeof(member->read_codec)); + } + + if (switch_core_codec_ready(&member->write_codec)) { + switch_core_codec_destroy(&member->write_codec); + memset(&member->write_codec, 0, sizeof(member->write_codec)); } if (member->read_resampler) { @@ -8640,7 +8664,10 @@ SWITCH_STANDARD_APP(conference_function) switch_core_session_receive_message(session, &msg); /* Run the conference loop */ - conference_loop_output(&member); + do { + conference_loop_output(&member); + } while (member.loop_loop); + switch_channel_set_private(channel, "_conference_autocall_list_", NULL); /* Tell the channel we are no longer going to be in a bridge */ @@ -10023,7 +10050,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_conference_load) globals.conference_pool = pool; /* Setup a hash to store conferences by name */ - switch_core_hash_init(&globals.conference_hash, globals.conference_pool); + switch_core_hash_init(&globals.conference_hash); switch_mutex_init(&globals.conference_mutex, SWITCH_MUTEX_NESTED, globals.conference_pool); switch_mutex_init(&globals.id_mutex, SWITCH_MUTEX_NESTED, globals.conference_pool); switch_mutex_init(&globals.hash_mutex, SWITCH_MUTEX_NESTED, globals.conference_pool); diff --git a/src/mod/applications/mod_curl/Makefile b/src/mod/applications/mod_curl/Makefile deleted file mode 100644 index 6cae5a8595..0000000000 --- a/src/mod/applications/mod_curl/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -json-c=json-c-0.9 -BASE=../../../.. - -JSON_DIR=$(switch_srcdir)/libs/$(json-c) -JSON_BUILDDIR=$(switch_builddir)/libs/$(json-c) - -JSONLA=$(JSON_BUILDDIR)/libjson.la - -LOCAL_CFLAGS=-I$(JSON_DIR) -LOCAL_LIBADD=$(JSONLA) - -include $(BASE)/build/modmake.rules - -$(JSON_DIR): - $(GETLIB) $(json-c).tar.gz - -$(JSON_BUILDDIR)/Makefile: $(JSON_DIR) - mkdir -p $(JSON_BUILDDIR) - cd $(JSON_BUILDDIR) && $(DEFAULT_VARS) $(JSON_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(JSON_DIR) CPPFLAGS= LDFLAGS= - $(TOUCH_TARGET) - -$(JSONLA): $(JSON_BUILDDIR)/Makefile - cd $(JSON_BUILDDIR) && $(MAKE) - $(TOUCH_TARGET) diff --git a/src/mod/applications/mod_curl/Makefile.am b/src/mod/applications/mod_curl/Makefile.am new file mode 100644 index 0000000000..6e0debb65f --- /dev/null +++ b/src/mod/applications/mod_curl/Makefile.am @@ -0,0 +1,32 @@ +include $(top_srcdir)/build/modmake.rulesam + +AUTOMAKE_OPTIONS += foreign +MODNAME=mod_curl + +JSON_C=json-c-0.9 +JSON_DIR=$(switch_srcdir)/libs/$(JSON_C) +JSON_BUILDDIR=$(switch_builddir)/libs/$(JSON_C) +JSONLA=$(JSON_BUILDDIR)/libjson.la + +mod_LTLIBRARIES = mod_curl.la +mod_curl_la_SOURCES = mod_curl.c +mod_curl_la_CFLAGS = $(AM_CFLAGS) -I$(JSON_DIR) +mod_curl_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(JSONLA) +mod_curl_la_LDFLAGS = -avoid-version -module -no-undefined -shared + +BUILT_SOURCES=$(JSONLA) + +$(JSON_DIR): + $(GETLIB) $(JSON_C).tar.gz + +$(JSON_BUILDDIR)/Makefile: $(JSON_DIR) + mkdir -p $(JSON_BUILDDIR) + cd $(JSON_BUILDDIR) && $(DEFAULT_VARS) $(JSON_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(JSON_DIR) CPPFLAGS= LDFLAGS= + $(TOUCH_TARGET) + +$(JSONLA): $(JSON_BUILDDIR)/Makefile + cd $(JSON_BUILDDIR) && $(MAKE) + $(TOUCH_TARGET) + + + diff --git a/src/mod/applications/mod_db/Makefile.am b/src/mod/applications/mod_db/Makefile.am new file mode 100644 index 0000000000..5cd653cccf --- /dev/null +++ b/src/mod/applications/mod_db/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_db + +mod_LTLIBRARIES = mod_db.la +mod_db_la_SOURCES = mod_db.c +mod_db_la_CFLAGS = $(AM_CFLAGS) +mod_db_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_db_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/applications/mod_db/mod_db.c b/src/mod/applications/mod_db/mod_db.c index 46eee6b36d..0a5e9fe61d 100644 --- a/src/mod/applications/mod_db/mod_db.c +++ b/src/mod/applications/mod_db/mod_db.c @@ -652,7 +652,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_db_load) switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, globals.pool); switch_mutex_init(&globals.db_hash_mutex, SWITCH_MUTEX_NESTED, globals.pool); - switch_core_hash_init(&globals.db_hash, pool); + switch_core_hash_init(&globals.db_hash); status = switch_event_reserve_subclass(LIMIT_EVENT_USAGE); if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_INUSE) { diff --git a/src/mod/applications/mod_directory/Makefile b/src/mod/applications/mod_directory/Makefile deleted file mode 100644 index 53a1f3700f..0000000000 --- a/src/mod/applications/mod_directory/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -BASE=../../../.. -include $(BASE)/build/modmake.rules \ No newline at end of file diff --git a/src/mod/applications/mod_directory/Makefile.am b/src/mod/applications/mod_directory/Makefile.am new file mode 100644 index 0000000000..81b61d9b8f --- /dev/null +++ b/src/mod/applications/mod_directory/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_directory + +mod_LTLIBRARIES = mod_directory.la +mod_directory_la_SOURCES = mod_directory.c +mod_directory_la_CFLAGS = $(AM_CFLAGS) +mod_directory_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_directory_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/applications/mod_directory/mod_directory.c b/src/mod/applications/mod_directory/mod_directory.c index 22768bcf5f..5a1d056881 100644 --- a/src/mod/applications/mod_directory/mod_directory.c +++ b/src/mod/applications/mod_directory/mod_directory.c @@ -1038,7 +1038,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_directory_load) memset(&globals, 0, sizeof(globals)); globals.pool = pool; - switch_core_hash_init(&globals.profile_hash, globals.pool); + switch_core_hash_init(&globals.profile_hash); switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, globals.pool); if ((status = load_config(SWITCH_FALSE)) != SWITCH_STATUS_SUCCESS) { @@ -1070,8 +1070,8 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_directory_shutdown) switch_mutex_lock(globals.mutex); - while ((hi = switch_hash_first(NULL, globals.profile_hash))) { - switch_hash_this(hi, &key, &keylen, &val); + while ((hi = switch_core_hash_first( globals.profile_hash))) { + switch_core_hash_this(hi, &key, &keylen, &val); profile = (dir_profile_t *) val; switch_core_hash_delete(globals.profile_hash, profile->name); diff --git a/src/mod/applications/mod_distributor/Makefile.am b/src/mod/applications/mod_distributor/Makefile.am new file mode 100644 index 0000000000..338a24a1d3 --- /dev/null +++ b/src/mod/applications/mod_distributor/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_distributor + +mod_LTLIBRARIES = mod_distributor.la +mod_distributor_la_SOURCES = mod_distributor.c +mod_distributor_la_CFLAGS = $(AM_CFLAGS) +mod_distributor_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_distributor_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/applications/mod_dptools/Makefile.am b/src/mod/applications/mod_dptools/Makefile.am new file mode 100644 index 0000000000..8729f8a8b1 --- /dev/null +++ b/src/mod/applications/mod_dptools/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_dptools + +mod_LTLIBRARIES = mod_dptools.la +mod_dptools_la_SOURCES = mod_dptools.c +mod_dptools_la_CFLAGS = $(AM_CFLAGS) +mod_dptools_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_dptools_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/applications/mod_dptools/mod_dptools.c b/src/mod/applications/mod_dptools/mod_dptools.c old mode 100755 new mode 100644 index 2311633c55..6dabb403b6 --- a/src/mod/applications/mod_dptools/mod_dptools.c +++ b/src/mod/applications/mod_dptools/mod_dptools.c @@ -5591,9 +5591,9 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_dptools_load) switch_file_interface_t *file_interface; globals.pool = pool; - switch_core_hash_init(&globals.pickup_hash, globals.pool); + switch_core_hash_init(&globals.pickup_hash); switch_mutex_init(&globals.pickup_mutex, SWITCH_MUTEX_NESTED, globals.pool); - switch_core_hash_init(&globals.mutex_hash, globals.pool); + switch_core_hash_init(&globals.mutex_hash); switch_mutex_init(&globals.mutex_mutex, SWITCH_MUTEX_NESTED, globals.pool); /* connect my internal structure to the blank pointer passed to me */ diff --git a/src/mod/applications/mod_easyroute/Makefile.am b/src/mod/applications/mod_easyroute/Makefile.am new file mode 100644 index 0000000000..c82c696920 --- /dev/null +++ b/src/mod/applications/mod_easyroute/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_easyroute + +mod_LTLIBRARIES = mod_easyroute.la +mod_easyroute_la_SOURCES = mod_easyroute.c +mod_easyroute_la_CFLAGS = $(AM_CFLAGS) +mod_easyroute_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_easyroute_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/applications/mod_enum/Makefile b/src/mod/applications/mod_enum/Makefile deleted file mode 100644 index 638990607e..0000000000 --- a/src/mod/applications/mod_enum/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -BASE=../../../.. - -LDNS=ldns - -LDNS_DIR=$(switch_srcdir)/libs/$(LDNS) -LDNS_BUILDDIR=$(switch_builddir)/libs/$(LDNS) -LOCAL_CFLAGS=-I$(LDNS_DIR) -I$(LDNS_DIR)/include -LDNS_LA=$(LDNS_BUILDDIR)/libldns.la -LOCAL_LIBADD=$(LDNS_LA) -include $(BASE)/build/modmake.rules - -$(LDNS_BUILDDIR)/Makefile: $(LDNS_DIR)/Makefile.in - mkdir -p $(LDNS_BUILDDIR) - cd $(LDNS_BUILDDIR) && $(DEFAULT_VARS) $(LDNS_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(LDNS_DIR) --disable-gost --without-ssl --disable-sha2 - $(TOUCH_TARGET) - -$(LDNS_LA): $(LDNS_BUILDDIR)/Makefile - cd $(LDNS_BUILDDIR) && $(MAKE) - $(TOUCH_TARGET) - -$(MODNAME).lo: $(LDNS_LA) diff --git a/src/mod/applications/mod_enum/Makefile.am b/src/mod/applications/mod_enum/Makefile.am new file mode 100644 index 0000000000..648cc6fcc6 --- /dev/null +++ b/src/mod/applications/mod_enum/Makefile.am @@ -0,0 +1,24 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_enum + +LDNS=ldns +LDNS_DIR=$(switch_srcdir)/libs/$(LDNS) +LDNS_BUILDDIR=$(switch_builddir)/libs/$(LDNS) +LDNS_LA=$(LDNS_BUILDDIR)/libldns.la + +mod_LTLIBRARIES = mod_enum.la +mod_enum_la_SOURCES = mod_enum.c +mod_enum_la_CFLAGS = $(AM_CFLAGS) -I$(LDNS_DIR) -I$(LDNS_DIR)/include +mod_enum_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(LDNS_LA) +mod_enum_la_LDFLAGS = -avoid-version -module -no-undefined -shared + +BUILT_SOURCES=$(LDNS_BUILDDIR)/ldns/util.h + +$(LDNS_BUILDDIR)/ldns/util.h $(LDNS_BUILDDIR)/Makefile: $(LDNS_DIR)/Makefile.in + mkdir -p $(LDNS_BUILDDIR) + cd $(LDNS_BUILDDIR) && $(DEFAULT_VARS) $(LDNS_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(LDNS_DIR) --disable-gost --without-ssl --disable-sha2 --disable-shared --with-pic + $(TOUCH_TARGET) + +$(LDNS_LA): $(LDNS_BUILDDIR)/Makefile + cd $(LDNS_BUILDDIR) && $(MAKE) + $(TOUCH_TARGET) diff --git a/src/mod/applications/mod_esf/Makefile b/src/mod/applications/mod_esf/Makefile deleted file mode 100644 index 2c35e6e98f..0000000000 --- a/src/mod/applications/mod_esf/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -BASE=../../../.. -include $(BASE)/build/modmake.rules diff --git a/src/mod/applications/mod_esf/Makefile.am b/src/mod/applications/mod_esf/Makefile.am new file mode 100644 index 0000000000..e1eb52df3d --- /dev/null +++ b/src/mod/applications/mod_esf/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_esf + +mod_LTLIBRARIES = mod_esf.la +mod_esf_la_SOURCES = mod_esf.c +mod_esf_la_CFLAGS = $(AM_CFLAGS) +mod_esf_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_esf_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/applications/mod_esl/Makefile b/src/mod/applications/mod_esl/Makefile deleted file mode 100644 index cbdd686149..0000000000 --- a/src/mod/applications/mod_esl/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -BASE=../../../.. - -ESL_DIR = $(switch_srcdir)/libs/esl - -LOCAL_OBJS=$(ESL_DIR)/libesl.a -LOCAL_CFLAGS=-I$(ESL_DIR)/src/include - -include $(BASE)/build/modmake.rules - -$(ESL_DIR)/libesl.a: $(ESL_DIR)/Makefile - cd $(ESL_DIR) && $(MAKE) -j1 diff --git a/src/mod/applications/mod_esl/Makefile.am b/src/mod/applications/mod_esl/Makefile.am new file mode 100644 index 0000000000..dea233f1eb --- /dev/null +++ b/src/mod/applications/mod_esl/Makefile.am @@ -0,0 +1,13 @@ +include $(top_srcdir)/build/modmake.rulesam + +MODNAME=mod_esl +ESL_DIR = $(switch_srcdir)/libs/esl + +mod_LTLIBRARIES = mod_esl.la +mod_esl_la_SOURCES = mod_esl.c +mod_esl_la_CFLAGS = $(AM_CFLAGS) -I$(ESL_DIR)/src/include +mod_esl_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(ESL_DIR)/libesl.a +mod_esl_la_LDFLAGS = -avoid-version -module -no-undefined -shared + +$(ESL_DIR)/libesl.a: $(ESL_DIR)/Makefile + cd $(ESL_DIR) && $(MAKE) -j1 diff --git a/src/mod/applications/mod_fifo/Makefile.am b/src/mod/applications/mod_fifo/Makefile.am new file mode 100644 index 0000000000..ef239c8c48 --- /dev/null +++ b/src/mod/applications/mod_fifo/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_fifo + +mod_LTLIBRARIES = mod_fifo.la +mod_fifo_la_SOURCES = mod_fifo.c +mod_fifo_la_CFLAGS = $(AM_CFLAGS) +mod_fifo_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_fifo_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/applications/mod_fifo/mod_fifo.c b/src/mod/applications/mod_fifo/mod_fifo.c index 7408c74444..e5eb2bf4f5 100644 --- a/src/mod/applications/mod_fifo/mod_fifo.c +++ b/src/mod/applications/mod_fifo/mod_fifo.c @@ -660,7 +660,7 @@ static void fifo_init_use_count(void) if (globals.use_hash) { switch_core_hash_destroy(&globals.use_hash); } - switch_core_hash_init(&globals.use_hash, globals.pool); + switch_core_hash_init(&globals.use_hash); switch_mutex_unlock(globals.use_mutex); } @@ -935,7 +935,7 @@ static fifo_node_t *create_node(const char *name, uint32_t importance, switch_mu switch_assert(node->fifo_list[x]); } - switch_core_hash_init(&node->consumer_hash, node->pool); + switch_core_hash_init(&node->consumer_hash); switch_thread_rwlock_create(&node->rwlock, node->pool); switch_mutex_init(&node->mutex, SWITCH_MUTEX_NESTED, node->pool); switch_mutex_init(&node->update_mutex, SWITCH_MUTEX_NESTED, node->pool); @@ -975,8 +975,8 @@ static int node_idle_consumers(fifo_node_t *node) int total = 0; switch_mutex_lock(node->mutex); - for (hi = switch_hash_first(NULL, node->consumer_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, &var, NULL, &val); + for (hi = switch_core_hash_first( node->consumer_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, &var, NULL, &val); session = (switch_core_session_t *) val; channel = switch_core_session_get_channel(session); if (!switch_channel_test_flag(channel, CF_BRIDGED)) { @@ -3802,14 +3802,14 @@ static int xml_hash(switch_xml_t xml, switch_hash_t *hash, char *container, char x_tmp = switch_xml_add_child_d(xml, container, cc_off++); switch_assert(x_tmp); - for (hi = switch_hash_first(NULL, hash); hi; hi = switch_hash_next(hi)) { + for (hi = switch_core_hash_first( hash); hi; hi = switch_core_hash_next(hi)) { int c_off = 0, d_off = 0; const char *status; const char *ts; char url_buf[512] = ""; char *encoded; - switch_hash_this(hi, &var, NULL, &val); + switch_core_hash_this(hi, &var, NULL, &val); session = (switch_core_session_t *) val; channel = switch_core_session_get_channel(session); x_caller = switch_xml_add_child_d(x_tmp, tag, c_off++); @@ -3987,8 +3987,8 @@ void dump_hash(switch_hash_t *hash, switch_stream_handle_t *stream) const void *var; switch_mutex_lock(globals.mutex); - for (hi = switch_hash_first(NULL, hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, &var, NULL, &val); + for (hi = switch_core_hash_first( hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, &var, NULL, &val); stream->write_function(stream, " %s\n", (char *)var); } switch_mutex_unlock(globals.mutex); @@ -4002,8 +4002,8 @@ void node_dump(switch_stream_handle_t *stream) fifo_node_t *node; void *val; switch_mutex_lock(globals.mutex); - for (hi = switch_hash_first(NULL, globals.fifo_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, NULL, NULL, &val); + for (hi = switch_core_hash_first( globals.fifo_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, NULL, NULL, &val); if ((node = (fifo_node_t *) val)) { stream->write_function(stream, "node: %s\n" " outbound_name: %s\n" @@ -4100,8 +4100,8 @@ SWITCH_STANDARD_API(fifo_api_function) switch_assert(x_report); if (argc < 2) { - for (hi = switch_hash_first(NULL, globals.fifo_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, &var, NULL, &val); + for (hi = switch_core_hash_first( globals.fifo_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, &var, NULL, &val); node = (fifo_node_t *) val; switch_mutex_lock(node->mutex); @@ -4137,8 +4137,8 @@ SWITCH_STANDARD_API(fifo_api_function) } } else if (!strcasecmp(argv[0], "count")) { if (argc < 2) { - for (hi = switch_hash_first(NULL, globals.fifo_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, &var, NULL, &val); + for (hi = switch_core_hash_first( globals.fifo_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, &var, NULL, &val); node = (fifo_node_t *) val; switch_mutex_lock(node->update_mutex); stream->write_function(stream, "%s:%d:%d:%d:%d:%d\n", (char *) var, node->consumer_count, node_caller_count(node), node->member_count, node->ring_consumer_count, node_idle_consumers(node)); @@ -4158,8 +4158,8 @@ SWITCH_STANDARD_API(fifo_api_function) } } else if (!strcasecmp(argv[0], "has_outbound")) { if (argc < 2) { - for (hi = switch_hash_first(NULL, globals.fifo_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, &var, NULL, &val); + for (hi = switch_core_hash_first( globals.fifo_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, &var, NULL, &val); node = (fifo_node_t *) val; switch_mutex_lock(node->update_mutex); stream->write_function(stream, "%s:%d\n", (char *) var, node->has_outbound); @@ -4359,8 +4359,8 @@ static switch_status_t load_config(int reload, int del_all) fifo_node_t *node; void *val; switch_mutex_lock(globals.mutex); - for (hi = switch_hash_first(NULL, globals.fifo_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, NULL, NULL, &val); + for (hi = switch_core_hash_first( globals.fifo_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, NULL, NULL, &val); if ((node = (fifo_node_t *) val) && node->is_static && node->ready == 1) { node->ready = -1; } @@ -4775,12 +4775,12 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_fifo_load) } globals.pool = pool; - switch_core_hash_init(&globals.fifo_hash, globals.pool); + switch_core_hash_init(&globals.fifo_hash); - switch_core_hash_init(&globals.caller_orig_hash, globals.pool); - switch_core_hash_init(&globals.consumer_orig_hash, globals.pool); - switch_core_hash_init(&globals.bridge_hash, globals.pool); - switch_core_hash_init(&globals.use_hash, globals.pool); + switch_core_hash_init(&globals.caller_orig_hash); + switch_core_hash_init(&globals.consumer_orig_hash); + switch_core_hash_init(&globals.bridge_hash); + switch_core_hash_init(&globals.use_hash); switch_mutex_init(&globals.caller_orig_mutex, SWITCH_MUTEX_NESTED, globals.pool); switch_mutex_init(&globals.consumer_orig_mutex, SWITCH_MUTEX_NESTED, globals.pool); switch_mutex_init(&globals.bridge_mutex, SWITCH_MUTEX_NESTED, globals.pool); diff --git a/src/mod/applications/mod_fsk/Makefile b/src/mod/applications/mod_fsk/Makefile deleted file mode 100644 index 620f3f751c..0000000000 --- a/src/mod/applications/mod_fsk/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -BASE=../../../.. - -LOCAL_SOURCES=fsk.c uart.c fsk_callerid.c -LOCAL_OBJS=fsk.o uart.o fsk_callerid.o -include $(BASE)/build/modmake.rules - diff --git a/src/mod/applications/mod_fsk/Makefile.am b/src/mod/applications/mod_fsk/Makefile.am new file mode 100644 index 0000000000..d551b6f23d --- /dev/null +++ b/src/mod/applications/mod_fsk/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_fsk + +mod_LTLIBRARIES = mod_fsk.la +mod_fsk_la_SOURCES = mod_fsk.c fsk.c uart.c fsk_callerid.c +mod_fsk_la_CFLAGS = $(AM_CFLAGS) +mod_fsk_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_fsk_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/applications/mod_fsv/Makefile.am b/src/mod/applications/mod_fsv/Makefile.am new file mode 100644 index 0000000000..dd75a2f081 --- /dev/null +++ b/src/mod/applications/mod_fsv/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_fsv + +mod_LTLIBRARIES = mod_fsv.la +mod_fsv_la_SOURCES = mod_fsv.c +mod_fsv_la_CFLAGS = $(AM_CFLAGS) +mod_fsv_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_fsv_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/applications/mod_hash/mod_hash.c b/src/mod/applications/mod_hash/mod_hash.c index 5b5020181e..66c285730a 100644 --- a/src/mod/applications/mod_hash/mod_hash.c +++ b/src/mod/applications/mod_hash/mod_hash.c @@ -161,7 +161,7 @@ SWITCH_LIMIT_INCR(limit_incr_hash) /* This is the first limit check on this channel, create a hashtable, set our prviate data */ pvt = (limit_hash_private_t *) switch_core_session_alloc(session, sizeof(limit_hash_private_t)); memset(pvt, 0, sizeof(limit_hash_private_t)); - switch_core_hash_init(&pvt->hash, switch_core_session_get_pool(session)); + switch_core_hash_init(&pvt->hash); switch_channel_set_private(channel, "limit_hash", pvt); } @@ -291,13 +291,13 @@ SWITCH_LIMIT_RELEASE(limit_release_hash) /* clear for uuid */ if (realm == NULL && resource == NULL) { /* Loop through the channel's hashtable which contains mapping to all the limit_hash_item_t referenced by that channel */ - while ((hi = switch_hash_first(NULL, pvt->hash))) { + while ((hi = switch_core_hash_first( pvt->hash))) { void *val = NULL; const void *key; switch_ssize_t keylen; limit_hash_item_t *item = NULL; - switch_hash_this(hi, &key, &keylen, &val); + switch_core_hash_this(hi, &key, &keylen, &val); item = (limit_hash_item_t *) val; item->total_usage--; @@ -391,7 +391,7 @@ SWITCH_LIMIT_STATUS(limit_status_hash) switch_thread_rwlock_rdlock(globals.limit_hash_rwlock); - for (hi = switch_hash_first(NULL, globals.limit_hash); hi; switch_hash_next(hi)) { + for (hi = switch_core_hash_first( globals.limit_hash); hi; switch_core_hash_next(hi)) { count++; } @@ -623,12 +623,12 @@ SWITCH_STANDARD_API(hash_dump_function) if (mode & 1) { switch_thread_rwlock_rdlock(globals.limit_hash_rwlock); - for (hi = switch_hash_first(NULL, globals.limit_hash); hi; hi = switch_hash_next(hi)) { + for (hi = switch_core_hash_first( globals.limit_hash); hi; hi = switch_core_hash_next(hi)) { void *val = NULL; const void *key; switch_ssize_t keylen; limit_hash_item_t *item; - switch_hash_this(hi, &key, &keylen, &val); + switch_core_hash_this(hi, &key, &keylen, &val); item = (limit_hash_item_t *)val; @@ -639,11 +639,11 @@ SWITCH_STANDARD_API(hash_dump_function) if (mode & 2) { switch_thread_rwlock_rdlock(globals.db_hash_rwlock); - for (hi = switch_hash_first(NULL, globals.db_hash); hi; hi = switch_hash_next(hi)) { + for (hi = switch_core_hash_first( globals.db_hash); hi; hi = switch_core_hash_next(hi)) { void *val = NULL; const void *key; switch_ssize_t keylen; - switch_hash_this(hi, &key, &keylen, &val); + switch_core_hash_this(hi, &key, &keylen, &val); if (realm) { if (strstr(key, realmvalue)) { stream->write_function(stream, "D/%s/%s\n", key, (char*)val); @@ -679,12 +679,12 @@ SWITCH_STANDARD_API(hash_remote_function) stream->write_function(stream, "Remote connections:\nName\t\t\tState\n"); switch_thread_rwlock_rdlock(globals.remote_hash_rwlock); - for (hi = switch_hash_first(NULL, globals.remote_hash); hi; hi = switch_hash_next(hi)) { + for (hi = switch_core_hash_first( globals.remote_hash); hi; hi = switch_core_hash_next(hi)) { void *val; const void *key; switch_ssize_t keylen; limit_remote_t *item; - switch_hash_this(hi, &key, &keylen, &val); + switch_core_hash_this(hi, &key, &keylen, &val); item = (limit_remote_t *)val; stream->write_function(stream, "%s\t\t\t%s\n", item->name, state_str(item->state)); @@ -756,7 +756,7 @@ limit_remote_t *limit_remote_create(const char *name, const char *host, uint16_t r->interval = interval; switch_thread_rwlock_create(&r->rwlock, pool); - switch_core_hash_init(&r->index, pool); + switch_core_hash_init(&r->index); switch_thread_rwlock_rdlock(globals.remote_hash_rwlock); switch_core_hash_insert(globals.remote_hash, name, r); @@ -780,11 +780,11 @@ void limit_remote_destroy(limit_remote_t **r) switch_thread_rwlock_wrlock((*r)->rwlock); /* Free hashtable data */ - for (hi = switch_hash_first(NULL, (*r)->index); hi; hi = switch_hash_next(hi)) { + for (hi = switch_core_hash_first( (*r)->index); hi; hi = switch_core_hash_next(hi)) { void *val; const void *key; switch_ssize_t keylen; - switch_hash_this(hi, &key, &keylen, &val); + switch_core_hash_this(hi, &key, &keylen, &val); free(val); } @@ -803,13 +803,13 @@ static limit_hash_item_t get_remote_usage(const char *key) { switch_hash_index_t *hi; switch_thread_rwlock_rdlock(globals.remote_hash_rwlock); - for (hi = switch_hash_first(NULL, globals.remote_hash); hi; hi = switch_hash_next(hi)) { + for (hi = switch_core_hash_first( globals.remote_hash); hi; hi = switch_core_hash_next(hi)) { void *val; const void *hashkey; switch_ssize_t keylen; limit_remote_t *remote; limit_hash_item_t *item; - switch_hash_this(hi, &hashkey, &keylen, &val); + switch_core_hash_this(hi, &hashkey, &keylen, &val); remote = (limit_remote_t *)val; if (remote->state != REMOTE_UP) { @@ -983,9 +983,9 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_hash_load) switch_thread_rwlock_create(&globals.limit_hash_rwlock, globals.pool); switch_thread_rwlock_create(&globals.db_hash_rwlock, globals.pool); switch_thread_rwlock_create(&globals.remote_hash_rwlock, globals.pool); - switch_core_hash_init(&globals.limit_hash, pool); - switch_core_hash_init(&globals.db_hash, pool); - switch_core_hash_init(&globals.remote_hash, globals.pool); + switch_core_hash_init(&globals.limit_hash); + switch_core_hash_init(&globals.db_hash); + switch_core_hash_init(&globals.remote_hash); /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); @@ -1031,8 +1031,8 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_hash_shutdown) limit_remote_t *item = NULL; switch_thread_rwlock_rdlock(globals.remote_hash_rwlock); - if ((hi = switch_hash_first(NULL, globals.remote_hash))) { - switch_hash_this(hi, &key, &keylen, &val); + if ((hi = switch_core_hash_first( globals.remote_hash))) { + switch_core_hash_this(hi, &key, &keylen, &val); item = (limit_remote_t *)val; } switch_thread_rwlock_unlock(globals.remote_hash_rwlock); @@ -1050,20 +1050,20 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_hash_shutdown) switch_thread_rwlock_wrlock(globals.limit_hash_rwlock); switch_thread_rwlock_wrlock(globals.db_hash_rwlock); - while ((hi = switch_hash_first(NULL, globals.limit_hash))) { + while ((hi = switch_core_hash_first( globals.limit_hash))) { void *val = NULL; const void *key; switch_ssize_t keylen; - switch_hash_this(hi, &key, &keylen, &val); + switch_core_hash_this(hi, &key, &keylen, &val); free(val); switch_core_hash_delete(globals.limit_hash, key); } - while ((hi = switch_hash_first(NULL, globals.db_hash))) { + while ((hi = switch_core_hash_first( globals.db_hash))) { void *val = NULL; const void *key; switch_ssize_t keylen; - switch_hash_this(hi, &key, &keylen, &val); + switch_core_hash_this(hi, &key, &keylen, &val); free(val); switch_core_hash_delete(globals.db_hash, key); } diff --git a/src/mod/applications/mod_httapi/Makefile.am b/src/mod/applications/mod_httapi/Makefile.am new file mode 100644 index 0000000000..31452d6952 --- /dev/null +++ b/src/mod/applications/mod_httapi/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_httapi + +mod_LTLIBRARIES = mod_httapi.la +mod_httapi_la_SOURCES = mod_httapi.c +mod_httapi_la_CFLAGS = $(AM_CFLAGS) +mod_httapi_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_httapi_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/applications/mod_httapi/mod_httapi.c b/src/mod/applications/mod_httapi/mod_httapi.c index 2c025b521c..954d4b31aa 100644 --- a/src/mod/applications/mod_httapi/mod_httapi.c +++ b/src/mod/applications/mod_httapi/mod_httapi.c @@ -1822,7 +1822,7 @@ static switch_status_t do_config(void) cookie_file = val; } else if (!strcasecmp(var, "enable-post-var")) { if (!vars_map && need_vars_map == 0) { - if (switch_core_hash_init(&vars_map, globals.pool) != SWITCH_STATUS_SUCCESS) { + if (switch_core_hash_init(&vars_map) != SWITCH_STATUS_SUCCESS) { need_vars_map = -1; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Can't init params hash!\n"); continue; @@ -2317,9 +2317,23 @@ SWITCH_STANDARD_APP(httapi_function) /* HTTP FILE INTERFACE */ +static const char *find_ext(const char *in) +{ + const char *p = in + (strlen(in) - 1); + + while(p >= in && *p) { + if (*p == '/') return NULL; + if (*p == '.') return (p+1); + p--; + } + + return NULL; +} + static char *load_cache_data(http_file_context_t *context, const char *url) { - char *ext = NULL, *dext = NULL, *p; + const char *ext = NULL; + char *dext = NULL, *p; char digest[SWITCH_MD5_DIGEST_STRING_SIZE] = { 0 }; char meta_buffer[1024] = ""; int fd; @@ -2332,11 +2346,7 @@ static char *load_cache_data(http_file_context_t *context, const char *url) } if (zstr(ext)) { - if ((ext = strrchr(url, '.'))) { - ext++; - } else { - ext = "wav"; - } + ext = find_ext(url); } if (ext && (p = strchr(ext, '?'))) { @@ -2348,9 +2358,8 @@ static char *load_cache_data(http_file_context_t *context, const char *url) } context->cache_file_base = switch_core_sprintf(context->pool, "%s%s%s", globals.cache_path, SWITCH_PATH_SEPARATOR, digest); - context->cache_file = switch_core_sprintf(context->pool, "%s%s%s.%s", globals.cache_path, SWITCH_PATH_SEPARATOR, digest, ext); - context->meta_file = switch_core_sprintf(context->pool, "%s.meta", context->cache_file); - context->lock_file = switch_core_sprintf(context->pool, "%s.lock", context->cache_file); + context->meta_file = switch_core_sprintf(context->pool, "%s%s%s.meta", globals.cache_path, SWITCH_PATH_SEPARATOR, digest); + context->lock_file = switch_core_sprintf(context->pool, "%s%s%s.lock", globals.cache_path, SWITCH_PATH_SEPARATOR, digest); if (switch_file_exists(context->meta_file, context->pool) == SWITCH_STATUS_SUCCESS && ((fd = open(context->meta_file, O_RDONLY, 0)) > -1)) { if ((bytes = read(fd, meta_buffer, sizeof(meta_buffer))) > 0) { @@ -2363,10 +2372,20 @@ static char *load_cache_data(http_file_context_t *context, const char *url) } context->metadata = switch_core_strdup(context->pool, p); } + + if ((p = strrchr(context->metadata, ':'))) { + p++; + if (!zstr(p)) { + ext = p; + } + } + } close(fd); } + context->cache_file = switch_core_sprintf(context->pool, "%s%s%s%s%s", globals.cache_path, SWITCH_PATH_SEPARATOR, digest, ext ? "." : "", ext ? ext : ""); + switch_safe_free(dext); return context->cache_file; @@ -2626,6 +2645,7 @@ static switch_status_t locate_url_file(http_file_context_t *context, const char switch_status_t status = SWITCH_STATUS_FALSE; time_t now = switch_epoch_time_now(NULL); char *metadata; + const char *ext = NULL; load_cache_data(context, url); @@ -2635,6 +2655,10 @@ static switch_status_t locate_url_file(http_file_context_t *context, const char lock_file(context, SWITCH_TRUE); + if (context->url_params) { + ext = switch_event_get_header(context->url_params, "ext"); + } + if (!context->url_params || !switch_true(switch_event_get_header(context->url_params, "nohead"))) { const char *ct = NULL; const char *newext = NULL; @@ -2650,8 +2674,7 @@ static switch_status_t locate_url_file(http_file_context_t *context, const char } } - if ((!context->url_params || !switch_event_get_header(context->url_params, "ext")) - && headers && (ct = switch_event_get_header(headers, "content-type"))) { + if (zstr(ext) && headers && (ct = switch_event_get_header(headers, "content-type"))) { if (switch_strcasecmp_any(ct, "audio/mpeg", "audio/x-mpeg", "audio/mp3", "audio/x-mp3", "audio/mpeg3", "audio/x-mpeg3", "audio/mpg", "audio/x-mpg", "audio/x-mpegaudio", NULL)) { newext = "mp3"; @@ -2660,14 +2683,14 @@ static switch_status_t locate_url_file(http_file_context_t *context, const char } } + if (newext) { + ext = newext; + } else if (zstr(ext)) { + ext = find_ext(context->cache_file); + } + if (newext) { - char *p; - - if ((p = strrchr(context->cache_file, '.'))) { - *p = '\0'; - } - context->cache_file = switch_core_sprintf(context->pool, "%s.%s", context->cache_file, newext); } @@ -2678,11 +2701,12 @@ static switch_status_t locate_url_file(http_file_context_t *context, const char } if (!unreachable && !zstr(context->metadata)) { - metadata = switch_core_sprintf(context->pool, "%s:%s:%s:%s", + metadata = switch_core_sprintf(context->pool, "%s:%s:%s:%s:%s", url, switch_event_get_header_nil(headers, "last-modified"), switch_event_get_header_nil(headers, "etag"), - switch_event_get_header_nil(headers, "content-length") + switch_event_get_header_nil(headers, "content-length"), + ext ); if (!strcmp(metadata, context->metadata)) { @@ -2701,11 +2725,12 @@ static switch_status_t locate_url_file(http_file_context_t *context, const char } - metadata = switch_core_sprintf(context->pool, "%s:%s:%s:%s", + metadata = switch_core_sprintf(context->pool, "%s:%s:%s:%s:%s", url, switch_event_get_header_nil(headers, "last-modified"), switch_event_get_header_nil(headers, "etag"), - switch_event_get_header_nil(headers, "content-length") + switch_event_get_header_nil(headers, "content-length"), + ext ); write_meta_file(context, metadata, headers); @@ -3011,8 +3036,8 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_httapi_load) switch_dir_make_recursive(globals.cache_path, SWITCH_DEFAULT_DIR_PERMS, pool); - switch_core_hash_init(&globals.profile_hash, globals.pool); - switch_core_hash_init_case(&globals.parse_hash, globals.pool, SWITCH_FALSE); + switch_core_hash_init(&globals.profile_hash); + switch_core_hash_init_case(&globals.parse_hash, SWITCH_FALSE); bind_parser("execute", parse_execute); bind_parser("sms", parse_sms); @@ -3063,8 +3088,8 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_httapi_shutdown) void *val; const void *vvar; - for (hi = switch_hash_first(NULL, globals.profile_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, &vvar, NULL, &val); + for (hi = switch_core_hash_first( globals.profile_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, &vvar, NULL, &val); profile = (client_profile_t *) val; switch_event_destroy(&profile->dial_params.app_list); switch_event_destroy(&profile->var_params.expand_var_list); diff --git a/src/mod/applications/mod_http_cache/Makefile b/src/mod/applications/mod_http_cache/Makefile deleted file mode 100644 index 9b61a41042..0000000000 --- a/src/mod/applications/mod_http_cache/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -BASE=../../../.. - -LOCAL_OBJS= \ - aws.o -LOCAL_SOURCES= \ - aws.c - -include $(BASE)/build/modmake.rules - diff --git a/src/mod/applications/mod_http_cache/Makefile.am b/src/mod/applications/mod_http_cache/Makefile.am new file mode 100644 index 0000000000..b03e43a247 --- /dev/null +++ b/src/mod/applications/mod_http_cache/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_http_cache + +mod_LTLIBRARIES = mod_http_cache.la +mod_http_cache_la_SOURCES = mod_http_cache.c aws.c +mod_http_cache_la_CFLAGS = $(AM_CFLAGS) +mod_http_cache_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_http_cache_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/applications/mod_http_cache/mod_http_cache.c b/src/mod/applications/mod_http_cache/mod_http_cache.c index 3648f97e80..625fe236bb 100644 --- a/src/mod/applications/mod_http_cache/mod_http_cache.c +++ b/src/mod/applications/mod_http_cache/mod_http_cache.c @@ -1631,9 +1631,9 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_http_cache_load) memset(&gcache, 0, sizeof(url_cache_t)); gcache.pool = pool; - switch_core_hash_init(&gcache.map, gcache.pool); - switch_core_hash_init(&gcache.profiles, gcache.pool); - switch_core_hash_init_nocase(&gcache.fqdn_profiles, gcache.pool); + switch_core_hash_init(&gcache.map); + switch_core_hash_init(&gcache.profiles); + switch_core_hash_init_nocase(&gcache.fqdn_profiles); switch_mutex_init(&gcache.mutex, SWITCH_MUTEX_UNNESTED, gcache.pool); switch_thread_rwlock_create(&gcache.shutdown_lock, gcache.pool); diff --git a/src/mod/applications/mod_ladspa/Makefile b/src/mod/applications/mod_ladspa/Makefile deleted file mode 100644 index 1a77c52a0d..0000000000 --- a/src/mod/applications/mod_ladspa/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -BASE=../../../.. - -LOCAL_OBJS += load.o -include $(BASE)/build/modmake.rules - diff --git a/src/mod/applications/mod_ladspa/Makefile.am b/src/mod/applications/mod_ladspa/Makefile.am new file mode 100644 index 0000000000..04dcfb662a --- /dev/null +++ b/src/mod/applications/mod_ladspa/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_ladspa + +mod_LTLIBRARIES = mod_ladspa.la +mod_ladspa_la_SOURCES = mod_ladspa.c load.c +mod_ladspa_la_CFLAGS = $(AM_CFLAGS) +mod_ladspa_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_ladspa_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/applications/mod_ladspa/load.c b/src/mod/applications/mod_ladspa/load.c index 652ecfa0f2..e8976bfa64 100644 --- a/src/mod/applications/mod_ladspa/load.c +++ b/src/mod/applications/mod_ladspa/load.c @@ -5,6 +5,7 @@ /*****************************************************************************/ +#include "switch.h" #include #include #include @@ -15,7 +16,6 @@ #include "ladspa.h" #include "utils.h" #include "inttypes.h" -#include "switch.h" /*****************************************************************************/ /* This function provides a wrapping of dlopen(). When the filename is diff --git a/src/mod/applications/mod_lcr/Makefile.am b/src/mod/applications/mod_lcr/Makefile.am new file mode 100644 index 0000000000..ddfbb63858 --- /dev/null +++ b/src/mod/applications/mod_lcr/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_lcr + +mod_LTLIBRARIES = mod_lcr.la +mod_lcr_la_SOURCES = mod_lcr.c +mod_lcr_la_CFLAGS = $(AM_CFLAGS) +mod_lcr_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_lcr_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/applications/mod_lcr/mod_lcr.c b/src/mod/applications/mod_lcr/mod_lcr.c index 37b3e431d7..042525a3dd 100644 --- a/src/mod/applications/mod_lcr/mod_lcr.c +++ b/src/mod/applications/mod_lcr/mod_lcr.c @@ -900,7 +900,7 @@ static switch_status_t lcr_do_lookup(callback_t *cb_struct) } /* allocate the dedup hash */ - if (switch_core_hash_init(&cb_struct->dedup_hash, cb_struct->pool) != SWITCH_STATUS_SUCCESS) { + if (switch_core_hash_init(&cb_struct->dedup_hash) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(cb_struct->session), SWITCH_LOG_ERROR, "Error initializing the dedup hash\n"); return SWITCH_STATUS_GENERR; } @@ -1067,7 +1067,7 @@ static switch_status_t lcr_load_config() switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to determine database RANDOM function\n"); }; - switch_core_hash_init(&globals.profile_hash, globals.pool); + switch_core_hash_init(&globals.profile_hash); if ((x_profiles = switch_xml_child(cfg, "profiles"))) { for (x_profile = switch_xml_child(x_profiles, "profile"); x_profile; x_profile = x_profile->next) { char *name = (char *) switch_xml_attr_soft(x_profile, "name"); @@ -2038,8 +2038,8 @@ SWITCH_STANDARD_API(dialplan_lcr_admin_function) } switch_assert(argv[0]); if (!strcasecmp(argv[0], "show") && !strcasecmp(argv[1], "profiles")) { - for (hi = switch_hash_first(NULL, globals.profile_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, NULL, NULL, &val); + for (hi = switch_core_hash_first( globals.profile_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, NULL, NULL, &val); profile = (profile_t *) val; stream->write_function(stream, "Name:\t\t%s\n", profile->name); diff --git a/src/mod/applications/mod_limit/Makefile.am b/src/mod/applications/mod_limit/Makefile.am new file mode 100644 index 0000000000..c60208a596 --- /dev/null +++ b/src/mod/applications/mod_limit/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_limit + +mod_LTLIBRARIES = mod_limit.la +mod_limit_la_SOURCES = mod_limit.c +mod_limit_la_CFLAGS = $(AM_CFLAGS) +mod_limit_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_limit_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/applications/mod_memcache/Makefile b/src/mod/applications/mod_memcache/Makefile.am similarity index 54% rename from src/mod/applications/mod_memcache/Makefile rename to src/mod/applications/mod_memcache/Makefile.am index 0f469ff9e2..e003a4de3f 100644 --- a/src/mod/applications/mod_memcache/Makefile +++ b/src/mod/applications/mod_memcache/Makefile.am @@ -1,18 +1,18 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_memcache MEMCACHED=libmemcached-0.32 -BASE=../../../.. - MEMCACHED_DIR=$(switch_srcdir)/libs/$(MEMCACHED) MEMCACHED_BUILDDIR=$(switch_builddir)/libs/$(MEMCACHED) MEMCACHEDLA=$(MEMCACHED_BUILDDIR)/libmemcached/libmemcached.la -LOCAL_CFLAGS=-I$(MEMCACHED_DIR) -I$(MEMCACHED_BUILDDIR) -LOCAL_LIBADD=$(MEMCACHEDLA) +mod_LTLIBRARIES = mod_memcache.la +mod_memcache_la_SOURCES = mod_memcache.c +mod_memcache_la_CFLAGS = $(AM_CFLAGS) -I$(MEMCACHED_DIR) -I$(MEMCACHED_BUILDDIR) +mod_memcache_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(MEMCACHEDLA) +mod_memcache_la_LDFLAGS = -avoid-version -module -no-undefined -shared -include $(BASE)/build/modmake.rules - -MY_DEFAULT_ARGS:= --build=$(build) --host=$(host) --target=$(target) \ - --disable-shared --with-pic +MY_DEFAULT_ARGS=--build=$(build) --host=$(host) --target=$(target) --disable-shared --with-pic $(MEMCACHED_DIR): $(GETLIB) $(MEMCACHED).tar.gz @@ -20,12 +20,9 @@ $(MEMCACHED_DIR): $(MEMCACHED_BUILDDIR)/Makefile: $(MEMCACHED_DIR) mkdir -p $(MEMCACHED_BUILDDIR) echo $(MY_DEFAULT_ARGS) - cd $(MEMCACHED_BUILDDIR) && $(DEFAULT_VARS) $(MEMCACHED_DIR)/configure $(MY_DEFAULT_ARGS) --with-memcached=no --srcdir=$(MEMCACHED_DIR) CPPFLAGS= LDFLAGS= + cd $(MEMCACHED_BUILDDIR) && $(DEFAULT_VARS) $(MEMCACHED_DIR)/configure $(MY_DEFAULT_ARGS) --with-memcached=no --srcdir=$(MEMCACHED_DIR) CPPFLAGS= LDFLAGS= $(TOUCH_TARGET) $(MEMCACHEDLA): $(MEMCACHED_BUILDDIR)/Makefile cd $(MEMCACHED_BUILDDIR) && $(MAKE) $(TOUCH_TARGET) - - - diff --git a/src/mod/applications/mod_mongo/Makefile b/src/mod/applications/mod_mongo/Makefile deleted file mode 100644 index aa696cb6b0..0000000000 --- a/src/mod/applications/mod_mongo/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -BASE=../../../.. - -MONGO_CXX_DRIVER_VERSION=v2.4 -MONGO_CXX_DRIVER_URL=http://downloads.mongodb.org/cxx-driver -MONGO_CXX_DRIVER_TARBALL=mongodb-linux-x86_64-$(MONGO_CXX_DRIVER_VERSION)-latest.tgz -MONGO_CXX_DRIVER_SRC=$(BASE)/libs/mongo-cxx-driver-$(MONGO_CXX_DRIVER_VERSION) -LIBMONGOCLIENT_A =$(MONGO_CXX_DRIVER_SRC)/libmongoclient.a - -LOCAL_SOURCES= -LOCAL_OBJS= - -LOCAL_CFLAGS=-I$(MONGO_CXX_DRIVER_SRC)/src -LOCAL_LIBADD=$(LIBMONGOCLIENT_A) -LOCAL_LDFLAGS=-lboost_thread -lboost_filesystem-mt -lboost_system-mt -#LOCAL_LDFLAGS=-lboost_thread-mt -lboost_filesystem-mt -lboost_system-mt -MODDIR=$(shell pwd) - - -include $(BASE)/build/modmake.rules - -$(MONGO_CXX_DRIVER_SRC): - $(GETLIB) $(MONGO_CXX_DRIVER_URL) $(MONGO_CXX_DRIVER_TARBALL) - cd $(MONGO_CXX_DRIVER_SRC) && patch -p0 -i $(MODDIR)/fpic_hack.diff - $(TOUCH_TARGET) - - -$(LIBMONGOCLIENT_A): $(MONGO_CXX_DRIVER_SRC) - (cd $(MONGO_CXX_DRIVER_SRC) && \ - sed -i SConstruct -e "s|Environment()|Environment(ENV = {'PATH' : os.environ.get('PATH','/bin:/usr/bin'),'CFLAGS' : os.environ.get('CFLAGS',''),'CXXFLAGS' : os.environ.get('CXXFLAGS','')})|" && \ - echo "env.Append(PATH=os.environ.get('PATH','/bin:/usr/bin'))" >> SConstruct && \ - scons) - $(TOUCH_TARGET) - diff --git a/src/mod/applications/mod_mongo/Makefile.am b/src/mod/applications/mod_mongo/Makefile.am new file mode 100644 index 0000000000..44f44d4b67 --- /dev/null +++ b/src/mod/applications/mod_mongo/Makefile.am @@ -0,0 +1,31 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_mongo + +MONGO_CXX_DRIVER_VERSION=v2.4 +MONGO_CXX_DRIVER_URL=http://downloads.mongodb.org/cxx-driver +MONGO_CXX_DRIVER_TARBALL=mongodb-linux-x86_64-$(MONGO_CXX_DRIVER_VERSION)-latest.tgz +MONGO_CXX_DRIVER_SRC=$(switch_builddir)/libs/mongo-cxx-driver-$(MONGO_CXX_DRIVER_VERSION) +LIBMONGOCLIENT_A =$(MONGO_CXX_DRIVER_SRC)/libmongoclient.a + +mod_LTLIBRARIES = mod_mongo.la +mod_mongo_la_SOURCES = mod_mongo.cpp +mod_mongo_la_CFLAGS = $(AM_CFLAGS) +mod_mongo_la_CPPFLAGS = -I$(MONGO_CXX_DRIVER_SRC)/src -I$(switch_srcdir)/libs/stfu/ -I$(switch_srcdir)/libs/libteletone/src/ +mod_mongo_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(LIBMONGOCLIENT_A) +mod_mongo_la_LDFLAGS = -avoid-version -module -no-undefined -shared -lboost_thread -lboost_filesystem-mt -lboost_system-mt + +BUILT_SOURCES=$(LIBMONGOCLIENT_A) + +$(MONGO_CXX_DRIVER_SRC): + $(GETLIB) $(MONGO_CXX_DRIVER_URL) $(MONGO_CXX_DRIVER_TARBALL) + cd $(MONGO_CXX_DRIVER_SRC) && patch -p0 -i $(switch_srcdir)/src/mod/applications/mod_mongo/fpic_hack.diff + $(TOUCH_TARGET) + + +$(LIBMONGOCLIENT_A): $(MONGO_CXX_DRIVER_SRC) + (cd $(MONGO_CXX_DRIVER_SRC) && \ + sed -i'' SConstruct -e "s|Environment()|Environment(ENV = {'PATH' : os.environ.get('PATH','/bin:/usr/bin'),'CFLAGS' : os.environ.get('CFLAGS',''),'CXXFLAGS' : os.environ.get('CXXFLAGS','')})|" && \ + echo "env.Append(PATH=os.environ.get('PATH','/bin:/usr/bin'))" >> SConstruct && \ + scons) + $(TOUCH_TARGET) + diff --git a/src/mod/applications/mod_mp4/Makefile b/src/mod/applications/mod_mp4/Makefile deleted file mode 100644 index 99b0d47370..0000000000 --- a/src/mod/applications/mod_mp4/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -# LOCAL_CFLAGS=-I./mp4v2-2.0.0/include -LOCAL_LDFLAGS=-lmp4v2 -LOCAL_SOURCES=mp4_helper.cpp -LOCAL_OBJS=mp4_helper.o - -BASE=../../../.. -include $(BASE)/build/modmake.rules diff --git a/src/mod/applications/mod_mp4/Makefile.am b/src/mod/applications/mod_mp4/Makefile.am new file mode 100644 index 0000000000..46d3f78dfa --- /dev/null +++ b/src/mod/applications/mod_mp4/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_mp4 + +mod_LTLIBRARIES = mod_mp4.la +mod_mp4_la_SOURCES = mod_mp4.cpp mp4_helper.cpp +mod_mp4_la_CFLAGS = $(AM_CFLAGS) +mod_mp4_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_mp4_la_LDFLAGS = -avoid-version -module -no-undefined -shared -lmp4v2 diff --git a/src/mod/applications/mod_nibblebill/Makefile.am b/src/mod/applications/mod_nibblebill/Makefile.am new file mode 100644 index 0000000000..97c90998d5 --- /dev/null +++ b/src/mod/applications/mod_nibblebill/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_nibblebill + +mod_LTLIBRARIES = mod_nibblebill.la +mod_nibblebill_la_SOURCES = mod_nibblebill.c +mod_nibblebill_la_CFLAGS = $(AM_CFLAGS) +mod_nibblebill_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_nibblebill_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/applications/mod_oreka/Makefile b/src/mod/applications/mod_oreka/Makefile deleted file mode 100644 index 2c35e6e98f..0000000000 --- a/src/mod/applications/mod_oreka/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -BASE=../../../.. -include $(BASE)/build/modmake.rules diff --git a/src/mod/applications/mod_oreka/Makefile.am b/src/mod/applications/mod_oreka/Makefile.am new file mode 100644 index 0000000000..446f5183d6 --- /dev/null +++ b/src/mod/applications/mod_oreka/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_oreka + +mod_LTLIBRARIES = mod_oreka.la +mod_oreka_la_SOURCES = mod_oreka.c +mod_oreka_la_CFLAGS = $(AM_CFLAGS) +mod_oreka_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_oreka_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/event_handlers/mod_radius_cdr/Makefile b/src/mod/applications/mod_rad_auth/Makefile.am similarity index 63% rename from src/mod/event_handlers/mod_radius_cdr/Makefile rename to src/mod/applications/mod_rad_auth/Makefile.am index 63542dff47..f39269a6b2 100644 --- a/src/mod/event_handlers/mod_radius_cdr/Makefile +++ b/src/mod/applications/mod_rad_auth/Makefile.am @@ -1,3 +1,6 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_rad_auth + RADCLIENT_VERSION=1.1.6 RADCLIENT=freeradius-client-$(RADCLIENT_VERSION) RADCLIENT_DIR=$(switch_srcdir)/libs/$(RADCLIENT) @@ -5,11 +8,13 @@ RADCLIENT_BUILDDIR=$(switch_builddir)/libs/$(RADCLIENT) RADCLIENT_LIBDIR=$(RADCLIENT_BUILDDIR)/lib RADCLIENT_LA=${RADCLIENT_LIBDIR}/libfreeradius-client.la -LOCAL_CFLAGS=-I$(RADCLIENT_DIR)/include -LOCAL_LIBADD=$(RADCLIENT_LA) +mod_LTLIBRARIES = mod_rad_auth.la +mod_rad_auth_la_SOURCES = mod_rad_auth.c +mod_rad_auth_la_CFLAGS = $(AM_CFLAGS) -I$(RADCLIENT_DIR)/include +mod_rad_auth_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(RADCLIENT_LA) +mod_rad_auth_la_LDFLAGS = -avoid-version -module -no-undefined -shared -BASE=../../../.. -include $(BASE)/build/modmake.rules +BUILT_SOURCES=$(RADCLIENT_LA) $(RADCLIENT_DIR): $(GETLIB) $(RADCLIENT).tar.gz @@ -22,5 +27,3 @@ $(RADCLIENT_BUILDDIR)/Makefile: $(RADCLIENT_DIR) $(RADCLIENT_LA): $(RADCLIENT_BUILDDIR)/Makefile cd $(RADCLIENT_BUILDDIR) && CFLAGS="$(CFLAGS)" $(MAKE) $(TOUCH_TARGET) - - diff --git a/src/mod/applications/mod_random/Makefile.am b/src/mod/applications/mod_random/Makefile.am new file mode 100644 index 0000000000..36c2d6d41b --- /dev/null +++ b/src/mod/applications/mod_random/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_random + +mod_LTLIBRARIES = mod_random.la +mod_random_la_SOURCES = mod_random.c +mod_random_la_CFLAGS = $(AM_CFLAGS) +mod_random_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_random_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/applications/mod_redis/Makefile b/src/mod/applications/mod_redis/Makefile deleted file mode 100644 index 9ff4816a96..0000000000 --- a/src/mod/applications/mod_redis/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -BASE=../../../.. -LOCAL_OBJS=credis.o -include $(BASE)/build/modmake.rules diff --git a/src/mod/applications/mod_redis/Makefile.am b/src/mod/applications/mod_redis/Makefile.am new file mode 100644 index 0000000000..2871bb6844 --- /dev/null +++ b/src/mod/applications/mod_redis/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_redis + +mod_LTLIBRARIES = mod_redis.la +mod_redis_la_SOURCES = mod_redis.c credis.c +mod_redis_la_CFLAGS = $(AM_CFLAGS) -D_GNU_SOURCE +mod_redis_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_redis_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/applications/mod_redis/mod_redis.c b/src/mod/applications/mod_redis/mod_redis.c old mode 100755 new mode 100644 index b7038a6878..43bc37f215 --- a/src/mod/applications/mod_redis/mod_redis.c +++ b/src/mod/applications/mod_redis/mod_redis.c @@ -97,7 +97,7 @@ SWITCH_LIMIT_INCR(limit_incr_redis) } else { /* This is the first limit check on this channel, create a hashtable, set our prviate data and add a state handler */ pvt = (limit_redis_private_t *) switch_core_session_alloc(session, sizeof(limit_redis_private_t)); - switch_core_hash_init(&pvt->hash, switch_core_session_get_pool(session)); + switch_core_hash_init(&pvt->hash); switch_mutex_init(&pvt->mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); switch_channel_set_private(channel, "limit_redis", pvt); } @@ -172,13 +172,13 @@ SWITCH_LIMIT_RELEASE(limit_release_redis) /* clear for uuid */ if (realm == NULL && resource == NULL) { /* Loop through the channel's hashtable which contains mapping to all the limit_redis_item_t referenced by that channel */ - while ((hi = switch_hash_first(NULL, pvt->hash))) { + while ((hi = switch_core_hash_first( pvt->hash))) { void *p_val = NULL; const void *p_key; char *p_uuid_key = NULL; switch_ssize_t keylen; - switch_hash_this(hi, &p_key, &keylen, &p_val); + switch_core_hash_this(hi, &p_key, &keylen, &p_val); if (credis_decr(redis, (const char*)p_key, &val) != 0) { switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Couldn't decrement value corresponding to %s\n", (char *)p_key); diff --git a/src/mod/applications/mod_rss/Makefile.am b/src/mod/applications/mod_rss/Makefile.am new file mode 100644 index 0000000000..718ea0d0eb --- /dev/null +++ b/src/mod/applications/mod_rss/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_rss + +mod_LTLIBRARIES = mod_rss.la +mod_rss_la_SOURCES = mod_rss.c +mod_rss_la_CFLAGS = $(AM_CFLAGS) +mod_rss_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_rss_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/applications/mod_skel/Makefile b/src/mod/applications/mod_skel/Makefile deleted file mode 100644 index 53a1f3700f..0000000000 --- a/src/mod/applications/mod_skel/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -BASE=../../../.. -include $(BASE)/build/modmake.rules \ No newline at end of file diff --git a/src/mod/applications/mod_skel/Makefile.am b/src/mod/applications/mod_skel/Makefile.am new file mode 100644 index 0000000000..2860807cbd --- /dev/null +++ b/src/mod/applications/mod_skel/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_skel + +mod_LTLIBRARIES = mod_skel.la +mod_skel_la_SOURCES = mod_skel.c +mod_skel_la_CFLAGS = $(AM_CFLAGS) +mod_skel_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_skel_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/applications/mod_sms/Makefile.am b/src/mod/applications/mod_sms/Makefile.am new file mode 100644 index 0000000000..50d5cad64c --- /dev/null +++ b/src/mod/applications/mod_sms/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_sms + +mod_LTLIBRARIES = mod_sms.la +mod_sms_la_SOURCES = mod_sms.c +mod_sms_la_CFLAGS = $(AM_CFLAGS) +mod_sms_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_sms_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/applications/mod_snapshot/Makefile.am b/src/mod/applications/mod_snapshot/Makefile.am new file mode 100644 index 0000000000..f20727ba99 --- /dev/null +++ b/src/mod/applications/mod_snapshot/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_snapshot + +mod_LTLIBRARIES = mod_snapshot.la +mod_snapshot_la_SOURCES = mod_snapshot.c +mod_snapshot_la_CFLAGS = $(AM_CFLAGS) +mod_snapshot_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_snapshot_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/applications/mod_snipe_hunt/Makefile.am b/src/mod/applications/mod_snipe_hunt/Makefile.am new file mode 100644 index 0000000000..22bcec0077 --- /dev/null +++ b/src/mod/applications/mod_snipe_hunt/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_snipe_hunt + +mod_LTLIBRARIES = mod_snipe_hunt.la +mod_snipe_hunt_la_SOURCES = mod_snipe_hunt.c +mod_snipe_hunt_la_CFLAGS = $(AM_CFLAGS) +mod_snipe_hunt_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_snipe_hunt_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/applications/mod_snom/Makefile b/src/mod/applications/mod_snom/Makefile deleted file mode 100644 index 2c35e6e98f..0000000000 --- a/src/mod/applications/mod_snom/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -BASE=../../../.. -include $(BASE)/build/modmake.rules diff --git a/src/mod/applications/mod_snom/Makefile.am b/src/mod/applications/mod_snom/Makefile.am new file mode 100644 index 0000000000..0551c854e2 --- /dev/null +++ b/src/mod/applications/mod_snom/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_snom + +mod_LTLIBRARIES = mod_snom.la +mod_snom_la_SOURCES = mod_snom.c +mod_snom_la_CFLAGS = $(AM_CFLAGS) +mod_snom_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_snom_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/applications/mod_sonar/Makefile b/src/mod/applications/mod_sonar/Makefile deleted file mode 100644 index 2c35e6e98f..0000000000 --- a/src/mod/applications/mod_sonar/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -BASE=../../../.. -include $(BASE)/build/modmake.rules diff --git a/src/mod/applications/mod_sonar/Makefile.am b/src/mod/applications/mod_sonar/Makefile.am new file mode 100644 index 0000000000..4398e3c664 --- /dev/null +++ b/src/mod/applications/mod_sonar/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_sonar + +mod_LTLIBRARIES = mod_sonar.la +mod_sonar_la_SOURCES = mod_sonar.c +mod_sonar_la_CFLAGS = $(AM_CFLAGS) +mod_sonar_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_sonar_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/applications/mod_soundtouch/Makefile b/src/mod/applications/mod_soundtouch/Makefile.am similarity index 57% rename from src/mod/applications/mod_soundtouch/Makefile rename to src/mod/applications/mod_soundtouch/Makefile.am index 0afa65ca69..183d71e09f 100644 --- a/src/mod/applications/mod_soundtouch/Makefile +++ b/src/mod/applications/mod_soundtouch/Makefile.am @@ -1,13 +1,18 @@ -BASE=../../../.. +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_soundtouch VERSION=soundtouch-1.7.1 SNDT_SRC=$(switch_srcdir)/libs/soundtouch SNDT_BUILD=$(switch_builddir)/libs/soundtouch -LA=$(SNDT_BUILD)/source/SoundTouch/.libs/libSoundTouch.a +LA=$(SNDT_BUILD)/source/SoundTouch/libSoundTouch.la -LOCAL_CFLAGS += -I$(SNDT_SRC)/include -DINTEGER_SAMPLES -I$(SNDT_BUILD)/include -LOCAL_LIBADD=$(LA) +mod_LTLIBRARIES = mod_soundtouch.la +mod_soundtouch_la_SOURCES = mod_soundtouch.cpp +mod_soundtouch_la_CFLAGS = $(AM_CFLAGS) -I$(SNDT_SRC)/include -DINTEGER_SAMPLES -I$(SNDT_BUILD)/include +mod_soundtouch_la_CXXFLAGS = -I$(SNDT_SRC)/include -DINTEGER_SAMPLES -I$(SNDT_BUILD)/include +mod_soundtouch_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(LA) +mod_soundtouch_la_LDFLAGS = -avoid-version -module -no-undefined -shared -include $(BASE)/build/modmake.rules +BUILT_SOURCES=$(LA) $(SNDT_SRC): $(GETLIB) $(VERSION).tar.gz @@ -21,7 +26,6 @@ $(SNDT_BUILD)/Makefile: $(SNDT_SRC) cd $(SNDT_SRC) && AUTOMAKE="automake --add-missing --foreign --copy" autoreconf -fisv cd ${SNDT_BUILD} && $(DEFAULT_VARS) $(SNDT_SRC)/configure $(DEFAULT_ARGS) --enable-integer-samples --srcdir=$(SNDT_SRC) ${TOUCH_TARGET} - $(LA): $(SNDT_BUILD)/Makefile cd $(SNDT_BUILD) && ${MAKE} diff --git a/src/mod/applications/mod_spandsp/mod_spandsp.c b/src/mod/applications/mod_spandsp/mod_spandsp.c index 41d7212601..be7711aeb4 100644 --- a/src/mod/applications/mod_spandsp/mod_spandsp.c +++ b/src/mod/applications/mod_spandsp/mod_spandsp.c @@ -493,7 +493,7 @@ switch_status_t load_configuration(switch_bool_t reload) } switch_core_new_memory_pool(&spandsp_globals.config_pool); - switch_core_hash_init(&spandsp_globals.tones, spandsp_globals.config_pool); + switch_core_hash_init(&spandsp_globals.tones); spandsp_globals.modem_dialplan = "XML"; spandsp_globals.modem_context = "default"; diff --git a/src/mod/applications/mod_spy/Makefile b/src/mod/applications/mod_spy/Makefile deleted file mode 100644 index 2c35e6e98f..0000000000 --- a/src/mod/applications/mod_spy/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -BASE=../../../.. -include $(BASE)/build/modmake.rules diff --git a/src/mod/applications/mod_spy/Makefile.am b/src/mod/applications/mod_spy/Makefile.am new file mode 100644 index 0000000000..619c2b1278 --- /dev/null +++ b/src/mod/applications/mod_spy/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_spy + +mod_LTLIBRARIES = mod_spy.la +mod_spy_la_SOURCES = mod_spy.c +mod_spy_la_CFLAGS = $(AM_CFLAGS) +mod_spy_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_spy_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/applications/mod_spy/mod_spy.c b/src/mod/applications/mod_spy/mod_spy.c index 80cacec402..b19b634a23 100644 --- a/src/mod/applications/mod_spy/mod_spy.c +++ b/src/mod/applications/mod_spy/mod_spy.c @@ -139,8 +139,8 @@ SWITCH_STANDARD_API(dump_hash) switch_thread_rwlock_rdlock(globals.spy_hash_lock); - for (hi = switch_hash_first(NULL, globals.spy_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, &key, NULL, &val); + for (hi = switch_core_hash_first( globals.spy_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, &key, NULL, &val); spy = (spy_t *) val; stream->write_function(stream, "%s :"); @@ -319,7 +319,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_spy_load) globals.pool = pool; - switch_core_hash_init(&globals.spy_hash, pool); + switch_core_hash_init(&globals.spy_hash); switch_thread_rwlock_create(&globals.spy_hash_lock, pool); globals.spy_count = 0; diff --git a/src/mod/applications/mod_translate/Makefile.am b/src/mod/applications/mod_translate/Makefile.am new file mode 100644 index 0000000000..1bc12aa22d --- /dev/null +++ b/src/mod/applications/mod_translate/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_translate + +mod_LTLIBRARIES = mod_translate.la +mod_translate_la_SOURCES = mod_translate.c +mod_translate_la_CFLAGS = $(AM_CFLAGS) +mod_translate_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_translate_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/applications/mod_translate/mod_translate.c b/src/mod/applications/mod_translate/mod_translate.c index 87f0a14e3d..469d0ba2d3 100644 --- a/src/mod/applications/mod_translate/mod_translate.c +++ b/src/mod/applications/mod_translate/mod_translate.c @@ -170,13 +170,13 @@ static void do_unload(void) { switch_mutex_lock(MUTEX); - while ((hi = switch_hash_first(NULL, globals.translate_profiles))) { + while ((hi = switch_core_hash_first( globals.translate_profiles))) { void *val = NULL; const void *key; switch_ssize_t keylen; translate_rule_t *rl, *nrl; - switch_hash_this(hi, &key, &keylen, &val); + switch_core_hash_this(hi, &key, &keylen, &val); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "deleting translate profile [%s]\n", (char *) key); for (nrl = val; rl;) { @@ -201,7 +201,7 @@ static void do_load(void) { switch_mutex_lock(MUTEX); - switch_core_hash_init(&globals.translate_profiles, globals.pool); + switch_core_hash_init(&globals.translate_profiles); switch_thread_rwlock_create(&globals.profile_hash_rwlock, globals.pool); load_config(); diff --git a/src/mod/applications/mod_valet_parking/Makefile.am b/src/mod/applications/mod_valet_parking/Makefile.am new file mode 100644 index 0000000000..e45006a5d6 --- /dev/null +++ b/src/mod/applications/mod_valet_parking/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_valet_parking + +mod_LTLIBRARIES = mod_valet_parking.la +mod_valet_parking_la_SOURCES = mod_valet_parking.c +mod_valet_parking_la_CFLAGS = $(AM_CFLAGS) +mod_valet_parking_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_valet_parking_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/applications/mod_valet_parking/mod_valet_parking.c b/src/mod/applications/mod_valet_parking/mod_valet_parking.c index 2ead3186c9..a7947cf2c6 100644 --- a/src/mod/applications/mod_valet_parking/mod_valet_parking.c +++ b/src/mod/applications/mod_valet_parking/mod_valet_parking.c @@ -71,7 +71,7 @@ static valet_lot_t *valet_find_lot(const char *name, switch_bool_t create) switch_zmalloc(lot, sizeof(*lot)); lot->name = strdup(name); switch_mutex_init(&lot->mutex, SWITCH_MUTEX_NESTED, globals.pool); - switch_core_hash_init(&lot->hash, NULL); + switch_core_hash_init(&lot->hash); switch_core_hash_insert(globals.hash, name, lot); } switch_mutex_unlock(globals.mutex); @@ -120,8 +120,8 @@ static void check_timeouts(void) } globals.last_timeout_check = now; - for (hi = switch_hash_first(NULL, globals.hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, &var, NULL, &val); + for (hi = switch_core_hash_first( globals.hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, &var, NULL, &val); switch_console_push_match(&matches, (const char *) var); } switch_mutex_unlock(globals.mutex); @@ -135,8 +135,8 @@ static void check_timeouts(void) top: - for (i_hi = switch_hash_first(NULL, lot->hash); i_hi; i_hi = switch_hash_next(i_hi)) { - switch_hash_this(i_hi, &i_var, NULL, &i_val); + for (i_hi = switch_core_hash_first( lot->hash); i_hi; i_hi = switch_core_hash_next(i_hi)) { + switch_core_hash_this(i_hi, &i_var, NULL, &i_val); i_ext = (char *) i_var; token = (valet_token_t *) i_val; @@ -167,9 +167,9 @@ static int find_longest(valet_lot_t *lot, int min, int max) time_t now = switch_epoch_time_now(NULL); switch_mutex_lock(lot->mutex); - for (i_hi = switch_hash_first(NULL, lot->hash); i_hi; i_hi = switch_hash_next(i_hi)) { + for (i_hi = switch_core_hash_first( lot->hash); i_hi; i_hi = switch_core_hash_next(i_hi)) { int i; - switch_hash_this(i_hi, &i_var, NULL, &i_val); + switch_core_hash_this(i_hi, &i_var, NULL, &i_val); token = (valet_token_t *) i_val; cur = (now - token->start_time); i = atoi(token->ext); @@ -257,8 +257,8 @@ static int valet_lot_count(valet_lot_t *lot) now = switch_epoch_time_now(NULL); switch_mutex_lock(lot->mutex); - for (i_hi = switch_hash_first(NULL, lot->hash); i_hi; i_hi = switch_hash_next(i_hi)) { - switch_hash_this(i_hi, &i_var, NULL, &i_val); + for (i_hi = switch_core_hash_first( lot->hash); i_hi; i_hi = switch_core_hash_next(i_hi)) { + switch_core_hash_this(i_hi, &i_var, NULL, &i_val); token = (valet_token_t *) i_val; if (token->timeout > 0 && (token->timeout < now || token->timeout == 1)) { continue; @@ -738,13 +738,13 @@ SWITCH_STANDARD_API(valet_info_function) stream->write_function(stream, "\n"); switch_mutex_lock(globals.mutex); - for (hi = switch_hash_first(NULL, globals.hash); hi; hi = switch_hash_next(hi)) { + for (hi = switch_core_hash_first( globals.hash); hi; hi = switch_core_hash_next(hi)) { switch_hash_index_t *i_hi; const void *i_var; void *i_val; char *i_ext; - switch_hash_this(hi, &var, NULL, &val); + switch_core_hash_this(hi, &var, NULL, &val); name = (char *) var; lot = (valet_lot_t *) val; @@ -754,10 +754,10 @@ SWITCH_STANDARD_API(valet_info_function) stream->write_function(stream, " \n", name); switch_mutex_lock(lot->mutex); - for (i_hi = switch_hash_first(NULL, lot->hash); i_hi; i_hi = switch_hash_next(i_hi)) { + for (i_hi = switch_core_hash_first( lot->hash); i_hi; i_hi = switch_core_hash_next(i_hi)) { valet_token_t *token; - switch_hash_this(i_hi, &i_var, NULL, &i_val); + switch_core_hash_this(i_hi, &i_var, NULL, &i_val); i_ext = (char *) i_var; token = (valet_token_t *) i_val; @@ -848,8 +848,8 @@ static void pres_event_handler(switch_event_t *event) const char *nvar; switch_mutex_lock(globals.mutex); - for (hi = switch_hash_first(NULL, globals.hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, &var, NULL, &val); + for (hi = switch_core_hash_first( globals.hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, &var, NULL, &val); nvar = (const char *) var; if (!strchr(nvar, '@') || switch_stristr(domain_name, nvar)) { @@ -930,7 +930,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_valet_parking_load) memset(&globals, 0, sizeof(globals)); globals.pool = pool; - switch_core_hash_init(&globals.hash, NULL); + switch_core_hash_init(&globals.hash); switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, globals.pool); /* connect my internal structure to the blank pointer passed to me */ diff --git a/src/mod/applications/mod_vmd/Makefile.am b/src/mod/applications/mod_vmd/Makefile.am new file mode 100644 index 0000000000..32af585ef8 --- /dev/null +++ b/src/mod/applications/mod_vmd/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_vmd + +mod_LTLIBRARIES = mod_vmd.la +mod_vmd_la_SOURCES = mod_vmd.c +mod_vmd_la_CFLAGS = $(AM_CFLAGS) +mod_vmd_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_vmd_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/applications/mod_voicemail/Makefile.am b/src/mod/applications/mod_voicemail/Makefile.am new file mode 100644 index 0000000000..c658468a33 --- /dev/null +++ b/src/mod/applications/mod_voicemail/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_voicemail + +mod_LTLIBRARIES = mod_voicemail.la +mod_voicemail_la_SOURCES = mod_voicemail.c +mod_voicemail_la_CFLAGS = $(AM_CFLAGS) +mod_voicemail_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_voicemail_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/applications/mod_voicemail/mod_voicemail.c b/src/mod/applications/mod_voicemail/mod_voicemail.c index 7b19974bcb..bfc2fdd891 100644 --- a/src/mod/applications/mod_voicemail/mod_voicemail.c +++ b/src/mod/applications/mod_voicemail/mod_voicemail.c @@ -3866,9 +3866,9 @@ SWITCH_STANDARD_API(boxcount_api_function) /* Kept for backwards-compatibility */ switch_hash_index_t *hi; switch_mutex_lock(globals.mutex); - if ((hi = switch_hash_first(NULL, globals.profile_hash))) { + if ((hi = switch_core_hash_first( globals.profile_hash))) { void *val; - switch_hash_this(hi, NULL, NULL, &val); + switch_core_hash_this(hi, NULL, NULL, &val); profile = (vm_profile_t *) val; total_new_messages = total_saved_messages = 0; message_count(profile, id, domain, "inbox", &total_new_messages, &total_saved_messages, @@ -4020,8 +4020,8 @@ static void actual_message_query_handler(switch_event_t *event) "Cound not find a profile for domain: [%s] Returning 0 messages\nWhen message-query-exact-match is enabled you must have a dedicated vm profile per distinct domain name you wish to use.\n", domain); } } else { - for (hi = switch_hash_first(NULL, globals.profile_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, NULL, NULL, &val); + for (hi = switch_core_hash_first( globals.profile_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, NULL, NULL, &val); profile = (vm_profile_t *) val; parse_profile(); @@ -4923,8 +4923,8 @@ SWITCH_STANDARD_API(voicemail_api_function) } else if (!strcasecmp(argv[0], "status")) { stream->write_function(stream, "============================\n"); switch_mutex_lock(globals.mutex); - for (hi = switch_hash_first(NULL, globals.profile_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, NULL, NULL, &val); + for (hi = switch_core_hash_first( globals.profile_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, NULL, NULL, &val); profile = (vm_profile_t *) val; stream->write_function(stream, "Profile: %s\n", profile->name); } @@ -4958,8 +4958,8 @@ SWITCH_STANDARD_API(voicemail_api_function) void *value; switch_mutex_lock(globals.mutex); - for (index = switch_hash_first(NULL, globals.profile_hash); index; index = switch_hash_next(index)) { - switch_hash_this(index, NULL, NULL, &value); + for (index = switch_core_hash_first( globals.profile_hash); index; index = switch_core_hash_next(index)) { + switch_core_hash_this(index, NULL, NULL, &value); profile = (vm_profile_t *) value; if (profile) { switch_thread_rwlock_rdlock(profile->rwlock); @@ -6179,7 +6179,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_voicemail_load) memset(&globals, 0, sizeof(globals)); globals.pool = pool; - switch_core_hash_init(&globals.profile_hash, globals.pool); + switch_core_hash_init(&globals.profile_hash); switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, globals.pool); switch_mutex_lock(globals.mutex); @@ -6261,8 +6261,8 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_voicemail_shutdown) } switch_mutex_lock(globals.mutex); - while ((hi = switch_hash_first(NULL, globals.profile_hash))) { - switch_hash_this(hi, &key, &keylen, &val); + while ((hi = switch_core_hash_first( globals.profile_hash))) { + switch_core_hash_this(hi, &key, &keylen, &val); profile = (vm_profile_t *) val; switch_core_hash_delete(globals.profile_hash, profile->name); diff --git a/src/mod/applications/mod_voicemail_ivr/Makefile b/src/mod/applications/mod_voicemail_ivr/Makefile deleted file mode 100644 index 38f5aae0a7..0000000000 --- a/src/mod/applications/mod_voicemail_ivr/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -BASE=../../../.. -LOCAL_OBJS=ivr.o utils.o config.o menu.o -include $(BASE)/build/modmake.rules diff --git a/src/mod/applications/mod_voicemail_ivr/Makefile.am b/src/mod/applications/mod_voicemail_ivr/Makefile.am new file mode 100644 index 0000000000..bfd707557e --- /dev/null +++ b/src/mod/applications/mod_voicemail_ivr/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_voicemail_ivr + +mod_LTLIBRARIES = mod_voicemail_ivr.la +mod_voicemail_ivr_la_SOURCES = mod_voicemail_ivr.c ivr.c utils.c config.c menu.c +mod_voicemail_ivr_la_CFLAGS = $(AM_CFLAGS) +mod_voicemail_ivr_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_voicemail_ivr_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/asr_tts/mod_cepstral/Makefile b/src/mod/asr_tts/mod_cepstral/Makefile deleted file mode 100644 index ef6abc834e..0000000000 --- a/src/mod/asr_tts/mod_cepstral/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -LOCAL_INSERT_LDFLAGS=if test $$osarch = "Darwin" ; then echo "-framework swift" ; else echo "-L$(SWIFT_HOME)/lib -L/opt/swift/lib -lswift -lm" ; fi ; - -LOCAL_INSERT_CFLAGS=if test $$osarch = "Darwin" ; then echo "-I/Library/Frameworks/swift.framework/Versions/5/Headers/" ; else echo "-I$(SWIFT_HOME)/include -I/opt/swift/include"; fi ; -LOCAL_CFLAGS=-w -include ../../../../build/modmake.rules - diff --git a/src/mod/asr_tts/mod_cepstral/Makefile.am b/src/mod/asr_tts/mod_cepstral/Makefile.am new file mode 100644 index 0000000000..45d23c6546 --- /dev/null +++ b/src/mod/asr_tts/mod_cepstral/Makefile.am @@ -0,0 +1,17 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_cepstral + +mod_LTLIBRARIES = mod_cepstral.la +mod_cepstral_la_SOURCES = mod_cepstral.c +mod_cepstral_la_CFLAGS = $(AM_CFLAGS) -w +mod_cepstral_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_cepstral_la_LDFLAGS = -avoid-version -module -no-undefined -shared + +if ISMAC +mod_cepstral_la_LDFLAGS += -framework swift +mod_cepstral_la_CFLAGS += -I/Library/Frameworks/swift.framework/Versions/5/Headers/ +else +mod_cepstral_la_LDFLAGS += -L$(SWIFT_HOME)/lib -L/opt/swift/lib -lswift -lm +mod_cepstral_la_CFLAGS += -I$(SWIFT_HOME)/include -I/opt/swift/include +endif + diff --git a/src/mod/asr_tts/mod_flite/Makefile b/src/mod/asr_tts/mod_flite/Makefile.am similarity index 75% rename from src/mod/asr_tts/mod_flite/Makefile rename to src/mod/asr_tts/mod_flite/Makefile.am index 360eb611e1..d26f774366 100644 --- a/src/mod/asr_tts/mod_flite/Makefile +++ b/src/mod/asr_tts/mod_flite/Makefile.am @@ -1,3 +1,6 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_flite + FLITE=flite-1.5.4 FLITE_DIR=$(switch_srcdir)/libs/$(FLITE)-current @@ -11,13 +14,14 @@ FLITE_A=$(FLITE_LIBDIR)/libflite_cmu_us_awb.a \ $(FLITE_LIBDIR)/libflite_cmu_us_slt.a \ $(FLITE_LIBDIR)/libflite_cmulex.a $(FLITE_LIBDIR)/libflite_usenglish.a $(FLITE_LIBDIR)/libflite.a -lm -LOCAL_CFLAGS=-I$(FLITE_DIR)/include -I$(FLITE_BUILDDIR)/include -LOCAL_LIBADD=$(FLITE_A) +mod_LTLIBRARIES = mod_flite.la +mod_flite_la_SOURCES = mod_flite.c +mod_flite_la_CFLAGS = $(AM_CFLAGS) -I$(FLITE_DIR)/include -I$(FLITE_BUILDDIR)/include +mod_flite_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(FLITE_A) +mod_flite_la_LDFLAGS = -avoid-version -module -no-undefined -shared -BASE=../../../.. -include $(BASE)/build/modmake.rules +BUILT_SOURCES= $(FLITE_A) -$(MODNAME).lo: $(FLITE_A) $(FLITE_DIR): $(GETLIB) $(FLITE)-current.tar.bz2 diff --git a/src/mod/asr_tts/mod_pocketsphinx/Makefile b/src/mod/asr_tts/mod_pocketsphinx/Makefile.am similarity index 77% rename from src/mod/asr_tts/mod_pocketsphinx/Makefile rename to src/mod/asr_tts/mod_pocketsphinx/Makefile.am index 6a5ab196c2..352d916a15 100644 --- a/src/mod/asr_tts/mod_pocketsphinx/Makefile +++ b/src/mod/asr_tts/mod_pocketsphinx/Makefile.am @@ -1,3 +1,6 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_pocketsphinx + SPHINXBASE=sphinxbase-0.7 SPHINXBASE_DIR=$(switch_srcdir)/libs/$(SPHINXBASE) SPHINXBASE_BUILDDIR=$(switch_builddir)/libs/$(SPHINXBASE) @@ -11,12 +14,13 @@ POCKETSPHINX_LA=$(POCKETSPHINX_BUILDDIR)/src/libpocketsphinx/libpocketsphinx.la SPHINXMODEL=communicator_semi_6000_20080321 -LOCAL_CFLAGS=-I$(SPHINXBASE_DIR)/include -I$(POCKETSPHINX_DIR)/include -LOCAL_LIBADD=$(POCKETSPHINX_LA) $(SPHINXBASE_LA) $(SPHINXBASE_LA2) -BASE=../../../.. -include $(BASE)/build/modmake.rules +mod_LTLIBRARIES = mod_pocketsphinx.la +mod_pocketsphinx_la_SOURCES = mod_pocketsphinx.c +mod_pocketsphinx_la_CFLAGS = $(AM_CFLAGS) -I$(SPHINXBASE_DIR)/include -I$(POCKETSPHINX_DIR)/include +mod_pocketsphinx_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(POCKETSPHINX_LA) $(SPHINXBASE_LA) $(SPHINXBASE_LA2) +mod_pocketsphinx_la_LDFLAGS = -avoid-version -module -no-undefined -shared -mod_pocketsphinx.lo: $(POCKETSPHINX_LA) $(SPHINXBASE_LA) $(SPHINXBASE_LA2) +BUILT_SOURCES=$(POCKETSPHINX_LA) $(SPHINXBASE_LA) $(SPHINXBASE_LA2) $(SPHINXBASE_DIR): $(GETLIB) $(SPHINXBASE).tar.gz @@ -62,5 +66,5 @@ $(DESTDIR)$(grammardir)/model/communicator: dictionary: @install -m0644 $(POCKETSPHINX_DIR)/model/lm/en_US/cmu07a.dic $(DESTDIR)$(grammardir)/default.dic -local_install: $(DESTDIR)$(grammardir)/model $(DESTDIR)$(grammardir)/model/communicator dictionary +install: $(DESTDIR)$(grammardir)/model $(DESTDIR)$(grammardir)/model/communicator dictionary diff --git a/src/mod/asr_tts/mod_tts_commandline/Makefile.am b/src/mod/asr_tts/mod_tts_commandline/Makefile.am new file mode 100644 index 0000000000..10bc342178 --- /dev/null +++ b/src/mod/asr_tts/mod_tts_commandline/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_tts_commandline + +mod_LTLIBRARIES = mod_tts_commandline.la +mod_tts_commandline_la_SOURCES = mod_tts_commandline.c +mod_tts_commandline_la_CFLAGS = $(AM_CFLAGS) +mod_tts_commandline_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_tts_commandline_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/asr_tts/mod_tts_commandline/mod_tts_commandline.c b/src/mod/asr_tts/mod_tts_commandline/mod_tts_commandline.c index ab059f1f3a..6ff5bada84 100644 --- a/src/mod/asr_tts/mod_tts_commandline/mod_tts_commandline.c +++ b/src/mod/asr_tts/mod_tts_commandline/mod_tts_commandline.c @@ -29,8 +29,8 @@ * */ -#include #include +#include SWITCH_MODULE_LOAD_FUNCTION(mod_tts_commandline_load); SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_tts_commandline_shutdown); diff --git a/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c b/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c index 600ce37fe5..ece3025579 100644 --- a/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c +++ b/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c @@ -538,8 +538,8 @@ static switch_status_t profile_create(profile_t ** profile, const char *name, sw lprofile->gsl_mime_type = "application/x-nuance-gsl"; lprofile->jsgf_mime_type = "application/x-jsgf"; lprofile->ssml_mime_type = "application/ssml+xml"; - switch_core_hash_init(&lprofile->default_synth_params, pool); - switch_core_hash_init(&lprofile->default_recog_params, pool); + switch_core_hash_init(&lprofile->default_synth_params); + switch_core_hash_init(&lprofile->default_recog_params); *profile = lprofile; if (globals.enable_profile_events && switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, MY_EVENT_PROFILE_CREATE) == SWITCH_STATUS_SUCCESS) { @@ -873,7 +873,7 @@ static switch_status_t speech_channel_create(speech_channel_t ** schannel, const status = SWITCH_STATUS_FALSE; goto done; } - switch_core_hash_init(&schan->params, pool); + switch_core_hash_init(&schan->params); schan->data = NULL; if (zstr(name)) { schan->name = ""; @@ -1155,11 +1155,11 @@ static switch_status_t synth_channel_set_params(speech_channel_t *schannel, mrcp { /* loop through each param and add to synth header or vendor-specific-params */ switch_hash_index_t *hi = NULL; - for (hi = switch_hash_first(NULL, schannel->params); hi; hi = switch_hash_next(hi)) { + for (hi = switch_core_hash_first( schannel->params); hi; hi = switch_core_hash_next(hi)) { char *param_name = NULL, *param_val = NULL; const void *key; void *val; - switch_hash_this(hi, &key, NULL, &val); + switch_core_hash_this(hi, &key, NULL, &val); param_name = (char *) key; param_val = (char *) val; if (!zstr(param_name) && !zstr(param_val)) { @@ -1630,11 +1630,11 @@ static switch_status_t synth_speech_open(switch_speech_handle_t *sh, const char } /* Set default TTS params */ - for (hi = switch_hash_first(NULL, profile->default_synth_params); hi; hi = switch_hash_next(hi)) { + for (hi = switch_core_hash_first( profile->default_synth_params); hi; hi = switch_core_hash_next(hi)) { char *param_name = NULL, *param_val = NULL; const void *key; void *val; - switch_hash_this(hi, &key, NULL, &val); + switch_core_hash_this(hi, &key, NULL, &val); param_name = (char *) key; param_val = (char *) val; speech_channel_set_param(schannel, param_name, param_val); @@ -2047,11 +2047,11 @@ static switch_status_t synth_load(switch_loadable_module_interface_t *module_int mrcp_client_application_register(globals.mrcp_client, globals.synth.app, "synth"); /* map FreeSWITCH params to MRCP param */ - switch_core_hash_init_nocase(&globals.synth.fs_param_map, pool); + switch_core_hash_init_nocase(&globals.synth.fs_param_map); switch_core_hash_insert(globals.synth.fs_param_map, "voice", "voice-name"); /* map MRCP params to UniMRCP ID */ - switch_core_hash_init_nocase(&globals.synth.param_id_map, pool); + switch_core_hash_init_nocase(&globals.synth.param_id_map); switch_core_hash_insert(globals.synth.param_id_map, "jump-size", unimrcp_param_id_create(SYNTHESIZER_HEADER_JUMP_SIZE, pool)); switch_core_hash_insert(globals.synth.param_id_map, "kill-on-barge-in", unimrcp_param_id_create(SYNTHESIZER_HEADER_KILL_ON_BARGE_IN, pool)); switch_core_hash_insert(globals.synth.param_id_map, "speaker-profile", unimrcp_param_id_create(SYNTHESIZER_HEADER_SPEAKER_PROFILE, pool)); @@ -2192,12 +2192,12 @@ static switch_status_t recog_channel_start(speech_channel_t *schannel) r->timers_started = zstr(start_input_timers) || strcasecmp(start_input_timers, "false"); /* count enabled grammars */ - for (egk = switch_hash_first(NULL, r->enabled_grammars); egk; egk = switch_hash_next(egk)) { + for (egk = switch_core_hash_first( r->enabled_grammars); egk; egk = switch_core_hash_next(egk)) { // NOTE: This postponed type check is necessary to allow a non-URI-list grammar to execute alone if (grammar_uri_count == 1 && grammar->type != GRAMMAR_TYPE_URI) goto no_grammar_alone; ++grammar_uri_count; - switch_hash_this(egk, (void *) &key, NULL, (void *) &grammar); + switch_core_hash_this(egk, (void *) &key, NULL, (void *) &grammar); if (grammar->type != GRAMMAR_TYPE_URI && grammar_uri_count != 1) { no_grammar_alone: switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "(%s) Grammar '%s' can only be used alone (not a URI list)\n", schannel->name, key); @@ -2224,8 +2224,8 @@ static switch_status_t recog_channel_start(speech_channel_t *schannel) /* get the enabled grammars list */ grammar_uri_list = switch_core_alloc(schannel->memory_pool, grammar_uri_list_len + 1); grammar_uri_list_len = 0; - for (egk = switch_hash_first(NULL, r->enabled_grammars); egk; egk = switch_hash_next(egk)) { - switch_hash_this(egk, (void *) &key, NULL, (void *) &grammar); + for (egk = switch_core_hash_first( r->enabled_grammars); egk; egk = switch_core_hash_next(egk)) { + switch_core_hash_this(egk, (void *) &key, NULL, (void *) &grammar); len = strlen(grammar->data); if (!len) continue; @@ -2497,7 +2497,7 @@ static switch_status_t recog_channel_disable_all_grammars(speech_channel_t *scha recognizer_data_t *r = (recognizer_data_t *) schannel->data; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) Disabling all grammars\n", schannel->name); switch_core_hash_destroy(&r->enabled_grammars); - switch_core_hash_init(&r->enabled_grammars, schannel->memory_pool); + switch_core_hash_init(&r->enabled_grammars); return status; } @@ -2807,11 +2807,11 @@ static switch_status_t recog_channel_set_params(speech_channel_t *schannel, mrcp { /* loop through each param and add to recog header or vendor-specific-params */ switch_hash_index_t *hi = NULL; - for (hi = switch_hash_first(NULL, schannel->params); hi; hi = switch_hash_next(hi)) { + for (hi = switch_core_hash_first( schannel->params); hi; hi = switch_core_hash_next(hi)) { char *param_name = NULL, *param_val = NULL; const void *key; void *val; - switch_hash_this(hi, &key, NULL, &val); + switch_core_hash_this(hi, &key, NULL, &val); param_name = (char *) key; param_val = (char *) val; if (!zstr(param_name) && !zstr(param_val)) { @@ -3111,8 +3111,8 @@ static switch_status_t recog_asr_open(switch_asr_handle_t *ah, const char *codec r = (recognizer_data_t *) switch_core_alloc(ah->memory_pool, sizeof(recognizer_data_t)); schannel->data = r; memset(r, 0, sizeof(recognizer_data_t)); - switch_core_hash_init(&r->grammars, ah->memory_pool); - switch_core_hash_init(&r->enabled_grammars, ah->memory_pool); + switch_core_hash_init(&r->grammars); + switch_core_hash_init(&r->enabled_grammars); /* Open the channel */ if (zstr(profile_name)) { @@ -3129,11 +3129,11 @@ static switch_status_t recog_asr_open(switch_asr_handle_t *ah, const char *codec } /* Set default ASR params */ - for (hi = switch_hash_first(NULL, profile->default_recog_params); hi; hi = switch_hash_next(hi)) { + for (hi = switch_core_hash_first( profile->default_recog_params); hi; hi = switch_core_hash_next(hi)) { char *param_name = NULL, *param_val = NULL; const void *key; void *val; - switch_hash_this(hi, &key, NULL, &val); + switch_core_hash_this(hi, &key, NULL, &val); param_name = (char *) key; param_val = (char *) val; speech_channel_set_param(schannel, param_name, param_val); @@ -3794,12 +3794,12 @@ static switch_status_t recog_load(switch_loadable_module_interface_t *module_int mrcp_client_application_register(globals.mrcp_client, globals.recog.app, "recog"); /* map FreeSWITCH params or old params to MRCPv2 param */ - switch_core_hash_init_nocase(&globals.recog.fs_param_map, pool); + switch_core_hash_init_nocase(&globals.recog.fs_param_map); /* MRCPv1 param */ switch_core_hash_insert(globals.recog.fs_param_map, "recognizer-start-timers", "start-input-timers"); /* map MRCP params to UniMRCP ID */ - switch_core_hash_init_nocase(&globals.recog.param_id_map, pool); + switch_core_hash_init_nocase(&globals.recog.param_id_map); switch_core_hash_insert(globals.recog.param_id_map, "Confidence-Threshold", unimrcp_param_id_create(RECOGNIZER_HEADER_CONFIDENCE_THRESHOLD, pool)); switch_core_hash_insert(globals.recog.param_id_map, "Sensitivity-Level", unimrcp_param_id_create(RECOGNIZER_HEADER_SENSITIVITY_LEVEL, pool)); switch_core_hash_insert(globals.recog.param_id_map, "Speed-Vs-Accuracy", unimrcp_param_id_create(RECOGNIZER_HEADER_SPEED_VS_ACCURACY, pool)); @@ -4332,7 +4332,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_unimrcp_load) memset(&globals, 0, sizeof(globals)); switch_mutex_init(&globals.mutex, SWITCH_MUTEX_UNNESTED, pool); globals.speech_channel_number = 0; - switch_core_hash_init_nocase(&globals.profiles, pool); + switch_core_hash_init_nocase(&globals.profiles); /* get MRCP module configuration */ mod_unimrcp_do_config(); diff --git a/src/mod/codecs/mod_amr/Makefile b/src/mod/codecs/mod_amr/Makefile deleted file mode 100644 index a0d8e51c01..0000000000 --- a/src/mod/codecs/mod_amr/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -BASE=../../../.. - -AMR_DIR=$(switch_srcdir)/libs/amr -AMR_BUILDDIR=$(switch_builddir)/libs/amr -AMR_A=$(AMR_BUILDDIR)/libamr.a - -LOCAL_INSERT_CFLAGS=if test -d $(AMR_DIR); then echo "-I$(AMR_DIR)" ; else echo "-DAMR_PASSTHROUGH" ; fi ; -LOCAL_INSERT_LDFLAGS=test ! -d $(AMR_DIR) || echo "$(AMR_A)"; - - -include $(BASE)/build/modmake.rules diff --git a/src/mod/codecs/mod_amr/Makefile.am b/src/mod/codecs/mod_amr/Makefile.am new file mode 100644 index 0000000000..09502d8a3f --- /dev/null +++ b/src/mod/codecs/mod_amr/Makefile.am @@ -0,0 +1,21 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_amr + +AMR_DIR=$(switch_srcdir)/libs/amr +AMR_BUILDDIR=$(switch_builddir)/libs/amr +AMR_A=$(AMR_BUILDDIR)/libamr.a + +mod_LTLIBRARIES = mod_amr.la +mod_amr_la_SOURCES = mod_amr.c +mod_amr_la_CFLAGS = $(AM_CFLAGS) +mod_amr_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_amr_la_LDFLAGS = -avoid-version -module -no-undefined -shared + +if HAVE_AMR +BUILT_SOURCES= $(AMR_A) +mod_amr_la_CFLAGS += -I$(AMR_DIR) +mod_amr_la_LIBADD += $(AMR_A) +else +mod_amr_la_CFLAGS += -DAMR_PASSTHROUGH +endif + diff --git a/src/mod/codecs/mod_amrwb/Makefile b/src/mod/codecs/mod_amrwb/Makefile deleted file mode 100644 index 13853ffbb7..0000000000 --- a/src/mod/codecs/mod_amrwb/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -BASE=../../../.. - -AMR_DIR=$(switch_srcdir)/libs/amrwb -AMR_BUILDDIR=$(switch_builddir)/libs/amrwb -AMR_A=$(AMR_BUILDDIR)/libamrwb.a - -LOCAL_INSERT_CFLAGS=if test -d $(AMR_DIR); then echo "-I$(AMR_DIR)" ; else echo "-DAMRWB_PASSTHROUGH" ; fi ; -LOCAL_INSERT_LDFLAGS=test ! -d $(AMR_DIR) || echo "$(AMR_A)"; - - -include $(BASE)/build/modmake.rules diff --git a/src/mod/codecs/mod_amrwb/Makefile.am b/src/mod/codecs/mod_amrwb/Makefile.am new file mode 100644 index 0000000000..ddb1a56999 --- /dev/null +++ b/src/mod/codecs/mod_amrwb/Makefile.am @@ -0,0 +1,21 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_amrwb + +AMRWB_DIR=$(switch_srcdir)/libs/amrwb +AMRWB_BUILDDIR=$(switch_builddir)/libs/amrwb +AMRWB_A=$(AMRWB_BUILDDIR)/libamrwb.a + +mod_LTLIBRARIES = mod_amrwb.la +mod_amrwb_la_SOURCES = mod_amrwb.c +mod_amrwb_la_CFLAGS = $(AM_CFLAGS) +mod_amrwb_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_amrwb_la_LDFLAGS = -avoid-version -module -no-undefined -shared + +if HAVE_AMRWB +BUILT_SOURCES= $(AMRWB_A) +mod_amrwb_la_CFLAGS += -I$(AMRWB_DIR) +mod_amrwb_la_LIBADD += $(AMRWB_A) +else +mod_amrwb_la_CFLAGS += -DAMRWB_PASSTHROUGH +endif + diff --git a/src/mod/codecs/mod_b64/Makefile.am b/src/mod/codecs/mod_b64/Makefile.am new file mode 100644 index 0000000000..6769f8bc82 --- /dev/null +++ b/src/mod/codecs/mod_b64/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_b64 + +mod_LTLIBRARIES = mod_b64.la +mod_b64_la_SOURCES = mod_b64.c +mod_b64_la_CFLAGS = $(AM_CFLAGS) +mod_b64_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_b64_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/codecs/mod_bv/Makefile b/src/mod/codecs/mod_bv/Makefile deleted file mode 100644 index b1de8946e4..0000000000 --- a/src/mod/codecs/mod_bv/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -BASE=../../../.. - -BV_DIR=$(switch_srcdir)/libs/broadvoice -BV_BUILDDIR=$(switch_builddir)/libs/broadvoice -LOCAL_CFLAGS=-I$(BV_BUILDDIR)/src -I$(BV_DIR)/src -BV_LA=$(BV_BUILDDIR)/src/.libs/libbroadvoice.la -LOCAL_LIBADD=$(BV_LA) -include $(BASE)/build/modmake.rules - -$(BV_LA): $(BV_DIR)/.update - cd $(BV_BUILDDIR) && $(MAKE) - $(TOUCH_TARGET) - diff --git a/src/mod/codecs/mod_bv/Makefile.am b/src/mod/codecs/mod_bv/Makefile.am new file mode 100644 index 0000000000..db4b41590a --- /dev/null +++ b/src/mod/codecs/mod_bv/Makefile.am @@ -0,0 +1,17 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_bv + +BV_DIR=$(switch_srcdir)/libs/broadvoice +BV_BUILDDIR=$(switch_builddir)/libs/broadvoice +BV_LA=$(BV_BUILDDIR)/src/.libs/libbroadvoice.la +BUILT_SOURCES=$(BV_LA) + +mod_LTLIBRARIES = mod_bv.la +mod_bv_la_SOURCES = mod_bv.c +mod_bv_la_CFLAGS = $(AM_CFLAGS) -I$(BV_BUILDDIR)/src -I$(BV_DIR)/src +mod_bv_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(BV_LA) +mod_bv_la_LDFLAGS = -avoid-version -module -no-undefined -shared + +$(BV_LA): $(BV_DIR)/.update + cd $(BV_BUILDDIR) && $(MAKE) + $(TOUCH_TARGET) diff --git a/src/mod/codecs/mod_celt/Makefile b/src/mod/codecs/mod_celt/Makefile.am similarity index 52% rename from src/mod/codecs/mod_celt/Makefile rename to src/mod/codecs/mod_celt/Makefile.am index a3cf7b36c5..e9611bd575 100644 --- a/src/mod/codecs/mod_celt/Makefile +++ b/src/mod/codecs/mod_celt/Makefile.am @@ -1,20 +1,25 @@ -BASE=../../../.. +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_celt CELT=celt-0.10.0 CELT_DIR=$(switch_srcdir)/libs/$(CELT) CELT_BUILDDIR=$(switch_builddir)/libs/$(CELT) -LOCAL_CFLAGS=-I$(CELT_DIR)/libcelt CELT_LA=$(CELT_BUILDDIR)/libcelt/.libs/libcelt0.la -LOCAL_LIBADD=$(CELT_LA) -include $(BASE)/build/modmake.rules +mod_LTLIBRARIES = mod_celt.la +mod_celt_la_SOURCES = mod_celt.c +mod_celt_la_CFLAGS = $(AM_CFLAGS) -I$(CELT_DIR)/libcelt +mod_celt_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(CELT_LA) +mod_celt_la_LDFLAGS = -avoid-version -module -no-undefined -shared + +BUILT_SOURCES=$(CELT_LA) $(CELT_DIR): $(GETLIB) $(CELT).tar.gz $(CELT_BUILDDIR)/Makefile: $(CELT_DIR) mkdir -p $(CELT_BUILDDIR) - cd $(CELT_BUILDDIR) && $(DEFAULT_VARS) $(CELT_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(CELT_DIR) + cd $(CELT_BUILDDIR) && $(DEFAULT_VARS) $(CELT_DIR)/configure $(DEFAULT_ARGS) --disable-shared --with-pic --srcdir=$(CELT_DIR) $(TOUCH_TARGET) $(CELT_LA): $(CELT_BUILDDIR)/Makefile diff --git a/src/mod/codecs/mod_codec2/Makefile b/src/mod/codecs/mod_codec2/Makefile deleted file mode 100644 index 568df9c64d..0000000000 --- a/src/mod/codecs/mod_codec2/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -BASE=../../../.. - -CODEC2_DIR=$(switch_srcdir)/libs/libcodec2 -CODEC2_BUILDDIR=$(switch_builddir)/libs/libcodec2 -CODEC2LA=$(CODEC2_BUILDDIR)/src/libcodec2.la - -LOCAL_CFLAGS=-I$(CODEC2_DIR)/include -I$(CODEC2_BUILDDIR)/src -LOCAL_LIBADD=$(CODEC2LA) -include $(BASE)/build/modmake.rules - -$(CODEC2LA): $(CODEC2_DIR) $(CODEC2_DIR)/.update - cd $(CODEC2_BUILDDIR) && $(MAKE) - $(TOUCH_TARGET) - diff --git a/src/mod/codecs/mod_codec2/Makefile.am b/src/mod/codecs/mod_codec2/Makefile.am new file mode 100644 index 0000000000..9c6bb6a397 --- /dev/null +++ b/src/mod/codecs/mod_codec2/Makefile.am @@ -0,0 +1,19 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_codec2 + +CODEC2_DIR=$(switch_srcdir)/libs/libcodec2 +CODEC2_BUILDDIR=$(switch_builddir)/libs/libcodec2 +CODEC2LA=$(CODEC2_BUILDDIR)/src/libcodec2.la + +mod_LTLIBRARIES = mod_codec2.la +mod_codec2_la_SOURCES = mod_codec2.c +mod_codec2_la_CFLAGS = $(AM_CFLAGS) -I$(CODEC2_DIR)/include -I$(CODEC2_BUILDDIR)/src +mod_codec2_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(CODEC2LA) +mod_codec2_la_LDFLAGS = -avoid-version -module -no-undefined -shared + +BUILT_SOURCES=$(CODEC2LA) + +$(CODEC2LA): $(CODEC2_DIR) $(CODEC2_DIR)/.update + cd $(CODEC2_BUILDDIR) && $(MAKE) + $(TOUCH_TARGET) + diff --git a/src/mod/codecs/mod_dahdi_codec/Makefile.am b/src/mod/codecs/mod_dahdi_codec/Makefile.am new file mode 100644 index 0000000000..d4e3287746 --- /dev/null +++ b/src/mod/codecs/mod_dahdi_codec/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_dahdi_codec + +mod_LTLIBRARIES = mod_dahdi_codec.la +mod_dahdi_codec_la_SOURCES = mod_dahdi_codec.c +mod_dahdi_codec_la_CFLAGS = $(AM_CFLAGS) +mod_dahdi_codec_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_dahdi_codec_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/codecs/mod_g723_1/Makefile b/src/mod/codecs/mod_g723_1/Makefile deleted file mode 100644 index 9914e1b5a8..0000000000 --- a/src/mod/codecs/mod_g723_1/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -BASE=../../../.. -DIR=$(BASE)/libs/libg723_1 -BUILDDIR=$(BASE)/libs/libg723_1 -A=$(BUILDDIR)/.libs/libg723.a - -LOCAL_INSERT_CFLAGS=if test -f $(A); then echo "-I$(DIR)/src/include" ; else echo "-DG723_PASSTHROUGH" ; fi ; -LOCAL_INSERT_LDFLAGS=test ! -f $(A) || echo $(A) - -include $(BASE)/build/modmake.rules diff --git a/src/mod/codecs/mod_g723_1/Makefile.am b/src/mod/codecs/mod_g723_1/Makefile.am new file mode 100644 index 0000000000..cf93b83857 --- /dev/null +++ b/src/mod/codecs/mod_g723_1/Makefile.am @@ -0,0 +1,19 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_g723_1 + +DIR=$(switch_srcdir)/libs/libg723_1 +BUILDDIR=$(switch_builddir)/libs/libg723_1 +G723_1_A=$(BUILDDIR)/.libs/libg723.a + +mod_LTLIBRARIES = mod_g723_1.la +mod_g723_1_la_SOURCES = mod_g723_1.c +mod_g723_1_la_CFLAGS = $(AM_CFLAGS) +mod_g723_1_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_g723_1_la_LDFLAGS = -avoid-version -module -no-undefined -shared + +if HAVE_G723_1 +mod_g723_1_la_CFLAGS += -I$(DIR)/src/include +mod_g723_1_la_LIBADD += $(G723_1_A) +else +mod_g723_1_la_CFLAGS += -DG723_PASSTHROUGH +endif diff --git a/src/mod/codecs/mod_g729/Makefile b/src/mod/codecs/mod_g729/Makefile deleted file mode 100644 index ff8d7678c8..0000000000 --- a/src/mod/codecs/mod_g729/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -BASE=../../../.. - -DIR=$(BASE)/libs/libg729 -BUILDDIR=$(BASE)/libs/libg729 -A=$(BUILDDIR)/.libs/libg729.a - -LOCAL_INSERT_CFLAGS=if test -f $(A); then echo "-I$(DIR)/src/include" ; else echo "-DG729_PASSTHROUGH" ; fi ; -LOCAL_INSERT_LDFLAGS=test ! -f $(A) || echo $(A) -include $(BASE)/build/modmake.rules diff --git a/src/mod/codecs/mod_g729/Makefile.am b/src/mod/codecs/mod_g729/Makefile.am new file mode 100644 index 0000000000..4c5ef90f28 --- /dev/null +++ b/src/mod/codecs/mod_g729/Makefile.am @@ -0,0 +1,19 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_g729 + +G729_DIR=$(switch_srcdir)/libs/libg729 +G729_BUILDDIR=$(switch_builddir)/libs/libg729 +G729_A=$(BUILDDIR)/.libs/libg729.a + +mod_LTLIBRARIES = mod_g729.la +mod_g729_la_SOURCES = mod_g729.c +mod_g729_la_CFLAGS = $(AM_CFLAGS) +mod_g729_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_g729_la_LDFLAGS = -avoid-version -module -no-undefined -shared + +if HAVE_G729 +mod_g729_la_CFLAGS += -I$(G729_DIR)/src/include +mod_g729_la_LIBADD +- $(G729_A) +else +mod_g729_la_CFLAGS += -DG729_PASSTHROUGH +endif diff --git a/src/mod/codecs/mod_h26x/Makefile b/src/mod/codecs/mod_h26x/Makefile deleted file mode 100644 index 2c35e6e98f..0000000000 --- a/src/mod/codecs/mod_h26x/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -BASE=../../../.. -include $(BASE)/build/modmake.rules diff --git a/src/mod/codecs/mod_h26x/Makefile.am b/src/mod/codecs/mod_h26x/Makefile.am new file mode 100644 index 0000000000..93dd847499 --- /dev/null +++ b/src/mod/codecs/mod_h26x/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_h26x + +mod_LTLIBRARIES = mod_h26x.la +mod_h26x_la_SOURCES = mod_h26x.c +mod_h26x_la_CFLAGS = $(AM_CFLAGS) +mod_h26x_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_h26x_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/codecs/mod_ilbc/Makefile b/src/mod/codecs/mod_ilbc/Makefile deleted file mode 100644 index 864cbf7369..0000000000 --- a/src/mod/codecs/mod_ilbc/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -BASE=../../../.. -ILBC_DIR=$(switch_srcdir)/libs/ilbc -ILBC_BUILDDIR=$(switch_builddir)/libs/ilbc -ILBCLA=$(ILBC_BUILDDIR)/src/libilbc.la -LOCAL_CFLAGS=-I$(ILBC_DIR)/src -I$(ILBC_BUILDDIR)/src -LOCAL_LIBADD=$(ILBCLA) - -include $(BASE)/build/modmake.rules - -$(ILBCLA): $(ILBC_DIR) $(ILBC_DIR)/.update - cd $(ILBC_BUILDDIR) && $(MAKE) - $(TOUCH_TARGET) diff --git a/src/mod/codecs/mod_ilbc/Makefile.am b/src/mod/codecs/mod_ilbc/Makefile.am new file mode 100644 index 0000000000..b2ddde3f90 --- /dev/null +++ b/src/mod/codecs/mod_ilbc/Makefile.am @@ -0,0 +1,18 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_ilbc + +ILBC_DIR=$(switch_srcdir)/libs/ilbc +ILBC_BUILDDIR=$(switch_builddir)/libs/ilbc +ILBCLA=$(ILBC_BUILDDIR)/src/libilbc.la + +mod_LTLIBRARIES = mod_ilbc.la +mod_ilbc_la_SOURCES = mod_ilbc.c +mod_ilbc_la_CFLAGS = $(AM_CFLAGS) -I$(ILBC_DIR)/src -I$(ILBC_BUILDDIR)/src +mod_ilbc_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(ILBCLA) +mod_ilbc_la_LDFLAGS = -avoid-version -module -no-undefined -shared + +BUILT_SOURCES=$(ILBCLA) + +$(ILBCLA): $(ILBC_DIR) $(ILBC_DIR)/.update + cd $(ILBC_BUILDDIR) && $(MAKE) + $(TOUCH_TARGET) diff --git a/src/mod/codecs/mod_isac/Makefile b/src/mod/codecs/mod_isac/Makefile deleted file mode 100644 index d89cf0c613..0000000000 --- a/src/mod/codecs/mod_isac/Makefile +++ /dev/null @@ -1,71 +0,0 @@ -BASE=../../../.. - -LOCAL_SOURCES=arith_routines.c\ -arith_routines_hist.c\ -arith_routines_logist.c\ -auto_correlation.c\ -auto_corr_to_refl_coef.c\ -bandwidth_estimator.c\ -complex_bit_reverse.c\ -complex_fft.c\ -copy_set_operations.c\ -crc.c\ -cross_correlation.c\ -decode_bwe.c\ -decode.c\ -division_operations.c\ -dot_product_with_scale.c\ -downsample_fast.c\ -encode.c\ -encode_lpc_swb.c\ -energy.c\ -entropy_coding.c\ -fft.c\ -filter_ar.c\ -filter_ar_fast_q12.c\ -filterbanks.c\ -filterbank_tables.c\ -filter_functions.c\ -filter_ma_fast_q12.c\ -get_hanning_window.c\ -get_scaling_square.c\ -ilbc_specific_functions.c\ -intialize.c\ -isac.c\ -lattice.c\ -levinson_durbin.c\ -lpc_analysis.c\ -lpc_gain_swb_tables.c\ -lpc_shape_swb12_tables.c\ -lpc_shape_swb16_tables.c\ -lpc_tables.c\ -lpc_to_refl_coef.c\ -min_max_operations.c\ -min_max_operations_neon.c\ -pitch_estimator.c\ -pitch_filter.c\ -pitch_gain_tables.c\ -pitch_lag_tables.c\ -randomization_functions.c\ -refl_coef_to_lpc.c\ -resample_48khz.c\ -resample_by_2.c\ -resample_by_2_internal.c\ -resample.c\ -resample_fractional.c\ -spectrum_ar_model_tables.c\ -splitting_filter.c\ -spl_sqrt.c\ -spl_sqrt_floor.c\ -spl_version.c\ -sqrt_of_one_minus_x_squared.c\ -transform.c\ -vector_scaling_operations.c\ -webrtc_fft_t_1024_8.c\ -webrtc_fft_t_rad.c "" - -LOCAL_OBJS=$(shell echo $(LOCAL_SOURCES) | sed "s/.c /.o /g") -LOCAL_CFLAGS=-w -I. - -include $(BASE)/build/modmake.rules - diff --git a/src/mod/codecs/mod_isac/Makefile.am b/src/mod/codecs/mod_isac/Makefile.am new file mode 100644 index 0000000000..fc726f30c1 --- /dev/null +++ b/src/mod/codecs/mod_isac/Makefile.am @@ -0,0 +1,17 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_isac + +mod_LTLIBRARIES = mod_isac.la +mod_isac_la_SOURCES = mod_isac.c arith_routines.c arith_routines_hist.c arith_routines_logist.c auto_correlation.c auto_corr_to_refl_coef.c +mod_isac_la_SOURCES += bandwidth_estimator.c complex_bit_reverse.c complex_fft.c copy_set_operations.c crc.c cross_correlation.c decode_bwe.c +mod_isac_la_SOURCES += decode.c division_operations.c dot_product_with_scale.c downsample_fast.c encode.c encode_lpc_swb.c energy.c entropy_coding.c +mod_isac_la_SOURCES += fft.c filter_ar.c filter_ar_fast_q12.c filterbanks.c filterbank_tables.c filter_functions.c filter_ma_fast_q12.c +mod_isac_la_SOURCES += get_hanning_window.c get_scaling_square.c ilbc_specific_functions.c intialize.c isac.c lattice.c levinson_durbin.c +mod_isac_la_SOURCES += lpc_analysis.c lpc_gain_swb_tables.c lpc_shape_swb12_tables.c lpc_shape_swb16_tables.c lpc_tables.c +mod_isac_la_SOURCES += lpc_to_refl_coef.c min_max_operations.c min_max_operations_neon.c pitch_estimator.c pitch_filter.c pitch_gain_tables.c +mod_isac_la_SOURCES += pitch_lag_tables.c randomization_functions.c refl_coef_to_lpc.c resample_48khz.c resample_by_2.c resample_by_2_internal.c +mod_isac_la_SOURCES += resample.c resample_fractional.c spectrum_ar_model_tables.c splitting_filter.c spl_sqrt.c spl_sqrt_floor.c spl_version.c +mod_isac_la_SOURCES += sqrt_of_one_minus_x_squared.c transform.c vector_scaling_operations.c webrtc_fft_t_1024_8.c webrtc_fft_t_rad.c +mod_isac_la_CFLAGS = $(AM_CFLAGS) -w -I. +mod_isac_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_isac_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/codecs/mod_mp4v/Makefile b/src/mod/codecs/mod_mp4v/Makefile deleted file mode 100644 index 2c35e6e98f..0000000000 --- a/src/mod/codecs/mod_mp4v/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -BASE=../../../.. -include $(BASE)/build/modmake.rules diff --git a/src/mod/codecs/mod_mp4v/Makefile.am b/src/mod/codecs/mod_mp4v/Makefile.am new file mode 100644 index 0000000000..59f9fa41ef --- /dev/null +++ b/src/mod/codecs/mod_mp4v/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_mp4v + +mod_LTLIBRARIES = mod_mp4v.la +mod_mp4v_la_SOURCES = mod_mp4v.c +mod_mp4v_la_CFLAGS = $(AM_CFLAGS) +mod_mp4v_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_mp4v_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/codecs/mod_opus/Makefile b/src/mod/codecs/mod_opus/Makefile.am similarity index 55% rename from src/mod/codecs/mod_opus/Makefile rename to src/mod/codecs/mod_opus/Makefile.am index 39284c1f8e..0ce58aa347 100644 --- a/src/mod/codecs/mod_opus/Makefile +++ b/src/mod/codecs/mod_opus/Makefile.am @@ -1,18 +1,17 @@ -BASE=../../../.. - +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_opus OPUS=opus-1.1-p2 - OPUS_DIR=$(switch_srcdir)/libs/$(OPUS) OPUS_BUILDDIR=$(switch_builddir)/libs/$(OPUS) -LOCAL_CFLAGS=-I$(OPUS_DIR)/include -g -O2 -LOCAL_LDFLAGS=-lm -lz - OPUS_LA=$(OPUS_BUILDDIR)/.libs/libopus.la -LOCAL_LIBADD=$(OPUS_LA) - -include $(BASE)/build/modmake.rules +mod_LTLIBRARIES = mod_opus.la +mod_opus_la_SOURCES = mod_opus.c +mod_opus_la_CFLAGS = $(AM_CFLAGS) -I$(OPUS_DIR)/include +mod_opus_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(OPUS_LA) +mod_opus_la_LDFLAGS = -avoid-version -module -no-undefined -shared -lm -lz +BUILT_SOURCES=$(OPUS_LA) $(OPUS_DIR): $(GETLIB) $(OPUS).tar.gz @@ -23,7 +22,5 @@ $(OPUS_DIR)/Makefile: $(OPUS_DIR) $(OPUS_LA): $(OPUS_DIR)/Makefile cd $(OPUS_BUILDDIR) && $(MAKE) - - $(MODNAME).lo: $(OPUS_LA) diff --git a/src/mod/codecs/mod_sangoma_codec/Makefile b/src/mod/codecs/mod_sangoma_codec/Makefile deleted file mode 100644 index 7d2f85e4f5..0000000000 --- a/src/mod/codecs/mod_sangoma_codec/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -BASE=../../../.. -LOCAL_LDFLAGS += -lsngtc_node -include $(BASE)/build/modmake.rules diff --git a/src/mod/codecs/mod_sangoma_codec/Makefile.am b/src/mod/codecs/mod_sangoma_codec/Makefile.am new file mode 100644 index 0000000000..eff90fe297 --- /dev/null +++ b/src/mod/codecs/mod_sangoma_codec/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_sangoma_codec + +mod_LTLIBRARIES = mod_sangoma_codec.la +mod_sangoma_codec_la_SOURCES = mod_sangoma_codec.c +mod_sangoma_codec_la_CFLAGS = $(AM_CFLAGS) +mod_sangoma_codec_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_sangoma_codec_la_LDFLAGS = -avoid-version -module -no-undefined -shared -lsngtc_node diff --git a/src/mod/codecs/mod_sangoma_codec/mod_sangoma_codec.c b/src/mod/codecs/mod_sangoma_codec/mod_sangoma_codec.c index 416eb17b82..187732e25f 100644 --- a/src/mod/codecs/mod_sangoma_codec/mod_sangoma_codec.c +++ b/src/mod/codecs/mod_sangoma_codec/mod_sangoma_codec.c @@ -930,7 +930,7 @@ SWITCH_STANDARD_API(sangoma_function) #define STATS_FORMAT "%-10.10s %-10.10s %-10.10s %-10.10s %-10.10s %-10.10s %-10.10s %-10.10s %-10.10s %-10.10s %-15.15s %-15.15s\n" stream->write_function(stream, STATS_FORMAT, "Session", "Codec", "Enc", "Dec", "Enc Tx", "Enc Rx", "Dec Tx", "Dec Rx", "Enc Lost", "Dec Lost", "Enc AvgRxMs", "Dec AvgRxMs"); - for (hi = switch_hash_first(NULL, g_sessions_hash); hi; hi = switch_hash_next(hi)) { + for (hi = switch_core_hash_first( g_sessions_hash); hi; hi = switch_core_hash_next(hi)) { struct sangoma_transcoding_session *sess; char sessid_str[25]; char encoder_tx_str[25]; @@ -942,7 +942,7 @@ SWITCH_STANDARD_API(sangoma_function) char encoder_avgrxus_str[25]; char decoder_avgrxus_str[25]; - switch_hash_this(hi, &var, NULL, &val); + switch_core_hash_this(hi, &var, NULL, &val); sess = val; snprintf(sessid_str, sizeof(sessid_str), "%lu", sess->sessid); @@ -1236,7 +1236,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_sangoma_codec_load) switch_mutex_init(&g_sessions_lock, SWITCH_MUTEX_UNNESTED, pool); - switch_core_hash_init(&g_sessions_hash, pool); + switch_core_hash_init(&g_sessions_hash); *module_interface = switch_loadable_module_create_module_interface(pool, modname); diff --git a/src/mod/codecs/mod_silk/Makefile b/src/mod/codecs/mod_silk/Makefile deleted file mode 100644 index 23d7811ee7..0000000000 --- a/src/mod/codecs/mod_silk/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -BASE=../../../.. -SILK_DIR=$(switch_srcdir)/libs/silk -SILK_BUILDDIR=$(switch_builddir)/libs/silk -LOCAL_CFLAGS=-I$(SILK_DIR)/src -I$(SILK_DIR)/interface -SILK_LA=$(SILK_BUILDDIR)/.libs/libSKP_SILK_SDK.la -LOCAL_LIBADD=$(SILK_LA) -LOCAL_OBJS=$(BASE)/libs/stfu/stfu.o -include $(BASE)/build/modmake.rules - -$(SILK_LA): $(SILK_DIR)/.update - cd $(SILK_BUILDDIR) && ./configure --disable-shared && make clean && $(MAKE) - $(TOUCH_TARGET) diff --git a/src/mod/codecs/mod_silk/Makefile.am b/src/mod/codecs/mod_silk/Makefile.am new file mode 100644 index 0000000000..b1e1062f8a --- /dev/null +++ b/src/mod/codecs/mod_silk/Makefile.am @@ -0,0 +1,18 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_silk + +SILK_DIR=$(switch_srcdir)/libs/silk +SILK_BUILDDIR=$(switch_builddir)/libs/silk +SILK_LA=$(SILK_BUILDDIR)/.libs/libSKP_SILK_SDK.la + +mod_LTLIBRARIES = mod_silk.la +mod_silk_la_SOURCES = mod_silk.c ../../../../libs/stfu/stfu.c +mod_silk_la_CFLAGS = $(AM_CFLAGS) -I$(SILK_DIR)/src -I$(SILK_DIR)/interface +mod_silk_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(SILK_LA) +mod_silk_la_LDFLAGS = -avoid-version -module -no-undefined -shared + +BUILT_SOURCES=$(SILK_LA) + +$(SILK_LA): $(SILK_DIR)/.update + cd $(SILK_BUILDDIR) && ./configure --disable-shared && make clean && $(MAKE) + $(TOUCH_TARGET) diff --git a/src/mod/codecs/mod_siren/Makefile b/src/mod/codecs/mod_siren/Makefile deleted file mode 100644 index 5d1e5de77d..0000000000 --- a/src/mod/codecs/mod_siren/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -BASE=../../../.. -G722_1_DIR=$(switch_srcdir)/libs/libg722_1 -G722_1_BUILDDIR=$(switch_builddir)/libs/libg722_1 -LOCAL_CFLAGS=-I$(G722_1_DIR)/src -I$(G722_1_BUILDDIR)/src -G722_1_LA=$(G722_1_BUILDDIR)/src/.libs/libg722_1.la -LOCAL_LIBADD=$(G722_1_LA) -include $(BASE)/build/modmake.rules - -$(G722_1_LA): $(G722_1_DIR)/.update - cd $(G722_1_BUILDDIR) && $(MAKE) - $(TOUCH_TARGET) diff --git a/src/mod/codecs/mod_siren/Makefile.am b/src/mod/codecs/mod_siren/Makefile.am new file mode 100644 index 0000000000..bc3fd2d4b6 --- /dev/null +++ b/src/mod/codecs/mod_siren/Makefile.am @@ -0,0 +1,16 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_siren +G722_1_DIR=$(switch_srcdir)/libs/libg722_1 +G722_1_BUILDDIR=$(switch_builddir)/libs/libg722_1 +G722_1_LA=$(G722_1_BUILDDIR)/src/.libs/libg722_1.la +mod_LTLIBRARIES = mod_siren.la +mod_siren_la_SOURCES = mod_siren.c +mod_siren_la_CFLAGS = $(AM_CFLAGS) -I$(G722_1_DIR)/src -I$(G722_1_BUILDDIR)/src +mod_siren_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(G722_1_LA) +mod_siren_la_LDFLAGS = -avoid-version -module -no-undefined -shared + +BUILT_SOURCES=$(G722_1_LA) + +$(G722_1_LA): $(G722_1_DIR)/.update + cd $(G722_1_BUILDDIR) && $(MAKE) + $(TOUCH_TARGET) diff --git a/src/mod/codecs/mod_skel_codec/Makefile.am b/src/mod/codecs/mod_skel_codec/Makefile.am new file mode 100644 index 0000000000..c39aad9fb3 --- /dev/null +++ b/src/mod/codecs/mod_skel_codec/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_skel_codec + +mod_LTLIBRARIES = mod_skel_codec.la +mod_skel_codec_la_SOURCES = mod_skel_codec.c +mod_skel_codec_la_CFLAGS = $(AM_CFLAGS) +mod_skel_codec_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_skel_codec_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/codecs/mod_theora/Makefile b/src/mod/codecs/mod_theora/Makefile deleted file mode 100644 index 2c35e6e98f..0000000000 --- a/src/mod/codecs/mod_theora/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -BASE=../../../.. -include $(BASE)/build/modmake.rules diff --git a/src/mod/codecs/mod_theora/Makefile.am b/src/mod/codecs/mod_theora/Makefile.am new file mode 100644 index 0000000000..1226a05a73 --- /dev/null +++ b/src/mod/codecs/mod_theora/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_theora + +mod_LTLIBRARIES = mod_theora.la +mod_theora_la_SOURCES = mod_theora.c +mod_theora_la_CFLAGS = $(AM_CFLAGS) +mod_theora_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_theora_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/codecs/mod_voipcodecs/Makefile b/src/mod/codecs/mod_voipcodecs/Makefile deleted file mode 100644 index 113d5ab77b..0000000000 --- a/src/mod/codecs/mod_voipcodecs/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -BASE=../../../.. - -TIFF_DIR=$(switch_srcdir)/libs/tiff-4.0.2 -TIFF_BUILDDIR=$(switch_builddir)/libs/tiff-4.0.2 -TIFF_LA=$(TIFF_BUILDDIR)/libtiff/libtiff.la - -SPANDSP_DIR=$(switch_srcdir)/libs/spandsp -SPANDSP_BUILDDIR=$(switch_builddir)/libs/spandsp -SPANDSP_LA=$(SPANDSP_BUILDDIR)/src/libspandsp.la - -LOCAL_CFLAGS=-I$(SPANDSP_DIR)/src -I$(TIFF_DIR)/libtiff -I$(SPANDSP_BUILDDIR)/src -I$(TIFF_BUILDDIR)/libtiff -LOCAL_LIBADD=$(SPANDSP_LA) - -include $(BASE)/build/modmake.rules -$(MODNAME).lo: $(SPANDSP_LA) $(TIFF_LA) - -$(SPANDSP_LA): $(TIFF_LA) $(SPANDSP_DIR) $(SPANDSP_DIR)/.update - cd $(SPANDSP_BUILDDIR) && $(MAKE) -j1 - $(TOUCH_TARGET) - -$(TIFF_LA): $(TIFF_DIR) $(TIFF_DIR)/.update - cd $(TIFF_BUILDDIR) && $(MAKE) -j1 - $(TOUCH_TARGET) diff --git a/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.2008.vcproj b/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.2008.vcproj deleted file mode 100644 index 94dab696eb..0000000000 --- a/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.2008.vcproj +++ /dev/null @@ -1,287 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.c b/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.c deleted file mode 100644 index 48a8a143fd..0000000000 --- a/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.c +++ /dev/null @@ -1,969 +0,0 @@ -/* - * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * Copyright (C) 2005-2014, Anthony Minessale II - * - * Version: MPL 1.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is FreeSWITCH Modular Media Switching Software Library / G722 codec module - * - * The Initial Developer of the Original Code is - * Brian K. West - * Portions created by the Initial Developer are Copyright (C) - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * Brian K. West - * Anthony Minessale II - * Michael Jerris - * - * mod_voipcodecs.c -- VoIP Codecs (G.711, G.722, G.726, GSM-FR, IMA_ADPCM, LPC10) - * - * This module wouldn't be possible without generous contributions from Steve Underwood. Thanks! - * - */ - -#include -#include "spandsp.h" - -SWITCH_MODULE_LOAD_FUNCTION(mod_voipcodecs_load); -SWITCH_MODULE_DEFINITION(mod_voipcodecs, mod_voipcodecs_load, NULL, NULL); - -/* LPC10 - START */ - -struct lpc10_context { - lpc10_encode_state_t *encoder_object; - lpc10_decode_state_t *decoder_object; -}; - -static switch_status_t switch_lpc10_init(switch_codec_t *codec, switch_codec_flag_t flags, const switch_codec_settings_t *codec_settings) -{ - uint32_t encoding, decoding; - struct lpc10_context *context = NULL; - - encoding = (flags & SWITCH_CODEC_FLAG_ENCODE); - decoding = (flags & SWITCH_CODEC_FLAG_DECODE); - - if (!(encoding || decoding) || (!(context = switch_core_alloc(codec->memory_pool, sizeof(struct lpc10_context))))) { - return SWITCH_STATUS_FALSE; - } else { - - if (encoding) { - context->encoder_object = lpc10_encode_init(context->encoder_object, TRUE); - } - - if (decoding) { - context->decoder_object = lpc10_decode_init(context->decoder_object, TRUE); - } - - codec->private_info = context; - - return SWITCH_STATUS_SUCCESS; - } -} - -static switch_status_t switch_lpc10_destroy(switch_codec_t *codec) -{ - struct lpc10_context *context = codec->private_info; - codec->private_info = NULL; - - if (!context) { - return SWITCH_STATUS_FALSE; - } - - if (context->encoder_object) - lpc10_encode_free(context->encoder_object); - context->encoder_object = NULL; - if (context->decoder_object) - lpc10_decode_free(context->decoder_object); - context->decoder_object = NULL; - - return SWITCH_STATUS_SUCCESS; -} - -static switch_status_t switch_lpc10_encode(switch_codec_t *codec, - switch_codec_t *other_codec, - void *decoded_data, - uint32_t decoded_data_len, - uint32_t decoded_rate, void *encoded_data, uint32_t *encoded_data_len, uint32_t *encoded_rate, - unsigned int *flag) -{ - struct lpc10_context *context = codec->private_info; - - if (!context) { - return SWITCH_STATUS_FALSE; - } - - *encoded_data_len = lpc10_encode(context->encoder_object, (uint8_t *) encoded_data, (int16_t *) decoded_data, decoded_data_len / 2); - - return SWITCH_STATUS_SUCCESS; -} - -static switch_status_t switch_lpc10_decode(switch_codec_t *codec, - switch_codec_t *other_codec, - void *encoded_data, - uint32_t encoded_data_len, - uint32_t encoded_rate, void *decoded_data, uint32_t *decoded_data_len, uint32_t *decoded_rate, - unsigned int *flag) -{ - struct lpc10_context *context = codec->private_info; - - if (!context) { - return SWITCH_STATUS_FALSE; - } - - *decoded_data_len = (2 * lpc10_decode(context->decoder_object, (int16_t *) decoded_data, (uint8_t *) encoded_data, encoded_data_len)); - - return SWITCH_STATUS_SUCCESS; -} - -/* LPC10 - END */ - - -/* GSM - START */ -struct gsm_context { - gsm0610_state_t *decoder_object; - gsm0610_state_t *encoder_object; -}; - -static switch_status_t switch_gsm_init(switch_codec_t *codec, switch_codec_flag_t flags, const switch_codec_settings_t *codec_settings) -{ - uint32_t encoding, decoding; - struct gsm_context *context = NULL; - - encoding = (flags & SWITCH_CODEC_FLAG_ENCODE); - decoding = (flags & SWITCH_CODEC_FLAG_DECODE); - - if (!(encoding || decoding) || (!(context = switch_core_alloc(codec->memory_pool, sizeof(*context))))) { - return SWITCH_STATUS_FALSE; - } else { - if (encoding) { - context->encoder_object = gsm0610_init(context->encoder_object, GSM0610_PACKING_VOIP); - } - if (decoding) { - context->decoder_object = gsm0610_init(context->decoder_object, GSM0610_PACKING_VOIP); - } - - codec->private_info = context; - return SWITCH_STATUS_SUCCESS; - } -} - -static switch_status_t switch_gsm_encode(switch_codec_t *codec, - switch_codec_t *other_codec, - void *decoded_data, - uint32_t decoded_data_len, - uint32_t decoded_rate, void *encoded_data, uint32_t *encoded_data_len, uint32_t *encoded_rate, - unsigned int *flag) -{ - struct gsm_context *context = codec->private_info; - - if (!context) { - return SWITCH_STATUS_FALSE; - } - - *encoded_data_len = gsm0610_encode(context->encoder_object, (uint8_t *) encoded_data, (int16_t *) decoded_data, decoded_data_len / 2); - - return SWITCH_STATUS_SUCCESS; -} - -static switch_status_t switch_gsm_decode(switch_codec_t *codec, - switch_codec_t *other_codec, - void *encoded_data, - uint32_t encoded_data_len, - uint32_t encoded_rate, void *decoded_data, uint32_t *decoded_data_len, uint32_t *decoded_rate, - unsigned int *flag) -{ - struct gsm_context *context = codec->private_info; - - if (!context) { - return SWITCH_STATUS_FALSE; - } - - *decoded_data_len = (2 * gsm0610_decode(context->decoder_object, (int16_t *) decoded_data, (uint8_t *) encoded_data, encoded_data_len)); - - return SWITCH_STATUS_SUCCESS; -} - -static switch_status_t switch_gsm_destroy(switch_codec_t *codec) -{ - struct gsm_context *context = codec->private_info; - - codec->private_info = NULL; - - if (!context) { - return SWITCH_STATUS_FALSE; - } - - if (context->decoder_object) - gsm0610_free(context->decoder_object); - context->decoder_object = NULL; - if (context->encoder_object) - gsm0610_free(context->encoder_object); - context->encoder_object = NULL; - - return SWITCH_STATUS_SUCCESS; -} - -/* GSM - END */ - -#ifdef ENABLE_G711 -/* G711 - START */ -static switch_status_t switch_g711u_init(switch_codec_t *codec, switch_codec_flag_t flags, const switch_codec_settings_t *codec_settings) -{ - uint32_t encoding, decoding; - - encoding = (flags & SWITCH_CODEC_FLAG_ENCODE); - decoding = (flags & SWITCH_CODEC_FLAG_DECODE); - - if (!(encoding || decoding)) { - return SWITCH_STATUS_FALSE; - } else { - return SWITCH_STATUS_SUCCESS; - } -} - -static switch_status_t switch_g711u_encode(switch_codec_t *codec, - switch_codec_t *other_codec, - void *decoded_data, - uint32_t decoded_data_len, - uint32_t decoded_rate, void *encoded_data, uint32_t *encoded_data_len, uint32_t *encoded_rate, - unsigned int *flag) -{ - short *dbuf; - unsigned char *ebuf; - uint32_t i; - - dbuf = decoded_data; - ebuf = encoded_data; - - for (i = 0; i < decoded_data_len / sizeof(short); i++) { - ebuf[i] = linear_to_ulaw(dbuf[i]); - } - - *encoded_data_len = i; - - return SWITCH_STATUS_SUCCESS; -} - -static switch_status_t switch_g711u_decode(switch_codec_t *codec, - switch_codec_t *other_codec, - void *encoded_data, - uint32_t encoded_data_len, - uint32_t encoded_rate, void *decoded_data, uint32_t *decoded_data_len, uint32_t *decoded_rate, - unsigned int *flag) -{ - short *dbuf; - unsigned char *ebuf; - uint32_t i; - - dbuf = decoded_data; - ebuf = encoded_data; - - if (*flag & SWITCH_CODEC_FLAG_SILENCE) { - memset(dbuf, 0, codec->implementation->decoded_bytes_per_packet); - *decoded_data_len = codec->implementation->decoded_bytes_per_packet; - } else { - for (i = 0; i < encoded_data_len; i++) { - dbuf[i] = ulaw_to_linear(ebuf[i]); - } - - *decoded_data_len = i * 2; - } - - return SWITCH_STATUS_SUCCESS; -} - -static switch_status_t switch_g711u_destroy(switch_codec_t *codec) -{ - return SWITCH_STATUS_SUCCESS; -} - - -static switch_status_t switch_g711a_init(switch_codec_t *codec, switch_codec_flag_t flags, const switch_codec_settings_t *codec_settings) -{ - uint32_t encoding, decoding; - - encoding = (flags & SWITCH_CODEC_FLAG_ENCODE); - decoding = (flags & SWITCH_CODEC_FLAG_DECODE); - - if (!(encoding || decoding)) { - return SWITCH_STATUS_FALSE; - } else { - return SWITCH_STATUS_SUCCESS; - } -} - -static switch_status_t switch_g711a_encode(switch_codec_t *codec, - switch_codec_t *other_codec, - void *decoded_data, - uint32_t decoded_data_len, - uint32_t decoded_rate, void *encoded_data, uint32_t *encoded_data_len, uint32_t *encoded_rate, - unsigned int *flag) -{ - short *dbuf; - unsigned char *ebuf; - uint32_t i; - - dbuf = decoded_data; - ebuf = encoded_data; - - for (i = 0; i < decoded_data_len / sizeof(short); i++) { - ebuf[i] = linear_to_alaw(dbuf[i]); - } - - *encoded_data_len = i; - - return SWITCH_STATUS_SUCCESS; -} - -static switch_status_t switch_g711a_decode(switch_codec_t *codec, - switch_codec_t *other_codec, - void *encoded_data, - uint32_t encoded_data_len, - uint32_t encoded_rate, void *decoded_data, uint32_t *decoded_data_len, uint32_t *decoded_rate, - unsigned int *flag) -{ - short *dbuf; - unsigned char *ebuf; - uint32_t i; - - dbuf = decoded_data; - ebuf = encoded_data; - - if (*flag & SWITCH_CODEC_FLAG_SILENCE) { - memset(dbuf, 0, codec->implementation->decoded_bytes_per_packet); - *decoded_data_len = codec->implementation->decoded_bytes_per_packet; - } else { - for (i = 0; i < encoded_data_len; i++) { - dbuf[i] = alaw_to_linear(ebuf[i]); - } - - *decoded_data_len = i * 2; - } - - return SWITCH_STATUS_SUCCESS; -} - -static switch_status_t switch_g711a_destroy(switch_codec_t *codec) -{ - return SWITCH_STATUS_SUCCESS; -} - -/* G711 - END */ -#endif - - -/* G722 - START */ - -struct g722_context { - g722_decode_state_t *decoder_object; - g722_encode_state_t *encoder_object; -}; - -static switch_status_t switch_g722_init(switch_codec_t *codec, switch_codec_flag_t flags, const switch_codec_settings_t *codec_settings) -{ - uint32_t encoding, decoding; - struct g722_context *context = NULL; - - encoding = (flags & SWITCH_CODEC_FLAG_ENCODE); - decoding = (flags & SWITCH_CODEC_FLAG_DECODE); - - if (!(encoding || decoding) || (!(context = switch_core_alloc(codec->memory_pool, sizeof(struct g722_context))))) { - return SWITCH_STATUS_FALSE; - } else { - if (encoding) { - context->encoder_object = g722_encode_init(context->encoder_object, 64000, G722_PACKED); - } - if (decoding) { - context->decoder_object = g722_decode_init(context->decoder_object, 64000, G722_PACKED); - } - } - - codec->private_info = context; - return SWITCH_STATUS_SUCCESS; -} - -static switch_status_t switch_g722_encode(switch_codec_t *codec, - switch_codec_t *other_codec, - void *decoded_data, - uint32_t decoded_data_len, - uint32_t decoded_rate, void *encoded_data, uint32_t *encoded_data_len, uint32_t *encoded_rate, - unsigned int *flag) -{ - struct g722_context *context = codec->private_info; - - if (!context) { - return SWITCH_STATUS_FALSE; - } - - *encoded_data_len = g722_encode(context->encoder_object, (uint8_t *) encoded_data, (int16_t *) decoded_data, decoded_data_len / 2); - - return SWITCH_STATUS_SUCCESS; -} - -static switch_status_t switch_g722_decode(switch_codec_t *codec, - switch_codec_t *other_codec, - void *encoded_data, - uint32_t encoded_data_len, - uint32_t encoded_rate, void *decoded_data, uint32_t *decoded_data_len, uint32_t *decoded_rate, - unsigned int *flag) -{ - struct g722_context *context = codec->private_info; - - if (!context) { - return SWITCH_STATUS_FALSE; - } - - *decoded_data_len = (2 * g722_decode(context->decoder_object, (int16_t *) decoded_data, (uint8_t *) encoded_data, encoded_data_len)); - - return SWITCH_STATUS_SUCCESS; -} - -static switch_status_t switch_g722_destroy(switch_codec_t *codec) -{ - struct g722_context *context = codec->private_info; - - codec->private_info = NULL; - - if (!context) { - return SWITCH_STATUS_FALSE; - } - - if (context->decoder_object) - g722_decode_free(context->decoder_object); - context->decoder_object = NULL; - if (context->encoder_object) - g722_encode_free(context->encoder_object); - context->encoder_object = NULL; - - return SWITCH_STATUS_SUCCESS; -} - -/* G722 - END */ - -/* G726 - START */ - -static switch_status_t switch_g726_init(switch_codec_t *codec, switch_codec_flag_t flags, const switch_codec_settings_t *codec_settings) -{ - uint32_t encoding, decoding; - int packing = G726_PACKING_RIGHT; - g726_state_t *context = NULL; - - encoding = (flags & SWITCH_CODEC_FLAG_ENCODE); - decoding = (flags & SWITCH_CODEC_FLAG_DECODE); - - if (!(encoding || decoding)) { - return SWITCH_STATUS_FALSE; - } - - if ((flags & SWITCH_CODEC_FLAG_AAL2 || strstr(codec->implementation->iananame, "AAL2"))) { - packing = G726_PACKING_LEFT; - } - - context = g726_init(context, codec->implementation->bits_per_second, G726_ENCODING_LINEAR, packing); - - codec->private_info = context; - return SWITCH_STATUS_SUCCESS; - -} - -static switch_status_t switch_g726_destroy(switch_codec_t *codec) -{ - g726_state_t *context = codec->private_info; - - if (!context) { - return SWITCH_STATUS_FALSE; - } - - g726_free(context); - - codec->private_info = NULL; - return SWITCH_STATUS_SUCCESS; -} - -static switch_status_t switch_g726_encode(switch_codec_t *codec, - switch_codec_t *other_codec, - void *decoded_data, - uint32_t decoded_data_len, - uint32_t decoded_rate, void *encoded_data, uint32_t *encoded_data_len, uint32_t *encoded_rate, - unsigned int *flag) -{ - g726_state_t *context = codec->private_info; - - if (!context) { - return SWITCH_STATUS_FALSE; - } - - *encoded_data_len = g726_encode(context, (uint8_t *) encoded_data, (int16_t *) decoded_data, decoded_data_len / 2); - - return SWITCH_STATUS_SUCCESS; -} - -static switch_status_t switch_g726_decode(switch_codec_t *codec, - switch_codec_t *other_codec, - void *encoded_data, - uint32_t encoded_data_len, - uint32_t encoded_rate, void *decoded_data, uint32_t *decoded_data_len, uint32_t *decoded_rate, - unsigned int *flag) -{ - g726_state_t *context = codec->private_info; - - if (!context) { - return SWITCH_STATUS_FALSE; - } - - *decoded_data_len = (2 * g726_decode(context, (int16_t *) decoded_data, (uint8_t *) encoded_data, encoded_data_len)); - - return SWITCH_STATUS_SUCCESS; -} - -/* G726 - START */ - -/* IMA_ADPCM - START */ - -struct ima_adpcm_context { - ima_adpcm_state_t *decoder_object; - ima_adpcm_state_t *encoder_object; -}; - -static switch_status_t switch_adpcm_init(switch_codec_t *codec, switch_codec_flag_t flags, const switch_codec_settings_t *codec_settings) -{ - uint32_t encoding, decoding; - struct ima_adpcm_context *context = NULL; - - encoding = (flags & SWITCH_CODEC_FLAG_ENCODE); - decoding = (flags & SWITCH_CODEC_FLAG_DECODE); - - if (!(encoding || decoding) || (!(context = switch_core_alloc(codec->memory_pool, sizeof(*context))))) { - return SWITCH_STATUS_FALSE; - } else { - if (encoding) { - context->encoder_object = ima_adpcm_init(context->encoder_object, IMA_ADPCM_DVI4, 0); - } - if (decoding) { - context->decoder_object = ima_adpcm_init(context->decoder_object, IMA_ADPCM_DVI4, 0); - } - - codec->private_info = context; - return SWITCH_STATUS_SUCCESS; - } -} - -static switch_status_t switch_adpcm_encode(switch_codec_t *codec, - switch_codec_t *other_codec, - void *decoded_data, - uint32_t decoded_data_len, - uint32_t decoded_rate, void *encoded_data, uint32_t *encoded_data_len, uint32_t *encoded_rate, - unsigned int *flag) -{ - struct ima_adpcm_context *context = codec->private_info; - - if (!context) { - return SWITCH_STATUS_FALSE; - } - - *encoded_data_len = ima_adpcm_encode(context->encoder_object, (uint8_t *) encoded_data, (int16_t *) decoded_data, decoded_data_len / 2); - - return SWITCH_STATUS_SUCCESS; -} - -static switch_status_t switch_adpcm_decode(switch_codec_t *codec, - switch_codec_t *other_codec, - void *encoded_data, - uint32_t encoded_data_len, - uint32_t encoded_rate, void *decoded_data, uint32_t *decoded_data_len, uint32_t *decoded_rate, - unsigned int *flag) -{ - struct ima_adpcm_context *context = codec->private_info; - - if (!context) { - return SWITCH_STATUS_FALSE; - } - - *decoded_data_len = (2 * ima_adpcm_decode(context->decoder_object, (int16_t *) decoded_data, (uint8_t *) encoded_data, encoded_data_len)); - - return SWITCH_STATUS_SUCCESS; -} - -static switch_status_t switch_adpcm_destroy(switch_codec_t *codec) -{ - struct ima_adpcm_context *context = codec->private_info; - - codec->private_info = NULL; - - if (!context) { - return SWITCH_STATUS_FALSE; - } - - if (context->decoder_object) - ima_adpcm_free(context->decoder_object); - context->decoder_object = NULL; - if (context->encoder_object) - ima_adpcm_free(context->encoder_object); - context->encoder_object = NULL; - - return SWITCH_STATUS_SUCCESS; -} - -/* IMA_ADPCM - END */ - - -SWITCH_MODULE_LOAD_FUNCTION(mod_voipcodecs_load) -{ - switch_codec_interface_t *codec_interface; - int mpf, spf, bpf, ebpf, count; - - /* connect my internal structure to the blank pointer passed to me */ - *module_interface = switch_loadable_module_create_module_interface(pool, modname); - - /* IMA_ADPCM */ - mpf = 10000, spf = 80, bpf = 160, ebpf = 80; - SWITCH_ADD_CODEC(codec_interface, "ADPCM (IMA)"); - for (count = 12; count > 0; count--) { - switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */ - 5, /* the IANA code number */ - "DVI4", /* the IANA code name */ - NULL, /* default fmtp to send (can be overridden by the init function) */ - 8000, /* samples transferred per second */ - 8000, /* actual samples transferred per second */ - 32000, /* bits transferred per second */ - mpf * count, /* number of microseconds per frame */ - spf * count, /* number of samples per frame */ - bpf * count, /* number of bytes per frame decompressed */ - (ebpf * count) + 4, /* number of bytes per frame compressed */ - 1, /* number of channels represented */ - spf * count, /* number of frames per network packet */ - switch_adpcm_init, /* function to initialize a codec handle using this implementation */ - switch_adpcm_encode, /* function to encode raw data into encoded data */ - switch_adpcm_decode, /* function to decode encoded data into raw data */ - switch_adpcm_destroy); /* deinitalize a codec handle using this implementation */ - } - mpf = 10000, spf = 160, bpf = 320, ebpf = 160; - for (count = 6; count > 0; count--) { - switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */ - 6, /* the IANA code number */ - "DVI4", /* the IANA code name */ - NULL, /* default fmtp to send (can be overridden by the init function) */ - 16000, /* samples transferred per second */ - 16000, /* actual samples transferred per second */ - 64000, /* bits transferred per second */ - mpf * count, /* number of microseconds per frame */ - spf * count, /* number of samples per frame */ - bpf * count, /* number of bytes per frame decompressed */ - (ebpf * count) + 4, /* number of bytes per frame compressed */ - 1, /* number of channels represented */ - spf * count, /* number of frames per network packet */ - switch_adpcm_init, /* function to initialize a codec handle using this implementation */ - switch_adpcm_encode, /* function to encode raw data into encoded data */ - switch_adpcm_decode, /* function to decode encoded data into raw data */ - switch_adpcm_destroy); /* deinitalize a codec handle using this implementation */ - } - - /* G726 */ - mpf = 10000, spf = 80, bpf = 160, ebpf = 20; - SWITCH_ADD_CODEC(codec_interface, "G.726 16k (AAL2)"); - for (count = 12; count > 0; count--) { - switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */ - 124, /* the IANA code number */ - "AAL2-G726-16", /* the IANA code name */ - NULL, /* default fmtp to send (can be overridden by the init function) */ - 8000, /* samples transferred per second */ - 8000, /* actual samples transferred per second */ - 16000, /* bits transferred per second */ - mpf * count, /* number of microseconds per frame */ - spf * count, /* number of samples per frame */ - bpf * count, /* number of bytes per frame decompressed */ - ebpf * count, /* number of bytes per frame compressed */ - 1, /* number of channels represented */ - count * 10, /* number of frames per network packet */ - switch_g726_init, /* function to initialize a codec handle using this implementation */ - switch_g726_encode, /* function to encode raw data into encoded data */ - switch_g726_decode, /* function to decode encoded data into raw data */ - switch_g726_destroy); /* deinitalize a codec handle using this implementation */ - } - SWITCH_ADD_CODEC(codec_interface, "G.726 16k"); - for (count = 12; count > 0; count--) { - switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */ - 124, /* the IANA code number */ - "G726-16", /* the IANA code name */ - NULL, /* default fmtp to send (can be overridden by the init function) */ - 8000, /* samples transferred per second */ - 8000, /* actual samples transferred per second */ - 16000, /* bits transferred per second */ - mpf * count, /* number of microseconds per frame */ - spf * count, /* number of samples per frame */ - bpf * count, /* number of bytes per frame decompressed */ - ebpf * count, /* number of bytes per frame compressed */ - 1, /* number of channels represented */ - count * 10, /* number of frames per network packet */ - switch_g726_init, /* function to initialize a codec handle using this implementation */ - switch_g726_encode, /* function to encode raw data into encoded data */ - switch_g726_decode, /* function to decode encoded data into raw data */ - switch_g726_destroy); /* deinitalize a codec handle using this implementation */ - } - /* Increase encoded bytes per frame by 10 */ - ebpf = ebpf + 10; - - SWITCH_ADD_CODEC(codec_interface, "G.726 24k (AAL2)"); - for (count = 12; count > 0; count--) { - switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */ - 123, /* the IANA code number */ - "AAL2-G726-24", /* the IANA code name */ - NULL, /* default fmtp to send (can be overridden by the init function) */ - 8000, /* samples transferred per second */ - 8000, /* actual samples transferred per second */ - 24000, /* bits transferred per second */ - mpf * count, /* number of microseconds per frame */ - spf * count, /* number of samples per frame */ - bpf * count, /* number of bytes per frame decompressed */ - ebpf * count, /* number of bytes per frame compressed */ - 1, /* number of channels represented */ - count * 10, /* number of frames per network packet */ - switch_g726_init, /* function to initialize a codec handle using this implementation */ - switch_g726_encode, /* function to encode raw data into encoded data */ - switch_g726_decode, /* function to decode encoded data into raw data */ - switch_g726_destroy); /* deinitalize a codec handle using this implementation */ - } - - SWITCH_ADD_CODEC(codec_interface, "G.726 24k"); - for (count = 12; count > 0; count--) { - switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */ - 123, /* the IANA code number */ - "G726-24", /* the IANA code name */ - NULL, /* default fmtp to send (can be overridden by the init function) */ - 8000, /* samples transferred per second */ - 8000, /* actual samples transferred per second */ - 24000, /* bits transferred per second */ - mpf * count, /* number of microseconds per frame */ - spf * count, /* number of samples per frame */ - bpf * count, /* number of bytes per frame decompressed */ - ebpf * count, /* number of bytes per frame compressed */ - 1, /* number of channels represented */ - count * 10, /* number of frames per network packet */ - switch_g726_init, /* function to initialize a codec handle using this implementation */ - switch_g726_encode, /* function to encode raw data into encoded data */ - switch_g726_decode, /* function to decode encoded data into raw data */ - switch_g726_destroy); /* deinitalize a codec handle using this implementation */ - } - /* Increase encoded bytes per frame by 10 */ - ebpf = ebpf + 10; - - SWITCH_ADD_CODEC(codec_interface, "G.726 32k (AAL2)"); - for (count = 12; count > 0; count--) { - switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */ - 122, /* the IANA code number */ - "AAL2-G726-32", /* the IANA code name */ - NULL, /* default fmtp to send (can be overridden by the init function) */ - 8000, /* samples transferred per second */ - 8000, /* actual samples transferred per second */ - 32000, /* bits transferred per second */ - mpf * count, /* number of microseconds per frame */ - spf * count, /* number of samples per frame */ - bpf * count, /* number of bytes per frame decompressed */ - ebpf * count, /* number of bytes per frame compressed */ - 1, /* number of channels represented */ - count * 10, /* number of frames per network packet */ - switch_g726_init, /* function to initialize a codec handle using this implementation */ - switch_g726_encode, /* function to encode raw data into encoded data */ - switch_g726_decode, /* function to decode encoded data into raw data */ - switch_g726_destroy); /* deinitalize a codec handle using this implementation */ - } - SWITCH_ADD_CODEC(codec_interface, "G.726 32k"); - for (count = 12; count > 0; count--) { - switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */ - 122, /* the IANA code number */ - "G726-32", /* the IANA code name */ - NULL, /* default fmtp to send (can be overridden by the init function) */ - 8000, /* samples transferred per second */ - 8000, /* actual samples transferred per second */ - 32000, /* bits transferred per second */ - mpf * count, /* number of microseconds per frame */ - spf * count, /* number of samples per frame */ - bpf * count, /* number of bytes per frame decompressed */ - ebpf * count, /* number of bytes per frame compressed */ - 1, /* number of channels represented */ - count * 10, /* number of frames per network packet */ - switch_g726_init, /* function to initialize a codec handle using this implementation */ - switch_g726_encode, /* function to encode raw data into encoded data */ - switch_g726_decode, /* function to decode encoded data into raw data */ - switch_g726_destroy); /* deinitalize a codec handle using this implementation */ - } - /* Increase encoded bytes per frame by 10 */ - ebpf = ebpf + 10; - - SWITCH_ADD_CODEC(codec_interface, "G.726 40k (AAL2)"); - for (count = 12; count > 0; count--) { - switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */ - 121, /* the IANA code number */ - "AAL2-G726-40", /* the IANA code name */ - NULL, /* default fmtp to send (can be overridden by the init function) */ - 8000, /* samples transferred per second */ - 8000, /* actual samples transferred per second */ - 40000, /* bits transferred per second */ - mpf * count, /* number of microseconds per frame */ - spf * count, /* number of samples per frame */ - bpf * count, /* number of bytes per frame decompressed */ - ebpf * count, /* number of bytes per frame compressed */ - 1, /* number of channels represented */ - count * 10, /* number of frames per network packet */ - switch_g726_init, /* function to initialize a codec handle using this implementation */ - switch_g726_encode, /* function to encode raw data into encoded data */ - switch_g726_decode, /* function to decode encoded data into raw data */ - switch_g726_destroy); /* deinitalize a codec handle using this implementation */ - } - SWITCH_ADD_CODEC(codec_interface, "G.726 40k"); - for (count = 12; count > 0; count--) { - switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */ - 121, /* the IANA code number */ - "G726-40", /* the IANA code name */ - NULL, /* default fmtp to send (can be overridden by the init function) */ - 8000, /* samples transferred per second */ - 8000, /* actual samples transferred per second */ - 40000, /* bits transferred per second */ - mpf * count, /* number of microseconds per frame */ - spf * count, /* number of samples per frame */ - bpf * count, /* number of bytes per frame decompressed */ - ebpf * count, /* number of bytes per frame compressed */ - 1, /* number of channels represented */ - count * 10, /* number of frames per network packet */ - switch_g726_init, /* function to initialize a codec handle using this implementation */ - switch_g726_encode, /* function to encode raw data into encoded data */ - switch_g726_decode, /* function to decode encoded data into raw data */ - switch_g726_destroy); /* deinitalize a codec handle using this implementation */ - } - /* G722 */ - mpf = 10000, spf = 80, bpf = 320, ebpf = 80; - SWITCH_ADD_CODEC(codec_interface, "G.722"); - for (count = 6; count > 0; count--) { - switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */ - 9, /* the IANA code number */ - "G722", /* the IANA code name */ - NULL, /* default fmtp to send (can be overridden by the init function) */ - 8000, /* samples transferred per second */ - 16000, /* actual samples transferred per second */ - 64000, /* bits transferred per second */ - mpf * count, /* number of microseconds per frame */ - spf * count, /* number of samples per frame */ - bpf * count, /* number of bytes per frame decompressed */ - ebpf * count, /* number of bytes per frame compressed */ - 1, /* number of channels represented */ - spf * count, /* number of frames per network packet */ - switch_g722_init, /* function to initialize a codec handle using this implementation */ - switch_g722_encode, /* function to encode raw data into encoded data */ - switch_g722_decode, /* function to decode encoded data into raw data */ - switch_g722_destroy); /* deinitalize a codec handle using this implementation */ - } - -#ifdef ENABLE_G711 - /* G711 */ - mpf = 10000, spf = 80, bpf = 160, ebpf = 80; - SWITCH_ADD_CODEC(codec_interface, "G.711 ulaw"); - for (count = 12; count > 0; count--) { - switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */ - 0, /* the IANA code number */ - "PCMU", /* the IANA code name */ - NULL, /* default fmtp to send (can be overridden by the init function) */ - 8000, /* samples transferred per second */ - 8000, /* actual samples transferred per second */ - 64000, /* bits transferred per second */ - mpf * count, /* number of microseconds per frame */ - spf * count, /* number of samples per frame */ - bpf * count, /* number of bytes per frame decompressed */ - ebpf * count, /* number of bytes per frame compressed */ - 1, /* number of channels represented */ - spf * count, /* number of frames per network packet */ - switch_g711u_init, /* function to initialize a codec handle using this implementation */ - switch_g711u_encode, /* function to encode raw data into encoded data */ - switch_g711u_decode, /* function to decode encoded data into raw data */ - switch_g711u_destroy); /* deinitalize a codec handle using this implementation */ - } - - SWITCH_ADD_CODEC(codec_interface, "G.711 alaw"); - for (count = 12; count > 0; count--) { - switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */ - 8, /* the IANA code number */ - "PCMA", /* the IANA code name */ - NULL, /* default fmtp to send (can be overridden by the init function) */ - 8000, /* samples transferred per second */ - 8000, /* actual samples transferred per second */ - 64000, /* bits transferred per second */ - mpf * count, /* number of microseconds per frame */ - spf * count, /* number of samples per frame */ - bpf * count, /* number of bytes per frame decompressed */ - ebpf * count, /* number of bytes per frame compressed */ - 1, /* number of channels represented */ - spf * count, /* number of frames per network packet */ - switch_g711a_init, /* function to initialize a codec handle using this implementation */ - switch_g711a_encode, /* function to encode raw data into encoded data */ - switch_g711a_decode, /* function to decode encoded data into raw data */ - switch_g711a_destroy); /* deinitalize a codec handle using this implementation */ - } -#endif - - /* GSM */ - mpf = 20000, spf = 160, bpf = 320, ebpf = 33; - SWITCH_ADD_CODEC(codec_interface, "GSM"); - for (count = 6; count > 0; count--) { - switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */ - 3, /* the IANA code number */ - "GSM", /* the IANA code name */ - NULL, /* default fmtp to send (can be overridden by the init function) */ - 8000, /* samples transferred per second */ - 8000, /* actual samples transferred per second */ - 13200, /* bits transferred per second */ - mpf * count, /* number of microseconds per frame */ - spf * count, /* number of samples per frame */ - bpf * count, /* number of bytes per frame decompressed */ - ebpf * count, /* number of bytes per frame compressed */ - 1, /* number of channels represented */ - count, /* number of frames per network packet */ - switch_gsm_init, /* function to initialize a codec handle using this implementation */ - switch_gsm_encode, /* function to encode raw data into encoded data */ - switch_gsm_decode, /* function to decode encoded data into raw data */ - switch_gsm_destroy); /* deinitalize a codec handle using this implementation */ - } - /* LPC10 */ -#if SWITCH_MAX_INTERVAL >= 90 - SWITCH_ADD_CODEC(codec_interface, "LPC-10"); - switch_core_codec_add_implementation(pool, codec_interface, SWITCH_CODEC_TYPE_AUDIO, /* enumeration defining the type of the codec */ - 7, /* the IANA code number */ - "LPC", /* the IANA code name */ - NULL, /* default fmtp to send (can be overridden by the init function) */ - 8000, /* samples transferred per second */ - 8000, /* actual samples transferred per second */ - 2400, /* bits transferred per second */ - 90000, /* number of microseconds per frame */ - 720, /* number of samples per frame */ - 1440, /* number of bytes per frame decompressed */ - 28, /* number of bytes per frame compressed */ - 1, /* number of channels represented */ - 4, /* number of frames per network packet */ - switch_lpc10_init, /* function to initialize a codec handle using this implementation */ - switch_lpc10_encode, /* function to encode raw data into encoded data */ - switch_lpc10_decode, /* function to decode encoded data into raw data */ - switch_lpc10_destroy); /* deinitalize a codec handle using this implementation */ -#endif - /* indicate that the module should continue to be loaded */ - return SWITCH_STATUS_SUCCESS; -} - -/* For Emacs: - * Local Variables: - * mode:c - * indent-tabs-mode:t - * tab-width:4 - * c-basic-offset:4 - * End: - * For VIM: - * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet: - */ diff --git a/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.vcproj b/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.vcproj deleted file mode 100644 index ac524dc16e..0000000000 --- a/src/mod/codecs/mod_voipcodecs/mod_voipcodecs.vcproj +++ /dev/null @@ -1,155 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/mod/codecs/mod_vp8/Makefile.am b/src/mod/codecs/mod_vp8/Makefile.am new file mode 100644 index 0000000000..bd0bd7af05 --- /dev/null +++ b/src/mod/codecs/mod_vp8/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_vp8 + +mod_LTLIBRARIES = mod_vp8.la +mod_vp8_la_SOURCES = mod_vp8.c +mod_vp8_la_CFLAGS = $(AM_CFLAGS) +mod_vp8_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_vp8_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/dialplans/mod_dialplan_asterisk/Makefile.am b/src/mod/dialplans/mod_dialplan_asterisk/Makefile.am new file mode 100644 index 0000000000..ef956d7431 --- /dev/null +++ b/src/mod/dialplans/mod_dialplan_asterisk/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_dialplan_asterisk + +mod_LTLIBRARIES = mod_dialplan_asterisk.la +mod_dialplan_asterisk_la_SOURCES = mod_dialplan_asterisk.c +mod_dialplan_asterisk_la_CFLAGS = $(AM_CFLAGS) +mod_dialplan_asterisk_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_dialplan_asterisk_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/dialplans/mod_dialplan_directory/Makefile.am b/src/mod/dialplans/mod_dialplan_directory/Makefile.am new file mode 100644 index 0000000000..3498d1dc5a --- /dev/null +++ b/src/mod/dialplans/mod_dialplan_directory/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_dialplan_directory + +mod_LTLIBRARIES = mod_dialplan_directory.la +mod_dialplan_directory_la_SOURCES = mod_dialplan_directory.c +mod_dialplan_directory_la_CFLAGS = $(AM_CFLAGS) +mod_dialplan_directory_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_dialplan_directory_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/dialplans/mod_dialplan_xml/Makefile.am b/src/mod/dialplans/mod_dialplan_xml/Makefile.am new file mode 100644 index 0000000000..de46ce6926 --- /dev/null +++ b/src/mod/dialplans/mod_dialplan_xml/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_dialplan_xml + +mod_LTLIBRARIES = mod_dialplan_xml.la +mod_dialplan_xml_la_SOURCES = mod_dialplan_xml.c +mod_dialplan_xml_la_CFLAGS = $(AM_CFLAGS) +mod_dialplan_xml_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_dialplan_xml_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/directories/mod_ldap/Makefile b/src/mod/directories/mod_ldap/Makefile.am similarity index 54% rename from src/mod/directories/mod_ldap/Makefile rename to src/mod/directories/mod_ldap/Makefile.am index 237f199f99..399cac5c9c 100644 --- a/src/mod/directories/mod_ldap/Makefile +++ b/src/mod/directories/mod_ldap/Makefile.am @@ -1,20 +1,20 @@ -BASE=../../../.. - +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_ldap LDAP=openldap-2.4.19 LDAP_DIR=$(switch_srcdir)/libs/$(LDAP) LDAP_BUILDDIR=$(switch_builddir)/libs/$(LDAP) - LDAPLA=$(LDAP_BUILDDIR)/libraries/libldap_r/libldap_r.la LIBLBERLA=$(LDAP_BUILDDIR)/libraries/liblber/liblber.la +mod_LTLIBRARIES = mod_ldap.la +mod_ldap_la_SOURCES = mod_ldap.c +mod_ldap_la_CFLAGS = $(AM_CFLAGS) -DWITH_OPENLDAP -DLDAP_DEPRECATED -I$(LDAP_DIR)/include +mod_ldap_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(LDAPLA) $(LIBLBERLA) +mod_ldap_la_LDFLAGS = -avoid-version -module -no-undefined -shared -LOCAL_CFLAGS=-DWITH_OPENLDAP -DLDAP_DEPRECATED -I$(LDAP_DIR)/include +DEFAULT_ARGS= --disable-slapd --disable-bdb --disable-hdb -LOCAL_LIBADD=$(LDAPLA) $(LIBLBERLA) - -include $(BASE)/build/modmake.rules - -DEFAULT_ARGS+= --disable-slapd --disable-bdb --disable-hdb +$(MODNAME).lo: $(LDAPLA) $(LIBLBERLA) $(LDAP_DIR): $(GETLIB) $(LDAP).tar.gz diff --git a/src/mod/endpoints/mod_alsa/Makefile b/src/mod/endpoints/mod_alsa/Makefile deleted file mode 100644 index b57f550915..0000000000 --- a/src/mod/endpoints/mod_alsa/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -BASE=../../../.. - -LOCAL_CFLAGS=-I. -I$(PA_DIR)/include -D__EXTENSION__=1 -LOCAL_LDFLAGS=-lasound - -include $(BASE)/build/modmake.rules - - diff --git a/src/mod/endpoints/mod_alsa/Makefile.am b/src/mod/endpoints/mod_alsa/Makefile.am new file mode 100644 index 0000000000..82e8a67a62 --- /dev/null +++ b/src/mod/endpoints/mod_alsa/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_alsa + +mod_LTLIBRARIES = mod_alsa.la +mod_alsa_la_SOURCES = mod_alsa.c +mod_alsa_la_CFLAGS = $(AM_CFLAGS) -I. -D__EXTENSION__=1 +mod_alsa_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_alsa_la_LDFLAGS = -avoid-version -module -no-undefined -shared -lasound diff --git a/src/mod/endpoints/mod_alsa/mod_alsa.c b/src/mod/endpoints/mod_alsa/mod_alsa.c index 884b5da17c..61f2e38d97 100644 --- a/src/mod/endpoints/mod_alsa/mod_alsa.c +++ b/src/mod/endpoints/mod_alsa/mod_alsa.c @@ -829,7 +829,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_alsa_load) - switch_core_hash_init(&globals.call_hash, module_pool); + switch_core_hash_init(&globals.call_hash); switch_mutex_init(&globals.device_lock, SWITCH_MUTEX_NESTED, module_pool); switch_mutex_init(&globals.pvt_lock, SWITCH_MUTEX_NESTED, module_pool); switch_mutex_init(&globals.flag_mutex, SWITCH_MUTEX_NESTED, module_pool); diff --git a/src/mod/endpoints/mod_dingaling/Makefile b/src/mod/endpoints/mod_dingaling/Makefile deleted file mode 100644 index c56dc228cb..0000000000 --- a/src/mod/endpoints/mod_dingaling/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -BASE=../../../.. - -LOCAL_CFLAGS = `$(BASE)/libs/apr/apr-1-config --cflags --cppflags --includes` -LOCAL_CFLAGS += `$(BASE)/libs/apr-util/apu-1-config --includes` -#LOCAL_CFLAGS += -w - -IKS_DIR=$(BASE)/libs/iksemel -IKS_LA=$(IKS_DIR)/src/libiksemel.la -DING_DIR=$(BASE)/libs/libdingaling -LOCAL_CFLAGS += -I$(DING_DIR)/src -I$(BASE)/libs/iksemel/include -LOCAL_OBJS=$(DING_DIR)/src/libdingaling.o $(DING_DIR)/src/sha1.o $(IKS_LA) -LOCAL_SOURCES=$(DING_DIR)/src/libdingaling.c $(DING_DIR)/src/sha1.c $(DING_DIR)/src/libdingaling.h -LOCAL_LDFLAGS=$(LIBGNUTLS_LIBS) -include $(BASE)/build/modmake.rules - - -$(IKS_LA): $(IKS_DIR) $(IKS_DIR)/.update - @cd $(IKS_DIR) && $(MAKE) - @$(TOUCH_TARGET) - - - - diff --git a/src/mod/endpoints/mod_dingaling/Makefile.am b/src/mod/endpoints/mod_dingaling/Makefile.am new file mode 100644 index 0000000000..dbfed5e34f --- /dev/null +++ b/src/mod/endpoints/mod_dingaling/Makefile.am @@ -0,0 +1,21 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_dingaling +IKS_DIR=$(switch_srcdir)/libs/iksemel +IKS_BUILDDIR=$(switch_builddir)/libs/iksemel +IKS_LA=$(IKS_BUILDDIR)/src/libiksemel.la +DING_DIR=$(switch_srcdir)/libs/libdingaling + +mod_LTLIBRARIES = mod_dingaling.la +mod_dingaling_la_SOURCES = mod_dingaling.c ../../../../libs/libdingaling/src/libdingaling.c ../../../../libs/libdingaling/src/sha1.c +mod_dingaling_la_CFLAGS = $(AM_CFLAGS) +mod_dingaling_la_CFLAGS += `$(switch_srcdir)/libs/apr/apr-1-config --cflags --cppflags --includes` +mod_dingaling_la_CFLAGS += `$(switch_srcdir)/libs/apr-util/apu-1-config --includes` +mod_dingaling_la_CFLAGS += -I$(DING_DIR)/src -I$(IKS_DIR)/include +mod_dingaling_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(IKS_LA) +mod_dingaling_la_LDFLAGS = -avoid-version -module -no-undefined -shared + +BUILT_SOURCES=$(IKS_LA) + +$(IKS_LA): $(IKS_DIR) $(IKS_DIR)/.update + @cd $(IKS_DIR) && $(MAKE) + @$(TOUCH_TARGET) diff --git a/src/mod/endpoints/mod_dingaling/mod_dingaling.c b/src/mod/endpoints/mod_dingaling/mod_dingaling.c index ab4e647032..4743a5c515 100644 --- a/src/mod/endpoints/mod_dingaling/mod_dingaling.c +++ b/src/mod/endpoints/mod_dingaling/mod_dingaling.c @@ -569,8 +569,8 @@ static void pres_event_handler(switch_event_t *event) switch_mprintf("select sub_from, sub_to,'%q','%q','%q','%q' from jabber_subscriptions where sub_to = '%q%q'", type, rpid, status, proto, pstr, from); - for (hi = switch_hash_first(NULL, globals.profile_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, NULL, NULL, &val); + for (hi = switch_core_hash_first( globals.profile_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, NULL, NULL, &val); profile = (mdl_profile_t *) val; if (!(profile->user_flags & LDL_FLAG_COMPONENT)) { @@ -701,8 +701,8 @@ static void roster_event_handler(switch_event_t *event) sql = switch_mprintf("select *,'%q' from jabber_subscriptions", status ? status : ""); } - for (hi = switch_hash_first(NULL, globals.profile_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, NULL, NULL, &val); + for (hi = switch_core_hash_first( globals.profile_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, NULL, NULL, &val); profile = (mdl_profile_t *) val; if (!(profile->user_flags & LDL_FLAG_COMPONENT)) { @@ -738,8 +738,8 @@ static void ipchanged_event_handler(switch_event_t *event) mdl_profile_t *profile; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "IP change detected [%s]->[%s]\n", old_ip4, new_ip4); if (globals.profile_hash) { - for (hi = switch_hash_first(NULL, globals.profile_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, NULL, NULL, &val); + for (hi = switch_core_hash_first( globals.profile_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, NULL, NULL, &val); profile = (mdl_profile_t *) val; if (old_ip4 && profile->extip && !strcmp(profile->extip, old_ip4)) { tmp = profile->extip; @@ -799,8 +799,8 @@ static void sign_off(void) sql = switch_mprintf("select * from jabber_subscriptions"); - for (hi = switch_hash_first(NULL, globals.profile_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, NULL, NULL, &val); + for (hi = switch_core_hash_first( globals.profile_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, NULL, NULL, &val); profile = (mdl_profile_t *) val; if (!(profile->user_flags & LDL_FLAG_COMPONENT)) { @@ -2684,8 +2684,8 @@ static switch_status_t list_profiles(const char *line, const char *cursor, switc switch_console_callback_match_t *my_matches = NULL; switch_status_t status = SWITCH_STATUS_FALSE; - for (hi = switch_hash_first(NULL, globals.profile_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, &vvar, NULL, &val); + for (hi = switch_core_hash_first( globals.profile_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, &vvar, NULL, &val); profile = (mdl_profile_t *) val; if (!strncmp("dl_logout", line, 9)) { if (profile->handle) { @@ -3090,8 +3090,8 @@ SWITCH_STANDARD_API(dingaling) if (argv[0] && !strncasecmp(argv[0], "status", 6)) { stream->write_function(stream, "--DingaLing status--\n"); stream->write_function(stream, "login | connected\n"); - for (hi = switch_hash_first(NULL, globals.profile_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, NULL, NULL, &val); + for (hi = switch_core_hash_first( globals.profile_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, NULL, NULL, &val); profile = (mdl_profile_t *) val; stream->write_function(stream, "%s | ", profile->login); if (profile->handle && ldl_handle_authorized(profile->handle)) { @@ -3276,7 +3276,7 @@ static switch_status_t soft_reload(void) void *data = NULL; switch_hash_t *name_hash; switch_hash_index_t *hi; - switch_core_hash_init(&name_hash, module_pool); + switch_core_hash_init(&name_hash); if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Open of %s failed\n", cf); @@ -3345,8 +3345,8 @@ static switch_status_t soft_reload(void) switch_xml_free(xml); - for (hi = switch_hash_first(NULL, globals.profile_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, NULL, NULL, &data); + for (hi = switch_core_hash_first( globals.profile_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, NULL, NULL, &data); profile = (mdl_profile_t *) data; if (switch_core_hash_find(name_hash, profile->name)) { @@ -3356,8 +3356,8 @@ static switch_status_t soft_reload(void) } } - for (hi = switch_hash_first(NULL, name_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, NULL, NULL, &data); + for (hi = switch_core_hash_first( name_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, NULL, NULL, &data); if ((profile = switch_core_hash_find(globals.profile_hash, (char *) data))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Deleting unused profile %s [%s]\n", profile->name, profile->login); @@ -3382,7 +3382,7 @@ static switch_status_t load_config(void) switch_find_local_ip(globals.guess_ip, sizeof(globals.guess_ip), NULL, AF_INET); - switch_core_hash_init(&globals.profile_hash, module_pool); + switch_core_hash_init(&globals.profile_hash); if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Open of %s failed\n", cf); diff --git a/src/mod/endpoints/mod_h323/Makefile b/src/mod/endpoints/mod_h323/Makefile deleted file mode 100644 index 57668ee8dd..0000000000 --- a/src/mod/endpoints/mod_h323/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -BASE=../../../.. - -export PTLIBDIR = $(shell /usr/bin/ptlib-config --ptlibdir) -LOCAL_CFLAGS+=-g -I$PTLIBDIR -I/usr/include/openh323 -I. -DPTRACING=1 -D_REENTRANT -fno-exceptions -LOCAL_LDFLAGS= -L/usr/lib -lopenh323 -lpt -lrt - -ifeq ($(shell uname -m),x86_64) -LOCAL_CFLAGS+=-DP_64BIT -endif - -include $(BASE)/build/modmake.rules diff --git a/src/mod/endpoints/mod_h323/Makefile.am b/src/mod/endpoints/mod_h323/Makefile.am new file mode 100644 index 0000000000..f0cd535aca --- /dev/null +++ b/src/mod/endpoints/mod_h323/Makefile.am @@ -0,0 +1,14 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_h323 + +PTLIBDIR = `/usr/bin/ptlib-config --ptlibdir` + +mod_LTLIBRARIES = mod_h323.la +mod_h323_la_SOURCES = mod_h323.c +mod_h323_la_CFLAGS = $(AM_CFLAGS) -I$(PTLIBDIR) -I/usr/include/openh323 -I. -DPTRACING=1 -D_REENTRANT -fno-exceptions +mod_h323_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_h323_la_LDFLAGS = -avoid-version -module -no-undefined -shared -L/usr/lib -lopenh323 -lpt -lrt + +if IS64BITLINUX +mod_h323_la_CFLAGS += -DP_64BIT +endif diff --git a/src/mod/endpoints/mod_khomp/Makefile b/src/mod/endpoints/mod_khomp/Makefile deleted file mode 100644 index db1a6fe4e4..0000000000 --- a/src/mod/endpoints/mod_khomp/Makefile +++ /dev/null @@ -1,57 +0,0 @@ -MODNAME := mod_khomp -VERBOSE := 1 - -#FreeSWITCH source PATH is needed: -# Set FREESWITCH_PATH - -ifeq ($(strip $(FREESWITCH_PATH)),) - BASE := ../../../../ -else - BASE := $(FREESWITCH_PATH) -endif - -curr_dir := $(shell pwd) - -versions := -DFS_VERSION_MAJOR=$(shell bash $(curr_dir)/tools/getversion.sh "SWITCH_VERSION_MAJOR" $(BASE)) -DFS_VERSION_MINOR=$(shell bash $(curr_dir)/tools/getversion.sh "SWITCH_VERSION_MINOR" $(BASE)) -DFS_VERSION_MICRO=$(shell bash $(curr_dir)/tools/getversion.sh "SWITCH_VERSION_MICRO" $(BASE)) - -LOCAL_CFLAGS = -I./ -I./include -I./commons -I./commons/base -I./support -D_REENTRANT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DK3L_HOSTSYSTEM -DCOMMONS_LIBRARY_USING_FREESWITCH -g -ggdb #-DDEBUG_FLAGS -LOCAL_CFLAGS += $(versions) - -LOCAL_LDFLAGS = -lk3l - -LOCAL_OBJS = ./commons/base/k3lapi.o ./commons/base/k3lutil.o ./commons/base/config_options.o ./commons/base/format.o ./commons/base/strings.o ./commons/base/ringbuffer.o ./commons/base/verbose.o ./commons/base/saved_condition.o ./commons/base/regex.o ./commons/base/timer.o ./commons/base/configurator/configfile.o ./commons/base/configurator/option.o ./commons/base/configurator/section.o ./commons/base/configurator/restriction.o ./commons/base/verbose_traits.o -LOCAL_OBJS += ./support/klog-config.o ./support/klog-options.o ./support/config_defaults.o -LOCAL_OBJS += ./src/globals.o ./src/opt.o ./src/frame.o ./src/utils.o ./src/lock.o ./src/spec.o ./src/applications.o ./src/khomp_pvt_fxo.o ./src/khomp_pvt_gsm.o ./src/khomp_pvt_kxe1.o ./src/khomp_pvt_passive.o ./src/khomp_pvt.o ./src/logger.o ./src/cli.o - -conf_file_name := khomp.conf.xml -conf_file_dir := $(curr_dir)/Install/files -conf_file_dir_alt := $(curr_dir)/conf -conf_file_install = $(sysconfdir)/autoload_configs - -include $(BASE)/build/modmake.rules - -local_depend: - @if test ! -f $(curr_dir)/commons/base/verbose_traits.hpp || test ! -f $(curr_dir)/commons/base/verbose_traits.cpp ; then \ - echo "Generating verbose_traits" ;\ - bash $(curr_dir)/commons/tools/generate-verbose-headers.sh commons/base/ include/k3l.h ;\ - fi; - -depend_install: - @if test "w`kserver --version 2>/dev/null | grep 2.1`" == "w" ; then \ - echo "###############################################################################" ;\ - echo "Install k3l from KHOMP." ;\ - echo "Run: $(curr_dir)/tools/getk3l.sh" ;\ - echo "###############################################################################" ;\ - exit 1;\ - fi; - @echo "Copy $(conf_file_name)" - @if test -d $(conf_file_install) ; then \ - if test -f $(conf_file_dir)/$(conf_file_name) ; then \ - cp $(conf_file_dir)/$(conf_file_name) $(conf_file_install)/$(conf_file_name).new ;\ - else \ - cp $(conf_file_dir_alt)/$(conf_file_name) $(conf_file_install)/$(conf_file_name).new ;\ - fi; \ - if test ! -f "$(conf_file_install)/$(conf_file_name)" ; then \ - mv $(conf_file_install)/$(conf_file_name).new $(conf_file_install)/$(conf_file_name) ;\ - fi; \ - fi; diff --git a/src/mod/endpoints/mod_khomp/Makefile.am b/src/mod/endpoints/mod_khomp/Makefile.am new file mode 100644 index 0000000000..c3f56dcd59 --- /dev/null +++ b/src/mod/endpoints/mod_khomp/Makefile.am @@ -0,0 +1,50 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_khomp +mod_LTLIBRARIES = mod_khomp.la +mod_khomp_la_SOURCES = mod_khomp.c +mod_khomp_la_CFLAGS = $(AM_CFLAGS) +mod_khomp_la_CFLAGS += -I./ -I./include -I./commons -I./commons/base -I./support +mod_khomp_la_CFLAGS += -D_REENTRANT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DK3L_HOSTSYSTEM -DCOMMONS_LIBRARY_USING_FREESWITCH +mod_khomp_la_CFLAGS += -DFS_VERSION_MAJOR=`./tools/getversion.sh "SWITCH_VERSION_MAJOR" $(switch_srcdir)` +mod_khomp_la_CFLAGS += -DFS_VERSION_MINOR=`./tools/getversion.sh "SWITCH_VERSION_MINOR" $(switch_srcdir)` +mod_khomp_la_CFLAGS += -DFS_VERSION_MICRO=`./tools/getversion.sh "SWITCH_VERSION_MICRO" $(switch_srcdir)` +mod_khomp_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_khomp_la_LDFLAGS = -avoid-version -module -no-undefined -shared -lk3l + + +mod_khomp_la_SOURCES += ./commons/base/k3lapi.cpp ./commons/base/k3lutil.cpp ./commons/base/config_options.cpp ./commons/base/format.cpp ./commons/base/strings.cpp ./commons/base/ringbuffer.cpp ./commons/base/verbose.cpp ./commons/base/saved_condition.cpp ./commons/base/regex.cpp ./commons/base/timer.cpp ./commons/base/configurator/configfile.cpp ./commons/base/configurator/option.cpp ./commons/base/configurator/section.cpp ./commons/base/configurator/restriction.cpp ./commons/base/verbose_traits.cpp +mod_khomp_la_SOURCES += ./support/klog-config.cpp ./support/klog-options.cpp ./support/config_defaults.cpp +mod_khomp_la_SOURCES += ./src/globals.cpp ./src/opt.cpp ./src/frame.cpp ./src/utils.cpp ./src/lock.cpp ./src/spec.cpp ./src/applications.cpp ./src/khomp_pvt_fxo.cpp ./src/khomp_pvt_gsm.cpp ./src/khomp_pvt_kxe1.cpp ./src/khomp_pvt_passive.cpp ./src/khomp_pvt.cpp ./src/logger.cpp ./src/cli.cpp + +conf_file_name = khomp.conf.xml +conf_file_dir = ./Install/files +conf_file_dir_alt = ./conf +conf_file_install = $(sysconfdir)/autoload_configs + +BUILT_SOURCES=verbose_traits.hpp verbose_traits.cpp + +verbose_traits.hpp verbose_traits.cpp: + @if test ! -f ./commons/base/verbose_traits.hpp || test ! -f ./commons/base/verbose_traits.cpp ; then \ + echo "Generating verbose_traits" ;\ + bash ./commons/tools/generate-verbose-headers.sh commons/base/ include/k3l.h ;\ + fi; + +install: + @if test "w`kserver --version 2>/dev/null | grep 2.1`" == "w" ; then \ + echo "###############################################################################" ;\ + echo "Install k3l from KHOMP." ;\ + echo "Run: ./tools/getk3l.sh" ;\ + echo "###############################################################################" ;\ + exit 1;\ + fi; + @echo "Copy $(conf_file_name)" + @if test -d $(conf_file_install) ; then \ + if test -f $(conf_file_dir)/$(conf_file_name) ; then \ + cp $(conf_file_dir)/$(conf_file_name) $(conf_file_install)/$(conf_file_name).new ;\ + else \ + cp $(conf_file_dir_alt)/$(conf_file_name) $(conf_file_install)/$(conf_file_name).new ;\ + fi; \ + if test ! -f "$(conf_file_install)/$(conf_file_name)" ; then \ + mv $(conf_file_install)/$(conf_file_name).new $(conf_file_install)/$(conf_file_name) ;\ + fi; \ + fi; diff --git a/src/mod/endpoints/mod_loopback/Makefile b/src/mod/endpoints/mod_loopback/Makefile deleted file mode 100644 index 2c35e6e98f..0000000000 --- a/src/mod/endpoints/mod_loopback/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -BASE=../../../.. -include $(BASE)/build/modmake.rules diff --git a/src/mod/endpoints/mod_loopback/Makefile.am b/src/mod/endpoints/mod_loopback/Makefile.am new file mode 100644 index 0000000000..c66fafb3af --- /dev/null +++ b/src/mod/endpoints/mod_loopback/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_loopback + +mod_LTLIBRARIES = mod_loopback.la +mod_loopback_la_SOURCES = mod_loopback.c +mod_loopback_la_CFLAGS = $(AM_CFLAGS) +mod_loopback_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_loopback_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/endpoints/mod_opal/Makefile b/src/mod/endpoints/mod_opal/Makefile deleted file mode 100644 index d80ba64e57..0000000000 --- a/src/mod/endpoints/mod_opal/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -BASE=../../../.. - -PKG_DIR:=/usr/local/lib/pkgconfig -ifeq ($(PKG_CONFIG_PATH),) - export PKG_CONFIG_PATH:=$(PKG_DIR) -else - ifeq ($(findstring $(PKG_DIR),$(PKG_CONFIG_PATH)),) - export PKG_CONFIG_PATH:=$(PKG_CONFIG_PATH):$(PKG_DIR) - endif -endif - -#DEBUG_SUFFIX:=--define-variable=suffix=_d - -LOCAL_INSERT_CFLAGS= pkg-config opal $(DEBUG_SUFFIX) --cflags -LOCAL_CFLAGS+=-g -ggdb -LOCAL_INSERT_LDFLAGS= pkg-config opal $(DEBUG_SUFFIX) --libs - -include $(BASE)/build/modmake.rules - - diff --git a/src/mod/endpoints/mod_opal/Makefile.am b/src/mod/endpoints/mod_opal/Makefile.am new file mode 100644 index 0000000000..1a82c75f9a --- /dev/null +++ b/src/mod/endpoints/mod_opal/Makefile.am @@ -0,0 +1,11 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_opal + +PKG_DIR=/usr/local/lib/pkgconfig + +#DEBUG_SUFFIX:=--define-variable=suffix=_d +mod_LTLIBRARIES = mod_opal.la +mod_opal_la_SOURCES = mod_opal.c +mod_opal_la_CFLAGS = $(AM_CFLAGS) `PKG_CONFIG_PATH=$(PKG_CONFIG_PATH):$(PKG_DIR) pkg-config opal $(DEBUG_SUFFIX) --cflags` +mod_opal_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_opal_la_LDFLAGS = -avoid-version -module -no-undefined -shared `pkg-config opal $(DEBUG_SUFFIX) --libs` diff --git a/src/mod/endpoints/mod_portaudio/mod_portaudio.c b/src/mod/endpoints/mod_portaudio/mod_portaudio.c index 244129117c..4ded89dfcd 100644 --- a/src/mod/endpoints/mod_portaudio/mod_portaudio.c +++ b/src/mod/endpoints/mod_portaudio/mod_portaudio.c @@ -1308,9 +1308,9 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_portaudio_load) memset(&globals, 0, sizeof(globals)); - switch_core_hash_init(&globals.call_hash, module_pool); - switch_core_hash_init(&globals.sh_streams, module_pool); - switch_core_hash_init(&globals.endpoints, module_pool); + switch_core_hash_init(&globals.call_hash); + switch_core_hash_init(&globals.sh_streams); + switch_core_hash_init(&globals.endpoints); switch_mutex_init(&globals.device_lock, SWITCH_MUTEX_NESTED, module_pool); switch_mutex_init(&globals.pvt_lock, SWITCH_MUTEX_NESTED, module_pool); switch_mutex_init(&globals.streams_lock, SWITCH_MUTEX_NESTED, module_pool); @@ -2491,11 +2491,11 @@ static switch_status_t list_shared_streams(char **argv, int argc, switch_stream_ { switch_hash_index_t *hi; int cnt = 0; - for (hi = switch_hash_first(NULL, globals.sh_streams); hi; hi = switch_hash_next(hi)) { + for (hi = switch_core_hash_first( globals.sh_streams); hi; hi = switch_core_hash_next(hi)) { const void *var; void *val; shared_audio_stream_t *s = NULL; - switch_hash_this(hi, &var, NULL, &val); + switch_core_hash_this(hi, &var, NULL, &val); s = val; stream->write_function(stream, "%s> indev: %d, outdev: %d, sample-rate: %d, codec-ms: %d, channels: %d\n", s->name, s->indev, s->outdev, s->sample_rate, s->codec_ms, s->channels); @@ -2509,11 +2509,11 @@ static switch_status_t list_endpoints(char **argv, int argc, switch_stream_handl { switch_hash_index_t *hi; int cnt = 0; - for (hi = switch_hash_first(NULL, globals.endpoints); hi; hi = switch_hash_next(hi)) { + for (hi = switch_core_hash_first( globals.endpoints); hi; hi = switch_core_hash_next(hi)) { const void *var; void *val; audio_endpoint_t *e = NULL; - switch_hash_this(hi, &var, NULL, &val); + switch_core_hash_this(hi, &var, NULL, &val); e = val; stream->write_function(stream, "%s> instream: %s, outstream: %s\n", e->name, e->in_stream ? e->in_stream->name : "(none)", diff --git a/src/mod/endpoints/mod_reference/Makefile b/src/mod/endpoints/mod_reference/Makefile deleted file mode 100644 index bdace9ddf9..0000000000 --- a/src/mod/endpoints/mod_reference/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -MODNAME=mod_conference -include ../../../../build/modmake.rules diff --git a/src/mod/endpoints/mod_reference/Makefile.am b/src/mod/endpoints/mod_reference/Makefile.am new file mode 100644 index 0000000000..47dd3edd46 --- /dev/null +++ b/src/mod/endpoints/mod_reference/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_reference + +mod_LTLIBRARIES = mod_reference.la +mod_reference_la_SOURCES = mod_reference.c +mod_reference_la_CFLAGS = $(AM_CFLAGS) +mod_reference_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_reference_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/endpoints/mod_rtmp/Makefile b/src/mod/endpoints/mod_rtmp/Makefile deleted file mode 100644 index c2a7e251a8..0000000000 --- a/src/mod/endpoints/mod_rtmp/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -BASE=../../../.. - -LIBAMF_OBJS=libamf/src/amf0.o libamf/src/hash.o libamf/src/io.o libamf/src/ptrarray.o libamf/src/types.o -LOCAL_OBJS=rtmp_sig.o rtmp.o rtmp_tcp.o $(LIBAMF_OBJS) -LOCAL_CFLAGS=-Ilibamf/src - -include $(BASE)/build/modmake.rules diff --git a/src/mod/endpoints/mod_rtmp/Makefile.am b/src/mod/endpoints/mod_rtmp/Makefile.am new file mode 100644 index 0000000000..eec6a5d1ba --- /dev/null +++ b/src/mod/endpoints/mod_rtmp/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_rtmp +mod_LTLIBRARIES = mod_rtmp.la +mod_rtmp_la_SOURCES = mod_rtmp.c rtmp_sig.c rtmp.c rtmp_tcp.c +mod_rtmp_la_SOURCES += libamf/src/amf0.c libamf/src/hash.c libamf/src/io.c libamf/src/ptrarray.c libamf/src/types.c +mod_rtmp_la_CFLAGS = $(AM_CFLAGS) -Ilibamf/src +mod_rtmp_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_rtmp_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/endpoints/mod_rtmp/libamf/src/amf0.c b/src/mod/endpoints/mod_rtmp/libamf/src/amf0.c index f5c0a22526..887cfec26c 100644 --- a/src/mod/endpoints/mod_rtmp/libamf/src/amf0.c +++ b/src/mod/endpoints/mod_rtmp/libamf/src/amf0.c @@ -1,6 +1,7 @@ +#include "amf0.h" + #include -#include "amf0.h" #include "io.h" #include "types.h" diff --git a/src/mod/endpoints/mod_rtmp/libamf/src/amf0.h b/src/mod/endpoints/mod_rtmp/libamf/src/amf0.h index 9cb5b7f1c6..2fa6bb99c3 100644 --- a/src/mod/endpoints/mod_rtmp/libamf/src/amf0.h +++ b/src/mod/endpoints/mod_rtmp/libamf/src/amf0.h @@ -1,11 +1,11 @@ #ifndef __AMF0_H__ #define __AMF0_H__ +#include "amf.h" + #include #include -#include "amf.h" - /* AMF data types */ #define AMF0_TYPE_NUMBER 0x00 #define AMF0_TYPE_BOOLEAN 0x01 diff --git a/src/mod/endpoints/mod_rtmp/libamf/src/io.c b/src/mod/endpoints/mod_rtmp/libamf/src/io.c index 9b04631429..be65e82080 100644 --- a/src/mod/endpoints/mod_rtmp/libamf/src/io.c +++ b/src/mod/endpoints/mod_rtmp/libamf/src/io.c @@ -1,8 +1,8 @@ +#include "io.h" + #include #include -#include "io.h" - /* callback function to mimic fread using a memory buffer */ size_t buffer_read(void * out_buffer, size_t size, void * user_data) { buffer_context * ctxt = (buffer_context *)user_data; diff --git a/src/mod/endpoints/mod_rtmp/mod_rtmp.c b/src/mod/endpoints/mod_rtmp/mod_rtmp.c index 37ebdd27f5..3e4d5c0bf8 100644 --- a/src/mod/endpoints/mod_rtmp/mod_rtmp.c +++ b/src/mod/endpoints/mod_rtmp/mod_rtmp.c @@ -788,7 +788,7 @@ switch_status_t rtmp_session_request(rtmp_profile_t *profile, rtmp_session_t **n switch_core_hash_insert_wrlock(rtmp_globals.session_hash, (*newsession)->uuid, *newsession, rtmp_globals.session_rwlock); switch_core_hash_insert_wrlock(profile->session_hash, (*newsession)->uuid, *newsession, profile->session_rwlock); - switch_core_hash_init(&(*newsession)->session_hash, pool); + switch_core_hash_init(&(*newsession)->session_hash); switch_thread_rwlock_create(&(*newsession)->session_rwlock, pool); #ifdef RTMP_DEBUG_IO @@ -827,13 +827,13 @@ static void rtmp_garbage_colletor(void) top: - for (hi = switch_hash_first(NULL, rtmp_globals.session_hash); hi; hi = switch_hash_next(hi)) { + for (hi = switch_core_hash_first( rtmp_globals.session_hash); hi; hi = switch_core_hash_next(hi)) { void *val; const void *key; switch_ssize_t keylen; rtmp_session_t *rsession; - switch_hash_this(hi, &key, &keylen, &val); + switch_core_hash_this(hi, &key, &keylen, &val); rsession = (rtmp_session_t *) val; if (rsession->state == RS_DESTROY) { @@ -868,14 +868,14 @@ switch_status_t rtmp_real_session_destroy(rtmp_session_t **rsession) int sess = 0; switch_thread_rwlock_rdlock((*rsession)->session_rwlock); - for (hi = switch_hash_first(NULL, (*rsession)->session_hash); hi; hi = switch_hash_next(hi)) { + for (hi = switch_core_hash_first( (*rsession)->session_hash); hi; hi = switch_core_hash_next(hi)) { void *val; const void *key; switch_ssize_t keylen; switch_channel_t *channel; switch_core_session_t *session; - switch_hash_this(hi, &key, &keylen, &val); + switch_core_hash_this(hi, &key, &keylen, &val); /* If there are any sessions attached, abort the destroy operation */ if ((session = switch_core_session_locate((char *)key)) != NULL ) { @@ -1050,10 +1050,10 @@ switch_status_t rtmp_profile_start(const char *profilename) switch_thread_rwlock_create(&profile->rwlock, pool); switch_mutex_init(&profile->mutex, SWITCH_MUTEX_NESTED, pool); - switch_core_hash_init(&profile->session_hash, pool); + switch_core_hash_init(&profile->session_hash); switch_thread_rwlock_create(&profile->session_rwlock, pool); switch_thread_rwlock_create(&profile->reg_rwlock, pool); - switch_core_hash_init(&profile->reg_hash, pool); + switch_core_hash_init(&profile->reg_hash); if (!strcmp(profile->io_name, "tcp")) { if (rtmp_tcp_init(profile, profile->bind_address, &profile->io, pool) != SWITCH_STATUS_SUCCESS) { @@ -1086,12 +1086,12 @@ switch_status_t rtmp_profile_destroy(rtmp_profile_t **profile) { switch_thread_rwlock_wrlock((*profile)->rwlock); /* Kill all sessions */ - while ((hi = switch_hash_first(NULL, (*profile)->session_hash))) { + while ((hi = switch_core_hash_first( (*profile)->session_hash))) { void *val; rtmp_session_t *session; const void *key; switch_ssize_t keylen; - switch_hash_this(hi, &key, &keylen, &val); + switch_core_hash_this(hi, &key, &keylen, &val); session = val; @@ -1633,12 +1633,12 @@ SWITCH_STANDARD_API(rtmp_function) stream->write_function(stream, "\nSessions:\n"); stream->write_function(stream, "uuid,address,user,domain,flashVer,state\n"); switch_thread_rwlock_rdlock(profile->session_rwlock); - for (hi = switch_hash_first(NULL, profile->session_hash); hi; hi = switch_hash_next(hi)) { + for (hi = switch_core_hash_first( profile->session_hash); hi; hi = switch_core_hash_next(hi)) { void *val; const void *key; switch_ssize_t keylen; rtmp_session_t *item; - switch_hash_this(hi, &key, &keylen, &val); + switch_core_hash_this(hi, &key, &keylen, &val); item = (rtmp_session_t *)val; stream->write_function(stream, "%s,%s:%d,%s,%s,%s,%s\n", @@ -1655,12 +1655,12 @@ SWITCH_STANDARD_API(rtmp_function) stream->write_function(stream, "user,nickname,uuid\n"); switch_thread_rwlock_rdlock(profile->reg_rwlock); - for (hi = switch_hash_first(NULL, profile->reg_hash); hi; hi = switch_hash_next(hi)) { + for (hi = switch_core_hash_first( profile->reg_hash); hi; hi = switch_core_hash_next(hi)) { void *val; const void *key; switch_ssize_t keylen; rtmp_reg_t *item; - switch_hash_this(hi, &key, &keylen, &val); + switch_core_hash_this(hi, &key, &keylen, &val); item = (rtmp_reg_t *)val; for (;item;item = item->next) { @@ -1681,12 +1681,12 @@ SWITCH_STANDARD_API(rtmp_function) } else { switch_hash_index_t *hi; switch_thread_rwlock_rdlock(rtmp_globals.profile_rwlock); - for (hi = switch_hash_first(NULL, rtmp_globals.profile_hash); hi; hi = switch_hash_next(hi)) { + for (hi = switch_core_hash_first( rtmp_globals.profile_hash); hi; hi = switch_core_hash_next(hi)) { void *val; const void *key; switch_ssize_t keylen; rtmp_profile_t *item; - switch_hash_this(hi, &key, &keylen, &val); + switch_core_hash_this(hi, &key, &keylen, &val); item = (rtmp_profile_t *)val; stream->write_function(stream, "%s\t%s:%s\tprofile\n", item->name, item->io->name, item->io->address); @@ -1805,8 +1805,8 @@ static switch_status_t console_complete_hashtable(switch_hash_t *hash, const cha switch_console_callback_match_t *my_matches = NULL; switch_status_t status = SWITCH_STATUS_FALSE; - for (hi = switch_hash_first(NULL, hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, &vvar, NULL, &val); + for (hi = switch_core_hash_first( hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, &vvar, NULL, &val); switch_console_push_match(&my_matches, (const char *) vvar); } @@ -1845,9 +1845,9 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_rtmp_load) memset(&rtmp_globals, 0, sizeof(rtmp_globals)); switch_mutex_init(&rtmp_globals.mutex, SWITCH_MUTEX_NESTED, pool); - switch_core_hash_init(&rtmp_globals.profile_hash, pool); - switch_core_hash_init(&rtmp_globals.session_hash, pool); - switch_core_hash_init(&rtmp_globals.invoke_hash, pool); + switch_core_hash_init(&rtmp_globals.profile_hash); + switch_core_hash_init(&rtmp_globals.session_hash); + switch_core_hash_init(&rtmp_globals.invoke_hash); switch_thread_rwlock_create(&rtmp_globals.profile_rwlock, pool); switch_thread_rwlock_create(&rtmp_globals.session_rwlock, pool); @@ -1933,12 +1933,12 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_rtmp_shutdown) switch_hash_index_t *hi; switch_mutex_lock(rtmp_globals.mutex); - while ((hi = switch_hash_first(NULL, rtmp_globals.profile_hash))) { + while ((hi = switch_core_hash_first( rtmp_globals.profile_hash))) { void *val; const void *key; switch_ssize_t keylen; rtmp_profile_t *item; - switch_hash_this(hi, &key, &keylen, &val); + switch_core_hash_this(hi, &key, &keylen, &val); item = (rtmp_profile_t *)val; diff --git a/src/mod/endpoints/mod_rtmp/rtmp.c b/src/mod/endpoints/mod_rtmp/rtmp.c index cebcec244d..5e9c67428c 100644 --- a/src/mod/endpoints/mod_rtmp/rtmp.c +++ b/src/mod/endpoints/mod_rtmp/rtmp.c @@ -243,12 +243,12 @@ switch_status_t rtmp_check_auth(rtmp_session_t *rsession, const char *user, cons if (disallow_multiple_registration) { switch_hash_index_t *hi; switch_thread_rwlock_rdlock(rsession->profile->session_rwlock); - for (hi = switch_hash_first(NULL, rsession->profile->session_hash); hi; hi = switch_hash_next(hi)) { + for (hi = switch_core_hash_first( rsession->profile->session_hash); hi; hi = switch_core_hash_next(hi)) { void *val; const void *key; switch_ssize_t keylen; rtmp_session_t *item; - switch_hash_this(hi, &key, &keylen, &val); + switch_core_hash_this(hi, &key, &keylen, &val); item = (rtmp_session_t *)val; if (rtmp_session_check_user(item, user, domain) == SWITCH_STATUS_SUCCESS) { diff --git a/src/mod/endpoints/mod_skinny/mod_skinny.c b/src/mod/endpoints/mod_skinny/mod_skinny.c index 9ca5362b78..2d243fdc02 100644 --- a/src/mod/endpoints/mod_skinny/mod_skinny.c +++ b/src/mod/endpoints/mod_skinny/mod_skinny.c @@ -197,8 +197,8 @@ skinny_profile_t *skinny_find_profile_by_domain(const char *domain_name) skinny_profile_t *profile = NULL, *tmp_profile; switch_mutex_lock(globals.mutex); - for (hi = switch_hash_first(NULL, globals.profile_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, NULL, NULL, &val); + for (hi = switch_core_hash_first( globals.profile_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, NULL, NULL, &val); tmp_profile = (skinny_profile_t *) val; switch_mutex_lock(tmp_profile->listener_mutex); @@ -1401,8 +1401,8 @@ static void walk_listeners(skinny_listener_callback_func_t callback, void *pvt) /* walk listeners */ switch_mutex_lock(globals.mutex); - for (hi = switch_hash_first(NULL, globals.profile_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, NULL, NULL, &val); + for (hi = switch_core_hash_first( globals.profile_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, NULL, NULL, &val); profile = (skinny_profile_t *) val; profile_walk_listeners(profile, callback, pvt); @@ -2086,7 +2086,7 @@ static switch_status_t load_skinny_config(void) } /* Soft Key Set Sets */ - switch_core_hash_init(&profile->soft_key_set_sets_hash, profile->pool); + switch_core_hash_init(&profile->soft_key_set_sets_hash); if ((xsoft_key_set_sets = switch_xml_child(xprofile, "soft-key-set-sets"))) { switch_xml_t xsoft_key_set_set; for (xsoft_key_set_set = switch_xml_child(xsoft_key_set_sets, "soft-key-set-set"); xsoft_key_set_set; xsoft_key_set_set = xsoft_key_set_set->next) { @@ -2154,7 +2154,7 @@ static switch_status_t load_skinny_config(void) /* Device types */ - switch_core_hash_init(&profile->device_type_params_hash, profile->pool); + switch_core_hash_init(&profile->device_type_params_hash); if ((xdevice_types = switch_xml_child(xprofile, "device-types"))) { switch_xml_t xdevice_type; for (xdevice_type = switch_xml_child(xdevice_types, "device-type"); xdevice_type; xdevice_type = xdevice_type->next) { @@ -2441,8 +2441,8 @@ static void skinny_trap_event_handler(switch_event_t *event) switch_mutex_lock(globals.mutex); if (globals.profile_hash) { - for (hi = switch_hash_first(NULL, globals.profile_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, &var, NULL, &val); + for (hi = switch_core_hash_first( globals.profile_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, &var, NULL, &val); if ((profile = (skinny_profile_t *) val) && profile->auto_restart) { if (!strcmp(profile->ip, old_ip4)) { skinny_profile_set(profile, "ip", new_ip4); @@ -2470,14 +2470,14 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_skinny_load) return SWITCH_STATUS_TERM; } switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, globals.pool); - switch_core_hash_init(&globals.profile_hash, globals.pool); + switch_core_hash_init(&globals.profile_hash); globals.running = 1; globals.auto_restart = SWITCH_TRUE; load_skinny_config(); /* at least one profile */ - if (!switch_hash_first(NULL, globals.profile_hash)) { + if (!switch_core_hash_first( globals.profile_hash)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No profile found!\n"); return SWITCH_STATUS_TERM; } @@ -2540,11 +2540,11 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_skinny_load) /* launch listeners */ switch_mutex_lock(globals.mutex); - for (hi = switch_hash_first(NULL, globals.profile_hash); hi; hi = switch_hash_next(hi)) { + for (hi = switch_core_hash_first( globals.profile_hash); hi; hi = switch_core_hash_next(hi)) { void *val; skinny_profile_t *profile; - switch_hash_this(hi, NULL, NULL, &val); + switch_core_hash_this(hi, NULL, NULL, &val); profile = (skinny_profile_t *) val; launch_skinny_profile_thread(profile); @@ -2587,9 +2587,9 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_skinny_shutdown) /* close sockets */ switch_mutex_lock(globals.mutex); - for (hi = switch_hash_first(NULL, globals.profile_hash); hi; hi = switch_hash_next(hi)) { + for (hi = switch_core_hash_first( globals.profile_hash); hi; hi = switch_core_hash_next(hi)) { skinny_profile_t *profile; - switch_hash_this(hi, NULL, NULL, &val); + switch_core_hash_this(hi, NULL, NULL, &val); profile = (skinny_profile_t *) val; close_socket(&profile->sock, profile); diff --git a/src/mod/endpoints/mod_skinny/skinny_api.c b/src/mod/endpoints/mod_skinny/skinny_api.c index f4c9560352..e56c9a33a1 100644 --- a/src/mod/endpoints/mod_skinny/skinny_api.c +++ b/src/mod/endpoints/mod_skinny/skinny_api.c @@ -49,8 +49,8 @@ static switch_status_t skinny_api_list_profiles(const char *line, const char *cu /* walk profiles */ switch_mutex_lock(globals.mutex); - for (hi = switch_hash_first(NULL, globals.profile_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, NULL, NULL, &val); + for (hi = switch_core_hash_first( globals.profile_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, NULL, NULL, &val); profile = (skinny_profile_t *) val; switch_console_push_match(&my_matches, profile->name); diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c index 43ec0df24d..06925863f0 100644 --- a/src/mod/endpoints/mod_sofia/mod_sofia.c +++ b/src/mod/endpoints/mod_sofia/mod_sofia.c @@ -1223,13 +1223,6 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi sofia_glue_execute_sql_now(tech_pvt->profile, &sql, SWITCH_TRUE); } - - if (((var = switch_channel_get_variable(channel, SOFIA_SECURE_MEDIA_VARIABLE)) || - (var = switch_channel_get_variable(channel, "rtp_secure_media"))) && - (switch_true(var) || switch_core_media_crypto_str2type(var) != CRYPTO_INVALID)) { - switch_channel_set_flag(tech_pvt->channel, CF_SECURE); - } - if (sofia_test_media_flag(tech_pvt->profile, SCMF_AUTOFIX_TIMING)) { switch_core_media_reset_autofix(tech_pvt->session, SWITCH_MEDIA_TYPE_AUDIO); } @@ -1252,18 +1245,18 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi case SWITCH_MESSAGE_INDICATE_VIDEO_REFRESH_REQ: { const char *pl = "\n\n\n\n\n\n\n\n"; - //time_t now = switch_epoch_time_now(NULL); + time_t now = switch_epoch_time_now(NULL); - //if (!tech_pvt->last_vid_info || (now - tech_pvt->last_vid_info) > 5) { + if (!tech_pvt->last_vid_info || (now - tech_pvt->last_vid_info) > 1) { - // tech_pvt->last_vid_info = now; + tech_pvt->last_vid_info = now; if (!zstr(msg->string_arg)) { pl = msg->string_arg; } nua_info(tech_pvt->nh, SIPTAG_CONTENT_TYPE_STR("application/media_control+xml"), SIPTAG_PAYLOAD_STR(pl), TAG_END()); - //} + } } break; @@ -2382,8 +2375,8 @@ static switch_status_t cmd_status(char **argv, int argc, switch_stream_handle_t stream->write_function(stream, "%25s\t%32s\t%s\t%s\t%s\n", "Profile::Gateway-Name", " Data ", "State", "IB Calls(F/T)", "OB Calls(F/T)"); stream->write_function(stream, "%s\n", line); switch_mutex_lock(mod_sofia_globals.hash_mutex); - for (hi = switch_hash_first(NULL, mod_sofia_globals.profile_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, &vvar, NULL, &val); + for (hi = switch_core_hash_first( mod_sofia_globals.profile_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, &vvar, NULL, &val); profile = (sofia_profile_t *) val; if (sofia_test_pflag(profile, PFLAG_RUNNING)) { @@ -2615,8 +2608,8 @@ static switch_status_t cmd_status(char **argv, int argc, switch_stream_handle_t stream->write_function(stream, "%25s\t%s\t %40s\t%s\n", "Name", " Type", "Data", "State"); stream->write_function(stream, "%s\n", line); switch_mutex_lock(mod_sofia_globals.hash_mutex); - for (hi = switch_hash_first(NULL, mod_sofia_globals.profile_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, &vvar, NULL, &val); + for (hi = switch_core_hash_first( mod_sofia_globals.profile_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, &vvar, NULL, &val); profile = (sofia_profile_t *) val; if (sofia_test_pflag(profile, PFLAG_RUNNING)) { @@ -2727,8 +2720,8 @@ static switch_status_t cmd_xml_status(char **argv, int argc, switch_stream_handl stream->write_function(stream, "\n", header); switch_mutex_lock(mod_sofia_globals.hash_mutex); - for (hi = switch_hash_first(NULL, mod_sofia_globals.profile_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, &vvar, NULL, &val); + for (hi = switch_core_hash_first( mod_sofia_globals.profile_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, &vvar, NULL, &val); profile = (sofia_profile_t *) val; if (sofia_test_pflag(profile, PFLAG_RUNNING)) { @@ -2899,8 +2892,8 @@ static switch_status_t cmd_xml_status(char **argv, int argc, switch_stream_handl stream->write_function(stream, "%s\n", header); stream->write_function(stream, "\n"); switch_mutex_lock(mod_sofia_globals.hash_mutex); - for (hi = switch_hash_first(NULL, mod_sofia_globals.profile_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, &vvar, NULL, &val); + for (hi = switch_core_hash_first( mod_sofia_globals.profile_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, &vvar, NULL, &val); profile = (sofia_profile_t *) val; if (sofia_test_pflag(profile, PFLAG_RUNNING)) { @@ -3562,8 +3555,8 @@ SWITCH_STANDARD_API(sofia_contact_function) const void *var; void *val; - for (hi = switch_hash_first(NULL, mod_sofia_globals.profile_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, &var, NULL, &val); + for (hi = switch_core_hash_first( mod_sofia_globals.profile_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, &var, NULL, &val); if ((profile = (sofia_profile_t *) val) && !strcmp((char *)var, profile->name)) { select_from_profile(profile, user, domain, concat, exclude_contact, &mystream, SWITCH_TRUE); profile = NULL; @@ -3747,8 +3740,8 @@ SWITCH_STANDARD_API(sofia_presence_data_function) const void *var; void *val; - for (hi = switch_hash_first(NULL, mod_sofia_globals.profile_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, &var, NULL, &val); + for (hi = switch_core_hash_first( mod_sofia_globals.profile_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, &var, NULL, &val); if ((profile = (sofia_profile_t *) val) && !strcmp((char *)var, profile->name)) { get_presence_data(profile, user, domain, search, stream); profile = NULL; @@ -4349,18 +4342,7 @@ static switch_call_cause_t sofia_outgoing_channel(switch_core_session_t *session tech_pvt->dest_to = tech_pvt->dest; } - if ((hval = switch_event_get_header(var_event, "media_webrtc")) && switch_true(hval)) { - switch_channel_set_variable(nchannel, "rtp_secure_media", SWITCH_RTP_CRYPTO_KEY_80); - } - - if ((hval = switch_event_get_header(var_event, SOFIA_SECURE_MEDIA_VARIABLE)) || - (hval = switch_event_get_header(var_event, "rtp_secure_media"))) { - - switch_channel_set_variable(nchannel, "rtp_secure_media", hval); - } - if (!zstr(tech_pvt->dest) && switch_stristr("transport=ws", tech_pvt->dest)) { - switch_channel_set_variable(nchannel, "rtp_secure_media", SWITCH_RTP_CRYPTO_KEY_80); switch_channel_set_variable(nchannel, "media_webrtc", "true"); switch_core_session_set_ice(nsession); } @@ -5155,8 +5137,8 @@ static void general_event_handler(switch_event_t *event) switch_mutex_lock(mod_sofia_globals.hash_mutex); if (mod_sofia_globals.profile_hash && !zstr(old_ip4) && !zstr(new_ip4)) { - for (hi = switch_hash_first(NULL, mod_sofia_globals.profile_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, &var, NULL, &val); + for (hi = switch_core_hash_first( mod_sofia_globals.profile_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, &var, NULL, &val); if ((profile = (sofia_profile_t *) val)) { if (!zstr(profile->extsipip) && !strcmp(profile->extsipip, old_ip4)) { @@ -5184,10 +5166,10 @@ static void general_event_handler(switch_event_t *event) switch_mutex_lock(mod_sofia_globals.hash_mutex); if (mod_sofia_globals.profile_hash) { - for (hi = switch_hash_first(NULL, mod_sofia_globals.profile_hash); hi; hi = switch_hash_next(hi)) { + for (hi = switch_core_hash_first( mod_sofia_globals.profile_hash); hi; hi = switch_core_hash_next(hi)) { int rb = 0; uint32_t x = 0; - switch_hash_this(hi, &var, NULL, &val); + switch_core_hash_this(hi, &var, NULL, &val); if ((profile = (sofia_profile_t *) val) && profile->auto_restart) { if (!strcmp(profile->sipip, old_ip4)) { profile->sipip = switch_core_strdup(profile->pool, new_ip4); @@ -5297,8 +5279,8 @@ switch_status_t list_profiles_full(const char *line, const char *cursor, switch_ switch_status_t status = SWITCH_STATUS_FALSE; switch_mutex_lock(mod_sofia_globals.hash_mutex); - for (hi = switch_hash_first(NULL, mod_sofia_globals.profile_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, &vvar, NULL, &val); + for (hi = switch_core_hash_first( mod_sofia_globals.profile_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, &vvar, NULL, &val); profile = (sofia_profile_t *) val; if (!show_aliases && strcmp((char *)vvar, profile->name)) { @@ -5335,8 +5317,8 @@ static switch_status_t list_gateways(const char *line, const char *cursor, switc switch_status_t status = SWITCH_STATUS_FALSE; switch_mutex_lock(mod_sofia_globals.hash_mutex); - for (hi = switch_hash_first(NULL, mod_sofia_globals.profile_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, &vvar, NULL, &val); + for (hi = switch_core_hash_first( mod_sofia_globals.profile_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, &vvar, NULL, &val); profile = (sofia_profile_t *) val; if (sofia_test_pflag(profile, PFLAG_RUNNING)) { sofia_gateway_t *gp; @@ -5462,8 +5444,8 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_sofia_load) strcpy(mod_sofia_globals.hostname, switch_core_get_switchname()); - switch_core_hash_init(&mod_sofia_globals.profile_hash, mod_sofia_globals.pool); - switch_core_hash_init(&mod_sofia_globals.gateway_hash, mod_sofia_globals.pool); + switch_core_hash_init(&mod_sofia_globals.profile_hash); + switch_core_hash_init(&mod_sofia_globals.gateway_hash); switch_mutex_init(&mod_sofia_globals.hash_mutex, SWITCH_MUTEX_NESTED, mod_sofia_globals.pool); switch_mutex_lock(mod_sofia_globals.mutex); diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.h b/src/mod/endpoints/mod_sofia/mod_sofia.h index 71e9862a69..8c0fe09bf2 100644 --- a/src/mod/endpoints/mod_sofia/mod_sofia.h +++ b/src/mod/endpoints/mod_sofia/mod_sofia.h @@ -111,9 +111,6 @@ typedef struct private_object private_object_t; #define SOFIA_DEFAULT_PORT "5060" #define SOFIA_DEFAULT_TLS_PORT "5061" #define SOFIA_REFER_TO_VARIABLE "sip_refer_to" -#define SOFIA_SECURE_MEDIA_VARIABLE "rtp_secure_media" -#define SOFIA_SECURE_MEDIA_CONFIRMED_VARIABLE "rtp_secure_media_confirmed" -#define SOFIA_SECURE_VIDEO_CONFIRMED_VARIABLE "sip_secure_video_confirmed" //#define SOFIA_HAS_CRYPTO_VARIABLE "rtp_has_crypto" //#define SOFIA_HAS_VIDEO_CRYPTO_VARIABLE "sip_has_video_crypto" //#define SOFIA_CRYPTO_MANDATORY_VARIABLE "sip_crypto_mandatory" diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c index 915a6dee64..fe3dd14463 100644 --- a/src/mod/endpoints/mod_sofia/sofia.c +++ b/src/mod/endpoints/mod_sofia/sofia.c @@ -2061,21 +2061,24 @@ void sofia_event_callback(nua_event_t event, case nua_i_notify: case nua_i_info: - if (sess_count >= sess_max || !sofia_test_pflag(profile, PFLAG_RUNNING) || !switch_core_ready_inbound()) { - nua_respond(nh, 503, "Maximum Calls In Progress", SIPTAG_RETRY_AFTER_STR("300"), NUTAG_WITH_THIS(nua), TAG_END()); - goto end; - } + if (!sofia_private) { + if (sess_count >= sess_max || !sofia_test_pflag(profile, PFLAG_RUNNING) || !switch_core_ready_inbound()) { + nua_respond(nh, 503, "Maximum Calls In Progress", SIPTAG_RETRY_AFTER_STR("300"), NUTAG_WITH_THIS(nua), TAG_END()); + goto end; + } - if (switch_queue_size(mod_sofia_globals.msg_queue) > (unsigned int)critical) { - nua_respond(nh, 503, "System Busy", SIPTAG_RETRY_AFTER_STR("300"), NUTAG_WITH_THIS(nua), TAG_END()); - goto end; + if (switch_queue_size(mod_sofia_globals.msg_queue) > (unsigned int)critical) { + nua_respond(nh, 503, "System Busy", SIPTAG_RETRY_AFTER_STR("300"), NUTAG_WITH_THIS(nua), TAG_END()); + goto end; + } + + if (sofia_test_pflag(profile, PFLAG_STANDBY)) { + nua_respond(nh, 503, "System Paused", NUTAG_WITH_THIS(nua), TAG_END()); + goto end; + } } - if (sofia_test_pflag(profile, PFLAG_STANDBY)) { - nua_respond(nh, 503, "System Paused", NUTAG_WITH_THIS(nua), TAG_END()); - goto end; - } break; default: @@ -3947,9 +3950,9 @@ switch_status_t config_sofia(sofia_config_t reload, char *profile_name) } profile->dbname = switch_core_strdup(profile->pool, url); - switch_core_hash_init(&profile->chat_hash, profile->pool); - switch_core_hash_init(&profile->reg_nh_hash, profile->pool); - switch_core_hash_init(&profile->mwi_debounce_hash, profile->pool); + switch_core_hash_init(&profile->chat_hash); + switch_core_hash_init(&profile->reg_nh_hash); + switch_core_hash_init(&profile->mwi_debounce_hash); switch_thread_rwlock_create(&profile->rwlock, profile->pool); switch_mutex_init(&profile->flag_mutex, SWITCH_MUTEX_NESTED, profile->pool); profile->dtmf_duration = 100; @@ -7146,8 +7149,8 @@ nua_handle_t *sofia_global_nua_handle_by_replaces(sip_replaces_t *replaces) switch_mutex_lock(mod_sofia_globals.hash_mutex); if (mod_sofia_globals.profile_hash) { - for (hi = switch_hash_first(NULL, mod_sofia_globals.profile_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, &var, NULL, &val); + for (hi = switch_core_hash_first( mod_sofia_globals.profile_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, &var, NULL, &val); if ((profile = (sofia_profile_t *) val)) { if (!(nh = nua_handle_by_replaces(profile->nua, replaces))) { nh = nua_handle_by_call_id(profile->nua, replaces->rp_call_id); @@ -7699,6 +7702,10 @@ void sofia_handle_sip_i_refer(nua_t *nua, sofia_profile_t *profile, nua_handle_t SIPTAG_SUBSCRIPTION_STATE_STR("terminated;reason=noresource"), SIPTAG_PAYLOAD_STR("SIP/2.0 200 OK\r\n"), SIPTAG_EVENT_STR(etmp), TAG_END()); } + + if (refer_to->r_url->url_params) { + switch_channel_set_variable(b_channel, "sip_h_X-FS-Refer-Params", refer_to->r_url->url_params); + } switch_ivr_session_transfer(b_session, exten, NULL, NULL); switch_core_session_rwunlock(b_session); @@ -8232,7 +8239,8 @@ void sofia_handle_sip_i_invite(switch_core_session_t *session, nua_t *nua, sofia } - if (profile->server_rport_level >= 2 && sip->sip_user_agent && sip->sip_user_agent->g_string && + if (!switch_check_network_list_ip(network_ip, profile->local_network) && + profile->server_rport_level >= 2 && sip->sip_user_agent && sip->sip_user_agent->g_string && (!strncasecmp(sip->sip_user_agent->g_string, "Polycom", 7) || !strncasecmp(sip->sip_user_agent->g_string, "KIRK Wireless Server", 20) )) { broken_device = 1; diff --git a/src/mod/endpoints/mod_sofia/sofia_glue.c b/src/mod/endpoints/mod_sofia/sofia_glue.c index f2cbba1173..f2fec6254a 100644 --- a/src/mod/endpoints/mod_sofia/sofia_glue.c +++ b/src/mod/endpoints/mod_sofia/sofia_glue.c @@ -691,6 +691,7 @@ switch_status_t sofia_glue_do_invite(switch_core_session_t *session) const char *handle_full_to = switch_channel_get_variable(tech_pvt->channel, "sip_handle_full_to"); const char *force_full_from = switch_channel_get_variable(tech_pvt->channel, "sip_force_full_from"); const char *force_full_to = switch_channel_get_variable(tech_pvt->channel, "sip_force_full_to"); + const char *content_encoding = switch_channel_get_variable(tech_pvt->channel, "sip_content_encoding"); char *mp = NULL, *mp_type = NULL; char *record_route = NULL; const char *recover_via = NULL; @@ -1255,6 +1256,7 @@ switch_status_t sofia_glue_do_invite(switch_core_session_t *session) TAG_IF(!zstr(route), SIPTAG_ROUTE_STR(route)), TAG_IF(tech_pvt->profile->minimum_session_expires, NUTAG_MIN_SE(tech_pvt->profile->minimum_session_expires)), TAG_IF(cseq, SIPTAG_CSEQ(cseq)), + TAG_IF(content_encoding, SIPTAG_CONTENT_ENCODING_STR(content_encoding)), TAG_IF(zstr(tech_pvt->mparams.local_sdp_str), SIPTAG_PAYLOAD_STR("")), TAG_IF(!zstr(tech_pvt->mparams.local_sdp_str), SOATAG_ADDRESS(tech_pvt->mparams.adv_sdp_audio_ip)), TAG_IF(!zstr(tech_pvt->mparams.local_sdp_str), SOATAG_USER_SDP_STR(tech_pvt->mparams.local_sdp_str)), @@ -1291,6 +1293,7 @@ switch_status_t sofia_glue_do_invite(switch_core_session_t *session) TAG_IF(tech_pvt->profile->minimum_session_expires, NUTAG_MIN_SE(tech_pvt->profile->minimum_session_expires)), TAG_IF(!require_timer, NUTAG_TIMER_AUTOREQUIRE(0)), TAG_IF(cseq, SIPTAG_CSEQ(cseq)), + TAG_IF(content_encoding, SIPTAG_CONTENT_ENCODING_STR(content_encoding)), NUTAG_MEDIA_ENABLE(0), SIPTAG_CONTENT_TYPE_STR(mp_type ? mp_type : "application/sdp"), SIPTAG_PAYLOAD_STR(mp ? mp : tech_pvt->mparams.local_sdp_str), TAG_IF(rep, SIPTAG_REPLACES_STR(rep)), SOATAG_HOLD(holdstr), TAG_END()); @@ -1650,8 +1653,8 @@ void sofia_glue_restart_all_profiles(void) switch_mutex_lock(mod_sofia_globals.hash_mutex); if (mod_sofia_globals.profile_hash) { - for (hi = switch_hash_first(NULL, mod_sofia_globals.profile_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, &var, NULL, &val); + for (hi = switch_core_hash_first( mod_sofia_globals.profile_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, &var, NULL, &val); if ((pptr = (sofia_profile_t *) val)) { int rsec = 10; int diff = (int) (switch_epoch_time_now(NULL) - pptr->started); @@ -1685,8 +1688,8 @@ void sofia_glue_global_siptrace(switch_bool_t on) switch_mutex_lock(mod_sofia_globals.hash_mutex); if (mod_sofia_globals.profile_hash) { - for (hi = switch_hash_first(NULL, mod_sofia_globals.profile_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, &var, NULL, &val); + for (hi = switch_core_hash_first( mod_sofia_globals.profile_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, &var, NULL, &val); if ((pptr = (sofia_profile_t *) val)) { nua_set_params(pptr->nua, TPTAG_LOG(on), TAG_END()); } @@ -1705,8 +1708,8 @@ void sofia_glue_global_standby(switch_bool_t on) switch_mutex_lock(mod_sofia_globals.hash_mutex); if (mod_sofia_globals.profile_hash) { - for (hi = switch_hash_first(NULL, mod_sofia_globals.profile_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, &var, NULL, &val); + for (hi = switch_core_hash_first( mod_sofia_globals.profile_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, &var, NULL, &val); if ((pptr = (sofia_profile_t *) val)) { if (on) { sofia_set_pflag_locked(pptr, PFLAG_STANDBY); @@ -1729,8 +1732,8 @@ void sofia_glue_global_capture(switch_bool_t on) switch_mutex_lock(mod_sofia_globals.hash_mutex); if (mod_sofia_globals.profile_hash) { - for (hi = switch_hash_first(NULL, mod_sofia_globals.profile_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, &var, NULL, &val); + for (hi = switch_core_hash_first( mod_sofia_globals.profile_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, &var, NULL, &val); if ((pptr = (sofia_profile_t *) val)) { nua_set_params(pptr->nua, TPTAG_CAPT(on ? mod_sofia_globals.capture_server : NULL), TAG_END()); } @@ -1750,8 +1753,8 @@ void sofia_glue_global_watchdog(switch_bool_t on) switch_mutex_lock(mod_sofia_globals.hash_mutex); if (mod_sofia_globals.profile_hash) { - for (hi = switch_hash_first(NULL, mod_sofia_globals.profile_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, &var, NULL, &val); + for (hi = switch_core_hash_first( mod_sofia_globals.profile_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, &var, NULL, &val); if ((pptr = (sofia_profile_t *) val)) { pptr->watchdog_enabled = (on ? 1 : 0); } @@ -1773,8 +1776,8 @@ void sofia_glue_del_profile(sofia_profile_t *profile) switch_mutex_lock(mod_sofia_globals.hash_mutex); if (mod_sofia_globals.profile_hash) { - for (hi = switch_hash_first(NULL, mod_sofia_globals.profile_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, &var, NULL, &val); + for (hi = switch_core_hash_first( mod_sofia_globals.profile_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, &var, NULL, &val); if ((pptr = (sofia_profile_t *) val) && pptr == profile) { aliases[i++] = strdup((char *) var); if (i == 512) { diff --git a/src/mod/endpoints/mod_sofia/sofia_presence.c b/src/mod/endpoints/mod_sofia/sofia_presence.c index 868bf5ff64..b00284df32 100644 --- a/src/mod/endpoints/mod_sofia/sofia_presence.c +++ b/src/mod/endpoints/mod_sofia/sofia_presence.c @@ -912,7 +912,7 @@ static void do_dialog_probe(switch_event_t *event) h4235 = switch_core_alloc(pool, sizeof(*h4235)); h4235->pool = pool; h4235->profile = profile; - switch_core_hash_init(&h4235->hash, h4235->pool); + switch_core_hash_init(&h4235->hash); sofia_glue_execute_sql_callback(profile, profile->dbh_mutex, sql, sofia_dialog_probe_callback, h4235); switch_safe_free(sql); if (mod_sofia_globals.debug_presence > 0) { @@ -3499,7 +3499,7 @@ static int sync_sla(sofia_profile_t *profile, const char *to_user, const char *t switch_core_new_memory_pool(&pool); sh = switch_core_alloc(pool, sizeof(*sh)); sh->pool = pool; - switch_core_hash_init(&sh->hash, sh->pool); + switch_core_hash_init(&sh->hash); sql = switch_mprintf("select sip_from_user,sip_from_host,call_info,call_info_state,uuid from sip_dialogs " "where call_info_state is not null and call_info_state != '' and call_info_state != 'idle' and hostname='%q' and profile_name='%q' " diff --git a/src/mod/endpoints/mod_sofia/sofia_reg.c b/src/mod/endpoints/mod_sofia/sofia_reg.c index 159f7c7520..4ebb4055b4 100644 --- a/src/mod/endpoints/mod_sofia/sofia_reg.c +++ b/src/mod/endpoints/mod_sofia/sofia_reg.c @@ -1099,8 +1099,8 @@ void sofia_reg_close_handles(sofia_profile_t *profile) switch_mutex_lock(profile->flag_mutex); if (profile->reg_nh_hash) { top: - for (hi = switch_hash_first(NULL, profile->reg_nh_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, &var, NULL, &val); + for (hi = switch_core_hash_first( profile->reg_nh_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, &var, NULL, &val); if ((nh = (nua_handle_t *) val)) { nua_handle_unref(nh); nua_handle_destroy(nh); @@ -3132,8 +3132,8 @@ sofia_gateway_t *sofia_reg_find_gateway_by_realm__(const char *file, const char void *val; switch_mutex_lock(mod_sofia_globals.hash_mutex); - for (hi = switch_hash_first(NULL, mod_sofia_globals.gateway_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, &var, NULL, &val); + for (hi = switch_core_hash_first( mod_sofia_globals.gateway_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, &var, NULL, &val); if (key && (gateway = (sofia_gateway_t *) val) && !gateway->deleted && gateway->register_realm && !strcasecmp(gateway->register_realm, key)) { break; } else { diff --git a/src/mod/endpoints/mod_unicall/Makefile.am b/src/mod/endpoints/mod_unicall/Makefile.am new file mode 100644 index 0000000000..1fcfc78b5b --- /dev/null +++ b/src/mod/endpoints/mod_unicall/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_unicall + +mod_LTLIBRARIES = mod_unicall.la +mod_unicall_la_SOURCES = mod_unicall.c +mod_unicall_la_CFLAGS = $(AM_CFLAGS) +mod_unicall_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_unicall_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/endpoints/mod_unicall/mod_unicall.c b/src/mod/endpoints/mod_unicall/mod_unicall.c index 35c3cde286..aecf967996 100644 --- a/src/mod/endpoints/mod_unicall/mod_unicall.c +++ b/src/mod/endpoints/mod_unicall/mod_unicall.c @@ -1864,7 +1864,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_unicall_load) module_pool = pool; memset(&globals, 0, sizeof(globals)); - switch_core_hash_init(&globals.call_hash, module_pool); + switch_core_hash_init(&globals.call_hash); switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, module_pool); switch_mutex_init(&globals.hash_mutex, SWITCH_MUTEX_NESTED, module_pool); switch_mutex_init(&globals.channel_mutex, SWITCH_MUTEX_NESTED, module_pool); diff --git a/src/mod/event_handlers/mod_cdr_csv/Makefile b/src/mod/event_handlers/mod_cdr_csv/Makefile deleted file mode 100644 index c2baec83cd..0000000000 --- a/src/mod/event_handlers/mod_cdr_csv/Makefile +++ /dev/null @@ -1 +0,0 @@ -include ../../../../build/modmake.rules diff --git a/src/mod/event_handlers/mod_cdr_csv/Makefile.am b/src/mod/event_handlers/mod_cdr_csv/Makefile.am new file mode 100644 index 0000000000..1e24bd1621 --- /dev/null +++ b/src/mod/event_handlers/mod_cdr_csv/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_cdr_csv + +mod_LTLIBRARIES = mod_cdr_csv.la +mod_cdr_csv_la_SOURCES = mod_cdr_csv.c +mod_cdr_csv_la_CFLAGS = $(AM_CFLAGS) +mod_cdr_csv_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_cdr_csv_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c b/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c index 700fb4a9be..ae29aa4a13 100644 --- a/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c +++ b/src/mod/event_handlers/mod_cdr_csv/mod_cdr_csv.c @@ -26,8 +26,8 @@ * mod_cdr_csv.c -- Asterisk Compatible CDR Module * */ -#include #include +#include typedef enum { CDR_LEG_A = (1 << 0), @@ -279,8 +279,8 @@ static void do_rotate_all() } switch_mutex_lock(globals.mutex); - for (hi = switch_hash_first(NULL, globals.fd_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, NULL, NULL, &val); + for (hi = switch_core_hash_first( globals.fd_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, NULL, NULL, &val); fd = (cdr_fd_t *) val; switch_mutex_lock(fd->mutex); do_rotate(fd); @@ -296,8 +296,8 @@ static void do_teardown() void *val; cdr_fd_t *fd; switch_mutex_lock(globals.mutex); - for (hi = switch_hash_first(NULL, globals.fd_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, NULL, NULL, &val); + for (hi = switch_core_hash_first( globals.fd_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, NULL, NULL, &val); fd = (cdr_fd_t *) val; switch_mutex_lock(fd->mutex); if (fd->fd > -1) { @@ -355,8 +355,8 @@ static switch_status_t load_config(switch_memory_pool_t *pool) switch_status_t status = SWITCH_STATUS_SUCCESS; memset(&globals, 0, sizeof(globals)); - switch_core_hash_init(&globals.fd_hash, pool); - switch_core_hash_init(&globals.template_hash, pool); + switch_core_hash_init(&globals.fd_hash); + switch_core_hash_init(&globals.template_hash); globals.pool = pool; diff --git a/src/mod/event_handlers/mod_cdr_mongodb/Makefile b/src/mod/event_handlers/mod_cdr_mongodb/Makefile deleted file mode 100644 index 6a412a0f66..0000000000 --- a/src/mod/event_handlers/mod_cdr_mongodb/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -include ../../../../build/modmake.rules - -MONGODB_DRIVER=./driver/src -LOCAL_CFLAGS=-I$(MONGODB_DRIVER) -LOCAL_OBJS=$(MONGODB_DRIVER)/encoding.o $(MONGODB_DRIVER)/env_posix.o \ - $(MONGODB_DRIVER)/bson.o $(MONGODB_DRIVER)/md5.o \ - $(MONGODB_DRIVER)/mongo.o $(MONGODB_DRIVER)/numbers.o - -local_depend: $(LOCAL_OBJS) diff --git a/src/mod/event_handlers/mod_cdr_mongodb/Makefile.am b/src/mod/event_handlers/mod_cdr_mongodb/Makefile.am new file mode 100644 index 0000000000..68f5d3814b --- /dev/null +++ b/src/mod/event_handlers/mod_cdr_mongodb/Makefile.am @@ -0,0 +1,9 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_cdr_mongodb +MONGODB_DRIVER=./driver/src +mod_LTLIBRARIES = mod_cdr_mongodb.la +mod_cdr_mongodb_la_SOURCES = mod_cdr_mongodb.c ./driver/src/encoding.c ./driver/src/env_posix.c ./driver/src/bson.c ./driver/src/md5.c ./driver/src/mongo.c ./driver/src/numbers.c +mod_cdr_mongodb_la_CFLAGS = $(AM_CFLAGS) +mod_cdr_mongodb_la_CPPFLAGS = -I$(MONGODB_DRIVER) -I$(switch_srcdir)/libs/stfu/ -I$(switch_srcdir)/libs/libteletone/src/ -D_GNU_SOURCE +mod_cdr_mongodb_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_cdr_mongodb_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/event_handlers/mod_cdr_pg_csv/Makefile b/src/mod/event_handlers/mod_cdr_pg_csv/Makefile deleted file mode 100644 index 91c48be50b..0000000000 --- a/src/mod/event_handlers/mod_cdr_pg_csv/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -UNAME := $(shell uname -s) -ifeq ($(UNAME),SunOS) -ISA64 := $(shell isainfo -n) -LOCAL_CFLAGS=-I/usr/postgres/8.3/include -ifneq (,$(findstring m64,$(CFLAGS))) -LOCAL_LDFLAGS=-L/usr/postgres/8.3/lib/$(ISA64) -R/usr/postgres/8.3/lib/$(ISA64) -lpq -static -else -LOCAL_LDFLAGS=-L/usr/postgres/8.3/lib -R/usr/postgres/8.3/lib -lpq -static -endif -else -LOCAL_CFLAGS=-I/usr/include/postgresql -LOCAL_LDFLAGS=-lpq -static -endif -include ../../../../build/modmake.rules diff --git a/src/mod/event_handlers/mod_cdr_pg_csv/Makefile.am b/src/mod/event_handlers/mod_cdr_pg_csv/Makefile.am new file mode 100644 index 0000000000..bcbfada1cf --- /dev/null +++ b/src/mod/event_handlers/mod_cdr_pg_csv/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_cdr_pg_csv + +mod_LTLIBRARIES = mod_cdr_pg_csv.la +mod_cdr_pg_csv_la_SOURCES = mod_cdr_pg_csv.c +mod_cdr_pg_csv_la_CFLAGS = $(AM_CFLAGS) $(SWITCH_AM_CXXFLAGS) +mod_cdr_pg_csv_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_cdr_pg_csv_la_LDFLAGS = -avoid-version -module -no-undefined -shared -lpq $(SWITCH_AM_LDFLAGS) diff --git a/src/mod/event_handlers/mod_cdr_pg_csv/mod_cdr_pg_csv.c b/src/mod/event_handlers/mod_cdr_pg_csv/mod_cdr_pg_csv.c index c80826000e..b6ae8f762e 100644 --- a/src/mod/event_handlers/mod_cdr_pg_csv/mod_cdr_pg_csv.c +++ b/src/mod/event_handlers/mod_cdr_pg_csv/mod_cdr_pg_csv.c @@ -35,8 +35,8 @@ * */ -#include #include +#include #include SWITCH_MODULE_LOAD_FUNCTION(mod_cdr_pg_csv_load); @@ -401,8 +401,8 @@ static void event_handler(switch_event_t *event) } if (sig && !strcmp(sig, "HUP")) { - for (hi = switch_hash_first(NULL, globals.fd_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, NULL, NULL, &val); + for (hi = switch_core_hash_first( globals.fd_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, NULL, NULL, &val); fd = (cdr_fd_t *) val; switch_mutex_lock(fd->mutex); do_rotate(fd); @@ -448,7 +448,7 @@ static switch_status_t load_config(switch_memory_pool_t *pool) } memset(&globals, 0, sizeof(globals)); - switch_core_hash_init(&globals.fd_hash, pool); + switch_core_hash_init(&globals.fd_hash); switch_mutex_init(&globals.db_mutex, SWITCH_MUTEX_NESTED, pool); globals.pool = pool; diff --git a/src/mod/event_handlers/mod_cdr_sqlite/Makefile b/src/mod/event_handlers/mod_cdr_sqlite/Makefile deleted file mode 100644 index c2baec83cd..0000000000 --- a/src/mod/event_handlers/mod_cdr_sqlite/Makefile +++ /dev/null @@ -1 +0,0 @@ -include ../../../../build/modmake.rules diff --git a/src/mod/event_handlers/mod_cdr_sqlite/Makefile.am b/src/mod/event_handlers/mod_cdr_sqlite/Makefile.am new file mode 100644 index 0000000000..4832331717 --- /dev/null +++ b/src/mod/event_handlers/mod_cdr_sqlite/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_cdr_sqlite + +mod_LTLIBRARIES = mod_cdr_sqlite.la +mod_cdr_sqlite_la_SOURCES = mod_cdr_sqlite.c +mod_cdr_sqlite_la_CFLAGS = $(AM_CFLAGS) +mod_cdr_sqlite_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_cdr_sqlite_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/event_handlers/mod_cdr_sqlite/mod_cdr_sqlite.c b/src/mod/event_handlers/mod_cdr_sqlite/mod_cdr_sqlite.c index 44defd1805..63bd95622e 100644 --- a/src/mod/event_handlers/mod_cdr_sqlite/mod_cdr_sqlite.c +++ b/src/mod/event_handlers/mod_cdr_sqlite/mod_cdr_sqlite.c @@ -196,7 +196,7 @@ static switch_status_t load_config(switch_memory_pool_t *pool) switch_status_t status = SWITCH_STATUS_SUCCESS; memset(&globals, 0, sizeof(globals)); - switch_core_hash_init(&globals.template_hash, pool); + switch_core_hash_init(&globals.template_hash); globals.pool = pool; diff --git a/src/mod/event_handlers/mod_erlang_event/Makefile.am b/src/mod/event_handlers/mod_erlang_event/Makefile.am new file mode 100644 index 0000000000..1ecda6b511 --- /dev/null +++ b/src/mod/event_handlers/mod_erlang_event/Makefile.am @@ -0,0 +1,7 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_erlang_event +mod_LTLIBRARIES = mod_erlang_event.la +mod_erlang_event_la_SOURCES = mod_erlang_event.c handle_msg.c ei_helpers.c +mod_erlang_event_la_CFLAGS = $(AM_CFLAGS) @ERLANG_CFLAGS@ -D_REENTRANT +mod_erlang_event_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_erlang_event_la_LDFLAGS = -avoid-version -module -no-undefined -shared @ERLANG_LDFLAGS@ diff --git a/src/mod/event_handlers/mod_erlang_event/Makefile.in b/src/mod/event_handlers/mod_erlang_event/Makefile.in deleted file mode 100644 index 3a551754ae..0000000000 --- a/src/mod/event_handlers/mod_erlang_event/Makefile.in +++ /dev/null @@ -1,9 +0,0 @@ -LOCAL_SOURCES=handle_msg.c ei_helpers.c -LOCAL_OBJS=handle_msg.o ei_helpers.o -LOCAL_CFLAGS= @ERLANG_CFLAGS@ -D_REENTRANT -LOCAL_LDFLAGS= @ERLANG_LDFLAGS@ - -include ../../../../build/modmake.rules - - - diff --git a/src/mod/event_handlers/mod_erlang_event/handle_msg.c b/src/mod/event_handlers/mod_erlang_event/handle_msg.c index dfd2864eb3..46c745efee 100644 --- a/src/mod/event_handlers/mod_erlang_event/handle_msg.c +++ b/src/mod/event_handlers/mod_erlang_event/handle_msg.c @@ -497,7 +497,7 @@ static switch_status_t handle_msg_setevent(listener_t *listener, erlang_msg *msg } /* create new hash */ - switch_core_hash_init(&event_hash, listener->pool); + switch_core_hash_init(&event_hash); if(!switch_test_flag(listener, LFLAG_EVENTS)) { switch_set_flag_locked(listener, LFLAG_EVENTS); @@ -562,7 +562,7 @@ static switch_status_t handle_msg_session_setevent(listener_t *listener, erlang_ } /* create new hash */ - switch_core_hash_init(&event_hash, session->pool); + switch_core_hash_init(&event_hash); for (i = 1; i < arity; i++){ if (!ei_decode_atom(buf->buff, &buf->index, atom)) { @@ -1132,8 +1132,8 @@ static switch_status_t handle_ref_tuple(listener_t *listener, erlang_msg * msg, switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Hashed ref to %s\n", hash); switch_thread_rwlock_rdlock(listener->session_rwlock); - for (iter = switch_hash_first(NULL, listener->sessions); iter; iter = switch_hash_next(iter)) { - switch_hash_this(iter, &key, NULL, &val); + for (iter = switch_core_hash_first( listener->sessions); iter; iter = switch_core_hash_next(iter)) { + switch_core_hash_this(iter, &key, NULL, &val); se = (session_elem_t*)val; if (se->spawn_reply && !strncmp(se->spawn_reply->hash, hash, 100)) { diff --git a/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c b/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c index 0113a0e593..d211fc7e7a 100644 --- a/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c +++ b/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.c @@ -364,8 +364,8 @@ session_elem_t *find_session_elem_by_pid(listener_t *listener, erlang_pid *pid) session_elem_t *session = NULL; switch_thread_rwlock_rdlock(listener->session_rwlock); - for (iter = switch_hash_first(NULL, listener->sessions); iter; iter = switch_hash_next(iter)) { - switch_hash_this(iter, &key, NULL, &val); + for (iter = switch_core_hash_first( listener->sessions); iter; iter = switch_core_hash_next(iter)) { + switch_core_hash_this(iter, &key, NULL, &val); if (((session_elem_t*)val)->process.type == ERLANG_PID && !ei_compare_pids(pid, &((session_elem_t*)val)->process.pid)) { session = (session_elem_t*)val; @@ -644,8 +644,8 @@ static switch_status_t check_attached_sessions(listener_t *listener, int *msgs_s /* TODO try to minimize critical section */ switch_thread_rwlock_rdlock(listener->session_rwlock); - for (iter = switch_hash_first(NULL, listener->sessions); iter; iter = switch_hash_next(iter)) { - switch_hash_this(iter, &key, NULL, &value); + for (iter = switch_core_hash_first( listener->sessions); iter; iter = switch_core_hash_next(iter)) { + switch_core_hash_this(iter, &key, NULL, &value); sp = (session_elem_t*)value; if (switch_test_flag(sp, LFLAG_WAITING_FOR_PID)) { continue; @@ -755,7 +755,7 @@ static int check_log_queue(listener_t *listener) /* send out any pending crap in the log queue */ if (switch_test_flag(listener, LFLAG_LOG)) { - while (msgs_sent < 100 && switch_queue_trypop(listener->log_queue, &pop) == SWITCH_STATUS_SUCCESS) { + while (msgs_sent < prefs.max_log_bulk && switch_queue_trypop(listener->log_queue, &pop) == SWITCH_STATUS_SUCCESS) { switch_log_node_t *dnode = (switch_log_node_t *) pop; if (dnode->data) { @@ -817,7 +817,7 @@ static int check_event_queue(listener_t *listener) /* send out any pending crap in the event queue */ if (switch_test_flag(listener, LFLAG_EVENTS)) { - while (msgs_sent < 100 && switch_queue_trypop(listener->event_queue, &pop) == SWITCH_STATUS_SUCCESS) { + while (msgs_sent < prefs.max_event_bulk && switch_queue_trypop(listener->event_queue, &pop) == SWITCH_STATUS_SUCCESS) { switch_event_t *pevent = (switch_event_t *) pop; @@ -998,7 +998,7 @@ static void listener_main_loop(listener_t *listener) switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%d messages sent in a loop\n", msgs_sent); #endif } else { /* no more messages right now, relax */ - switch_yield(100000); + switch_yield(10000); } } if (prefs.done) { @@ -1157,6 +1157,9 @@ static int config(void) prefs.shortname = SWITCH_TRUE; prefs.encoding = ERLANG_STRING; prefs.compat_rel = 0; + prefs.max_event_bulk = 1; + prefs.max_log_bulk = 1; + if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Open of %s failed\n", cf); @@ -1199,6 +1202,10 @@ static int config(void) } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Max acl records of %d reached\n", MAX_ACL); } + } else if (!strcasecmp(var, "max-event-bulk") && !zstr(val)) { + prefs.max_event_bulk = atoi(val); + } else if (!strcasecmp(var, "max-log-bulk") && !zstr(val)) { + prefs.max_log_bulk = atoi(val); } } } @@ -1270,8 +1277,8 @@ static listener_t *new_listener(struct ei_cnode_s *ec, int clientfd) switch_thread_rwlock_create(&listener->event_rwlock, pool); switch_thread_rwlock_create(&listener->session_rwlock, listener->pool); - switch_core_hash_init(&listener->event_hash, listener->pool); - switch_core_hash_init(&listener->sessions, listener->pool); + switch_core_hash_init(&listener->event_hash); + switch_core_hash_init(&listener->sessions); return listener; } @@ -1326,8 +1333,8 @@ void destroy_listener(listener_t * listener) /* clean up all the attached sessions */ switch_thread_rwlock_wrlock(listener->session_rwlock); - for (iter = switch_hash_first(NULL, listener->sessions); iter; iter = switch_hash_next(iter)) { - switch_hash_this(iter, &key, NULL, &value); + for (iter = switch_core_hash_first( listener->sessions); iter; iter = switch_core_hash_next(iter)) { + switch_core_hash_this(iter, &key, NULL, &value); s = (session_elem_t*)value; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Orphaning call %s\n", s->uuid_str); destroy_session_elem(s); @@ -1383,7 +1390,7 @@ session_elem_t *session_elem_create(listener_t *listener, switch_core_session_t switch_queue_create(&session_element->event_queue, SWITCH_CORE_QUEUE_LEN, session_element->pool); switch_mutex_init(&session_element->flag_mutex, SWITCH_MUTEX_NESTED, session_element->pool); - switch_core_hash_init(&session_element->event_hash, session_element->pool); + switch_core_hash_init(&session_element->event_hash); session_element->spawn_reply = NULL; for (x = 0; x <= SWITCH_EVENT_ALL; x++) { @@ -1522,7 +1529,7 @@ int count_listener_sessions(listener_t *listener) switch_hash_index_t *iter; switch_thread_rwlock_rdlock(listener->session_rwlock); - for (iter = switch_hash_first(NULL, listener->sessions); iter; iter = switch_hash_next(iter)) { + for (iter = switch_core_hash_first( listener->sessions); iter; iter = switch_core_hash_next(iter)) { count++; } switch_thread_rwlock_unlock(listener->session_rwlock); @@ -1743,9 +1750,9 @@ SWITCH_STANDARD_API(erlang_cmd) found = 1; switch_thread_rwlock_rdlock(l->session_rwlock); - for (iter = switch_hash_first(NULL, l->sessions); iter; iter = switch_hash_next(iter)) { + for (iter = switch_core_hash_first( l->sessions); iter; iter = switch_core_hash_next(iter)) { empty = 0; - switch_hash_this(iter, &key, NULL, &value); + switch_core_hash_this(iter, &key, NULL, &value); sp = (session_elem_t*)value; stream->write_function(stream, "Outbound session for %s in state %s\n", sp->uuid_str, switch_channel_state_name(sp->channel_state)); @@ -1784,8 +1791,8 @@ SWITCH_STANDARD_API(erlang_cmd) } stream->write_function(stream, "CUSTOM:\n", switch_event_name(x)); - for (iter = switch_hash_first(NULL, l->event_hash); iter; iter = switch_hash_next(iter)) { - switch_hash_this(iter, &key, NULL, &val); + for (iter = switch_core_hash_first( l->event_hash); iter; iter = switch_core_hash_next(iter)) { + switch_core_hash_this(iter, &key, NULL, &val); stream->write_function(stream, "\t%s\n", (char *)key); } stream->write_function(stream, "\n", (char *)key); @@ -1863,7 +1870,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_erlang_event_load) switch_thread_rwlock_create(&globals.bindings_rwlock, pool); switch_mutex_init(&globals.fetch_reply_mutex, SWITCH_MUTEX_DEFAULT, pool); switch_mutex_init(&globals.listener_count_mutex, SWITCH_MUTEX_UNNESTED, pool); - switch_core_hash_init(&globals.fetch_reply_hash, pool); + switch_core_hash_init(&globals.fetch_reply_hash); /* intialize the unique reference stuff */ switch_mutex_init(&globals.ref_mutex, SWITCH_MUTEX_NESTED, pool); diff --git a/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h b/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h index d84fd0f505..719210dca8 100644 --- a/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h +++ b/src/mod/event_handlers/mod_erlang_event/mod_erlang_event.h @@ -216,6 +216,8 @@ struct prefs_struct { uint32_t id; erlang_encoding_t encoding; int compat_rel; + int max_event_bulk; + int max_log_bulk; }; typedef struct prefs_struct prefs_t; diff --git a/src/mod/event_handlers/mod_event_multicast/Makefile b/src/mod/event_handlers/mod_event_multicast/Makefile deleted file mode 100644 index 407528d653..0000000000 --- a/src/mod/event_handlers/mod_event_multicast/Makefile +++ /dev/null @@ -1,5 +0,0 @@ - -LOCAL_CFLAGS= $(OPENSSL_CFLAGS) -LOCAL_LDLAGS= $(OPENSSL_LIBS) - -include ../../../../build/modmake.rules diff --git a/src/mod/event_handlers/mod_event_multicast/Makefile.am b/src/mod/event_handlers/mod_event_multicast/Makefile.am new file mode 100644 index 0000000000..814e1c23f7 --- /dev/null +++ b/src/mod/event_handlers/mod_event_multicast/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_event_multicast + +mod_LTLIBRARIES = mod_event_multicast.la +mod_event_multicast_la_SOURCES = mod_event_multicast.c +mod_event_multicast_la_CFLAGS = $(AM_CFLAGS) $(OPENSSL_CFLAGS) +mod_event_multicast_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_event_multicast_la_LDFLAGS = -avoid-version -module -no-undefined -shared $(OPENSSL_LIBS) diff --git a/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c b/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c index d3b0d61aad..9d85d941b8 100644 --- a/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c +++ b/src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c @@ -29,10 +29,10 @@ * mod_event_multicast.c -- Multicast Events * */ +#include #ifdef HAVE_OPENSSL #include #endif -#include #define MULTICAST_BUFFSIZE 65536 @@ -228,7 +228,7 @@ static void event_handler(switch_event_t *event) switch_safe_free(globals.psk); globals.psk = NULL; } - switch_core_hash_init(&globals.event_hash, module_pool); + switch_core_hash_init(&globals.event_hash); memset(globals.event_list, 0, SWITCH_EVENT_ALL + 1); if (load_config() != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Failed to reload config file\n"); @@ -247,8 +247,8 @@ static void event_handler(switch_event_t *event) struct peer_status *last; char *host; - for (cur = switch_hash_first(NULL, globals.peer_hash); cur; cur = switch_hash_next(cur)) { - switch_hash_this(cur, &key, &keylen, &value); + for (cur = switch_core_hash_first( globals.peer_hash); cur; cur = switch_core_hash_next(cur)) { + switch_core_hash_this(cur, &key, &keylen, &value); host = (char *) key; last = (struct peer_status *) value; if (last->active && (now - (last->lastseen)) > 60) { @@ -351,8 +351,8 @@ SWITCH_STANDARD_API(multicast_peers) char *host; int i = 0; - for (cur = switch_hash_first(NULL, globals.peer_hash); cur; cur = switch_hash_next(cur)) { - switch_hash_this(cur, &key, &keylen, &value); + for (cur = switch_core_hash_first( globals.peer_hash); cur; cur = switch_core_hash_next(cur)) { + switch_core_hash_this(cur, &key, &keylen, &value); host = (char *) key; last = (struct peer_status *) value; @@ -377,8 +377,8 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_event_multicast_load) switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, pool); module_pool = pool; - switch_core_hash_init(&globals.event_hash, module_pool); - switch_core_hash_init(&globals.peer_hash, module_pool); + switch_core_hash_init(&globals.event_hash); + switch_core_hash_init(&globals.peer_hash); globals.key_count = 0; diff --git a/src/mod/event_handlers/mod_event_socket/Makefile.am b/src/mod/event_handlers/mod_event_socket/Makefile.am new file mode 100644 index 0000000000..813f0ddd30 --- /dev/null +++ b/src/mod/event_handlers/mod_event_socket/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_event_socket + +mod_LTLIBRARIES = mod_event_socket.la +mod_event_socket_la_SOURCES = mod_event_socket.c +mod_event_socket_la_CFLAGS = $(AM_CFLAGS) +mod_event_socket_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_event_socket_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/event_handlers/mod_event_socket/mod_event_socket.c b/src/mod/event_handlers/mod_event_socket/mod_event_socket.c index f8eb1fd337..3ad1b0c966 100644 --- a/src/mod/event_handlers/mod_event_socket/mod_event_socket.c +++ b/src/mod/event_handlers/mod_event_socket/mod_event_socket.c @@ -473,7 +473,7 @@ SWITCH_STANDARD_APP(socket_function) switch_mutex_init(&listener->flag_mutex, SWITCH_MUTEX_NESTED, listener->pool); switch_mutex_init(&listener->filter_mutex, SWITCH_MUTEX_NESTED, listener->pool); - switch_core_hash_init(&listener->event_hash, listener->pool); + switch_core_hash_init(&listener->event_hash); switch_set_flag(listener, LFLAG_AUTHED); switch_set_flag(listener, LFLAG_OUTBOUND); for (x = 1; x < argc; x++) { @@ -839,7 +839,7 @@ SWITCH_STANDARD_API(event_sink_function) switch_mutex_init(&listener->filter_mutex, SWITCH_MUTEX_NESTED, listener->pool); - switch_core_hash_init(&listener->event_hash, listener->pool); + switch_core_hash_init(&listener->event_hash); switch_set_flag(listener, LFLAG_AUTHED); switch_set_flag(listener, LFLAG_STATEFUL); switch_set_flag(listener, LFLAG_ALLOW_LOG); @@ -1773,7 +1773,7 @@ static switch_status_t parse_command(listener_t *listener, switch_event_t **even switch_snprintf(event_reply, sizeof(event_reply), "Allowed-Events: %s\n", allowed_events); - switch_core_hash_init(&listener->allowed_event_hash, listener->pool); + switch_core_hash_init(&listener->allowed_event_hash); edup = strdup(allowed_events); cur = edup; @@ -1828,7 +1828,7 @@ static switch_status_t parse_command(listener_t *listener, switch_event_t **even switch_snprintf(api_reply, sizeof(api_reply), "Allowed-API: %s\n", allowed_api); - switch_core_hash_init(&listener->allowed_api_hash, listener->pool); + switch_core_hash_init(&listener->allowed_api_hash); edup = strdup(allowed_api); cur = edup; @@ -2522,7 +2522,7 @@ static switch_status_t parse_command(listener_t *listener, switch_event_t **even } /* wipe the hash */ switch_core_hash_destroy(&listener->event_hash); - switch_core_hash_init(&listener->event_hash, listener->pool); + switch_core_hash_init(&listener->event_hash); switch_snprintf(reply, reply_len, "+OK no longer listening for events"); } else { switch_snprintf(reply, reply_len, "-ERR not listening for events"); @@ -2939,7 +2939,7 @@ SWITCH_MODULE_RUNTIME_FUNCTION(mod_event_socket_runtime) switch_mutex_init(&listener->flag_mutex, SWITCH_MUTEX_NESTED, listener->pool); switch_mutex_init(&listener->filter_mutex, SWITCH_MUTEX_NESTED, listener->pool); - switch_core_hash_init(&listener->event_hash, listener->pool); + switch_core_hash_init(&listener->event_hash); switch_socket_create_pollset(&listener->pollfd, listener->sock, SWITCH_POLLIN | SWITCH_POLLERR, listener->pool); diff --git a/src/mod/event_handlers/mod_event_test/Makefile.am b/src/mod/event_handlers/mod_event_test/Makefile.am new file mode 100644 index 0000000000..7bcad061f0 --- /dev/null +++ b/src/mod/event_handlers/mod_event_test/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_event_test + +mod_LTLIBRARIES = mod_event_test.la +mod_event_test_la_SOURCES = mod_event_test.c +mod_event_test_la_CFLAGS = $(AM_CFLAGS) +mod_event_test_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_event_test_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/event_handlers/mod_event_zmq/Makefile b/src/mod/event_handlers/mod_event_zmq/Makefile.am similarity index 60% rename from src/mod/event_handlers/mod_event_zmq/Makefile rename to src/mod/event_handlers/mod_event_zmq/Makefile.am index d660d375c8..4cd857685d 100644 --- a/src/mod/event_handlers/mod_event_zmq/Makefile +++ b/src/mod/event_handlers/mod_event_zmq/Makefile.am @@ -1,5 +1,5 @@ -BASE=../../../.. - +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_event_zmq ZMQ=zeromq-2.1.9 ZMQ_BASEURL=http://download.zeromq.org @@ -7,11 +7,16 @@ ZMQ_BASEURL_ALT=http://download.zeromq.org/historic ZMQ_DIR=$(switch_srcdir)/libs/$(ZMQ) ZMQ_BUILDDIR=$(switch_builddir)/libs/$(ZMQ) -LOCAL_CFLAGS=-I$(ZMQ_DIR)/include ZMQ_LA=$(ZMQ_BUILDDIR)/src/libzmq.la -LOCAL_LIBADD=$(ZMQ_LA) -include $(BASE)/build/modmake.rules +mod_LTLIBRARIES = mod_event_zmq.la +mod_event_zmq_la_SOURCES = mod_event_zmq.cpp +mod_event_zmq_la_CFLAGS = $(AM_CFLAGS) +mod_event_zmq_la_CPPFLAGS = -I$(ZMQ_DIR)/include -I$(switch_srcdir)/libs/stfu/ -I$(switch_srcdir)/libs/libteletone/src/ +mod_event_zmq_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(ZMQ_LA) +mod_event_zmq_la_LDFLAGS = -avoid-version -module -no-undefined -shared + +BUILT_SOURCES=$(ZMQ_LA) $(ZMQ_DIR): $(GETLIB) $(ZMQ_BASEURL) $(ZMQ).tar.gz || $(GETLIB) $(ZMQ_BASEURL_ALT) $(ZMQ).tar.gz diff --git a/src/mod/event_handlers/mod_format_cdr/Makefile b/src/mod/event_handlers/mod_format_cdr/Makefile deleted file mode 100644 index c2baec83cd..0000000000 --- a/src/mod/event_handlers/mod_format_cdr/Makefile +++ /dev/null @@ -1 +0,0 @@ -include ../../../../build/modmake.rules diff --git a/src/mod/event_handlers/mod_format_cdr/Makefile.am b/src/mod/event_handlers/mod_format_cdr/Makefile.am new file mode 100644 index 0000000000..1867de159a --- /dev/null +++ b/src/mod/event_handlers/mod_format_cdr/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_format_cdr + +mod_LTLIBRARIES = mod_format_cdr.la +mod_format_cdr_la_SOURCES = mod_format_cdr.c +mod_format_cdr_la_CFLAGS = $(AM_CFLAGS) +mod_format_cdr_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_format_cdr_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/event_handlers/mod_format_cdr/mod_format_cdr.c b/src/mod/event_handlers/mod_format_cdr/mod_format_cdr.c index b59720a934..ca6dbe83a5 100644 --- a/src/mod/event_handlers/mod_format_cdr/mod_format_cdr.c +++ b/src/mod/event_handlers/mod_format_cdr/mod_format_cdr.c @@ -30,8 +30,8 @@ * mod_format_cdr.c -- XML CDR Module to files or curl * */ -#include #include +#include #include #define MAX_URLS 20 #define MAX_ERR_DIRS 20 @@ -495,9 +495,9 @@ static switch_status_t my_on_reporting(switch_core_session_t *session) status = SWITCH_STATUS_SUCCESS; - for (hi = switch_hash_first(NULL, globals.profile_hash); hi; hi = switch_hash_next(hi)) { + for (hi = switch_core_hash_first( globals.profile_hash); hi; hi = switch_core_hash_next(hi)) { cdr_profile_t *profile; - switch_hash_this(hi, NULL, NULL, &val); + switch_core_hash_this(hi, NULL, NULL, &val); profile = (cdr_profile_t *) val; tmpstatus = my_on_reporting_cb(session, profile); @@ -518,9 +518,9 @@ static void event_handler(switch_event_t *event) const char *sig = switch_event_get_header(event, "Trapped-Signal"); if (sig && !strcmp(sig, "HUP")) { - for (hi = switch_hash_first(NULL, globals.profile_hash); hi; hi = switch_hash_next(hi)) { + for (hi = switch_core_hash_first( globals.profile_hash); hi; hi = switch_core_hash_next(hi)) { cdr_profile_t *profile; - switch_hash_this(hi, NULL, NULL, &val); + switch_core_hash_this(hi, NULL, NULL, &val); profile = (cdr_profile_t *) val; if (profile->rotate) { @@ -732,7 +732,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_format_cdr_load) globals.pool = pool; switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, globals.pool); - switch_core_hash_init(&globals.profile_hash, globals.pool); + switch_core_hash_init(&globals.profile_hash); /* parse the config */ if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) { @@ -785,9 +785,9 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_format_cdr_shutdown) switch_event_unbind(&globals.node); switch_core_remove_state_handler(&state_handlers); - for (hi = switch_hash_first(NULL, globals.profile_hash); hi; hi = switch_hash_next(hi)) { + for (hi = switch_core_hash_first( globals.profile_hash); hi; hi = switch_core_hash_next(hi)) { cdr_profile_t *profile; - switch_hash_this(hi, NULL, NULL, &val); + switch_core_hash_this(hi, NULL, NULL, &val); profile = (cdr_profile_t *) val; if ( profile ) { diff --git a/src/mod/event_handlers/mod_json_cdr/Makefile b/src/mod/event_handlers/mod_json_cdr/Makefile deleted file mode 100644 index c9dfa5399e..0000000000 --- a/src/mod/event_handlers/mod_json_cdr/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -BASE=../../../.. - -include $(BASE)/build/modmake.rules - diff --git a/src/mod/event_handlers/mod_json_cdr/Makefile.am b/src/mod/event_handlers/mod_json_cdr/Makefile.am new file mode 100644 index 0000000000..a81462999a --- /dev/null +++ b/src/mod/event_handlers/mod_json_cdr/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_json_cdr + +mod_LTLIBRARIES = mod_json_cdr.la +mod_json_cdr_la_SOURCES = mod_json_cdr.c +mod_json_cdr_la_CFLAGS = $(AM_CFLAGS) +mod_json_cdr_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_json_cdr_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/event_handlers/mod_json_cdr/mod_json_cdr.c b/src/mod/event_handlers/mod_json_cdr/mod_json_cdr.c index df9336f302..5fc4064ee0 100644 --- a/src/mod/event_handlers/mod_json_cdr/mod_json_cdr.c +++ b/src/mod/event_handlers/mod_json_cdr/mod_json_cdr.c @@ -30,8 +30,8 @@ * mod_json_cdr.c -- JSON CDR Module to files or curl * */ -#include #include +#include #include #define MAX_URLS 20 diff --git a/src/mod/xml_int/mod_xml_radius/Makefile b/src/mod/event_handlers/mod_radius_cdr/Makefile.am similarity index 62% rename from src/mod/xml_int/mod_xml_radius/Makefile rename to src/mod/event_handlers/mod_radius_cdr/Makefile.am index 63542dff47..9c0532b179 100644 --- a/src/mod/xml_int/mod_xml_radius/Makefile +++ b/src/mod/event_handlers/mod_radius_cdr/Makefile.am @@ -1,3 +1,6 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_radius_cdr + RADCLIENT_VERSION=1.1.6 RADCLIENT=freeradius-client-$(RADCLIENT_VERSION) RADCLIENT_DIR=$(switch_srcdir)/libs/$(RADCLIENT) @@ -5,11 +8,12 @@ RADCLIENT_BUILDDIR=$(switch_builddir)/libs/$(RADCLIENT) RADCLIENT_LIBDIR=$(RADCLIENT_BUILDDIR)/lib RADCLIENT_LA=${RADCLIENT_LIBDIR}/libfreeradius-client.la -LOCAL_CFLAGS=-I$(RADCLIENT_DIR)/include -LOCAL_LIBADD=$(RADCLIENT_LA) - -BASE=../../../.. -include $(BASE)/build/modmake.rules +mod_LTLIBRARIES = mod_radius_cdr.la +mod_radius_cdr_la_SOURCES = mod_radius_cdr.c +mod_radius_cdr_la_CFLAGS = $(AM_CFLAGS) -I$(RADCLIENT_DIR)/include +mod_radius_cdr_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(RADCLIENT_LA) +mod_radius_cdr_la_LDFLAGS = -avoid-version -module -no-undefined -shared +BUILT_SOURCES=$(RADCLIENT_LA) $(RADCLIENT_DIR): $(GETLIB) $(RADCLIENT).tar.gz diff --git a/src/mod/event_handlers/mod_rayo/Makefile b/src/mod/event_handlers/mod_rayo/Makefile deleted file mode 100644 index 070f41f98c..0000000000 --- a/src/mod/event_handlers/mod_rayo/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -BASE=../../../.. - -IKS_DIR=$(BASE)/libs/iksemel -PCRE_DIR=$(BASE)/libs/pcre -IKS_LA=$(IKS_DIR)/src/libiksemel.la -PCRE_LA=$(PCRE_DIR)/libpcre.la -LOCAL_CFLAGS += -I$(BASE)/libs/iksemel/include -I$(BASE)/libs/pcre -LOCAL_OBJS= $(IKS_LA) \ - $(PCRE_LA) \ - iks_helpers.o \ - nlsml.o \ - rayo_components.o \ - rayo_cpa_component.o \ - rayo_cpa_detector.o \ - rayo_elements.o \ - rayo_fax_components.o \ - rayo_input_component.o \ - rayo_output_component.o \ - rayo_prompt_component.o \ - rayo_record_component.o \ - sasl.o \ - srgs.o \ - xmpp_streams.o -LOCAL_SOURCES= \ - iks_helpers.c \ - nlsml.c \ - rayo_components.c \ - rayo_cpa_component.c \ - rayo_cpa_detector.c \ - rayo_elements.c \ - rayo_fax_components.c \ - rayo_input_component.c \ - rayo_output_component.c \ - rayo_prompt_component.c \ - rayo_record_component.c \ - sasl.c \ - srgs.c \ - xmpp_streams.c -include $(BASE)/build/modmake.rules - -$(IKS_LA): $(IKS_DIR) $(IKS_DIR)/.update - @cd $(IKS_DIR) && $(MAKE) - @$(TOUCH_TARGET) - -$(PCRE_LA): $(PCRE_DIR) $(PCRE_DIR)/.update - @cd $(PCRE_DIR) && $(MAKE) - @$(TOUCH_TARGET) diff --git a/src/mod/event_handlers/mod_rayo/Makefile.am b/src/mod/event_handlers/mod_rayo/Makefile.am new file mode 100644 index 0000000000..d46d2e0d3c --- /dev/null +++ b/src/mod/event_handlers/mod_rayo/Makefile.am @@ -0,0 +1,24 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_rayo + +IKS_DIR=$(switch_srcdir)/libs/iksemel +PCRE_DIR=$(switch_srcdir)/libs/pcre +IKS_LA=$(IKS_DIR)/src/libiksemel.la +PCRE_LA=$(PCRE_DIR)/libpcre.la + +mod_LTLIBRARIES = mod_rayo.la +mod_rayo_la_SOURCES = mod_rayo.c iks_helpers.c nlsml.c rayo_components.c rayo_cpa_component.c rayo_cpa_detector.c rayo_elements.c rayo_fax_components.c +mod_rayo_la_SOURCES += rayo_input_component.c rayo_output_component.c rayo_prompt_component.c rayo_record_component.c sasl.c srgs.c xmpp_streams.c +mod_rayo_la_CFLAGS = $(AM_CFLAGS) -I$(switch_srcdir)/libs/iksemel/include -I$(switch_srcdir)/libs/pcre +mod_rayo_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(IKS_LA) $(PCRE_LA) +mod_rayo_la_LDFLAGS = -avoid-version -module -no-undefined -shared + +BUILT_SOURCES=$(IKS_LA) $(PCRE_LA) + +$(IKS_LA): $(IKS_DIR) $(IKS_DIR)/.update + @cd $(IKS_DIR) && $(MAKE) + @$(TOUCH_TARGET) + +$(PCRE_LA): $(PCRE_DIR) $(PCRE_DIR)/.update + @cd $(PCRE_DIR) && $(MAKE) + @$(TOUCH_TARGET) diff --git a/src/mod/event_handlers/mod_rayo/mod_rayo.c b/src/mod/event_handlers/mod_rayo/mod_rayo.c index 1d0ee33ef2..f6ea6b717b 100644 --- a/src/mod/event_handlers/mod_rayo/mod_rayo.c +++ b/src/mod/event_handlers/mod_rayo/mod_rayo.c @@ -1,6 +1,6 @@ /* * mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * Copyright (C) 2013, Grasshopper + * Copyright (C) 2013-2014, Grasshopper * * Version: MPL 1.1 * @@ -466,11 +466,11 @@ static void broadcast_event(struct rayo_actor *from, iks *rayo_event, int online { switch_hash_index_t *hi = NULL; switch_mutex_lock(globals.clients_mutex); - for (hi = switch_hash_first(NULL, globals.clients_roster); hi; hi = switch_hash_next(hi)) { + for (hi = switch_core_hash_first( globals.clients_roster); hi; hi = switch_core_hash_next(hi)) { struct rayo_client *rclient; const void *key; void *val; - switch_hash_this(hi, &key, NULL, &val); + switch_core_hash_this(hi, &key, NULL, &val); rclient = (struct rayo_client *)val; switch_assert(rclient); @@ -1028,11 +1028,11 @@ static void rayo_call_cleanup(struct rayo_actor *actor) } /* send to all offered clients */ - for (hi = switch_hash_first(NULL, call->pcps); hi; hi = switch_hash_next(hi)) { + for (hi = switch_core_hash_first( call->pcps); hi; hi = switch_core_hash_next(hi)) { const void *key; void *val; const char *client_jid = NULL; - switch_hash_this(hi, &key, NULL, &val); + switch_core_hash_this(hi, &key, NULL, &val); client_jid = (const char *)key; switch_assert(client_jid); iks_insert_attrib(revent, "to", client_jid); @@ -1142,7 +1142,7 @@ void rayo_actor_send_ignore(struct rayo_actor *to, struct rayo_message *msg) * @param send sent message handler * @param file that called this function * @param line that called this function - * @return the actor + * @return the actor or NULL if JID conflict */ static struct rayo_actor *rayo_actor_init(struct rayo_actor *actor, switch_memory_pool_t *pool, const char *type, const char *subtype, const char *id, const char *jid, rayo_actor_cleanup_fn cleanup, rayo_actor_send_fn send, const char *file, int line) { @@ -1180,12 +1180,22 @@ static struct rayo_actor *rayo_actor_init(struct rayo_actor *actor, switch_memor /* add to hash of actors, so commands can route to call */ switch_mutex_lock(globals.actors_mutex); - if (!zstr(id)) { - switch_core_hash_insert(globals.actors_by_id, actor->id, actor); - } if (!zstr(jid)) { + if (switch_core_hash_find(globals.actors, RAYO_JID(actor))) { + /* duplicate JID, give up! */ + switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, "", line, "", SWITCH_LOG_NOTICE, "JID conflict! %s\n", RAYO_JID(actor)); + switch_mutex_unlock(globals.actors_mutex); + return NULL; + } switch_core_hash_insert(globals.actors, RAYO_JID(actor), actor); } + if (!zstr(id)) { + if (switch_core_hash_find(globals.actors_by_id, actor->id)) { + /* duplicate ID - only log for now... */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "ID conflict! %s\n", actor->id); + } + switch_core_hash_insert(globals.actors_by_id, actor->id, actor); + } switch_mutex_unlock(globals.actors_mutex); switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, "", line, "", SWITCH_LOG_DEBUG, "Init %s\n", RAYO_JID(actor)); @@ -1195,6 +1205,7 @@ static struct rayo_actor *rayo_actor_init(struct rayo_actor *actor, switch_memor /** * Initialize rayo call + * @return the call or NULL if JID conflict */ static struct rayo_call *rayo_call_init(struct rayo_call *call, switch_memory_pool_t *pool, const char *uuid, const char *file, int line) { @@ -1207,17 +1218,19 @@ static struct rayo_call *rayo_call_init(struct rayo_call *call, switch_memory_po } call_jid = switch_mprintf("%s@%s", uuid, RAYO_JID(globals.server)); - rayo_actor_init(RAYO_ACTOR(call), pool, RAT_CALL, "", uuid, call_jid, rayo_call_cleanup, rayo_call_send, file, line); - call->dcp_jid = ""; - call->idle_start_time = switch_micro_time_now(); - call->joined = 0; - call->joined_id = NULL; - call->ringing_sent = 0; - call->pending_join_request = NULL; - call->dial_request_id = NULL; - call->end_event = NULL; - call->dial_request_failed = 0; - switch_core_hash_init(&call->pcps, pool); + call = RAYO_CALL(rayo_actor_init(RAYO_ACTOR(call), pool, RAT_CALL, "", uuid, call_jid, rayo_call_cleanup, rayo_call_send, file, line)); + if (call) { + call->dcp_jid = ""; + call->idle_start_time = switch_micro_time_now(); + call->joined = 0; + call->joined_id = NULL; + call->ringing_sent = 0; + call->pending_join_request = NULL; + call->dial_request_id = NULL; + call->end_event = NULL; + call->dial_request_failed = 0; + switch_core_hash_init(&call->pcps); + } switch_safe_free(call_jid); @@ -1230,7 +1243,7 @@ static struct rayo_call *rayo_call_init(struct rayo_call *call, switch_memory_po * @param uuid uuid to assign call, if NULL one is picked * @param file file that called this function * @param line number of file that called this function - * @return the call + * @return the call, or NULL if JID conflict */ static struct rayo_call *_rayo_call_create(const char *uuid, const char *file, int line) { @@ -1238,7 +1251,11 @@ static struct rayo_call *_rayo_call_create(const char *uuid, const char *file, i struct rayo_call *call; switch_core_new_memory_pool(&pool); call = switch_core_alloc(pool, sizeof(*call)); - return rayo_call_init(call, pool, uuid, file, line); + call = rayo_call_init(call, pool, uuid, file, line); + if (!call) { + switch_core_destroy_memory_pool(&pool); + } + return call; } /** @@ -1253,13 +1270,16 @@ static void rayo_mixer_cleanup(struct rayo_actor *actor) /** * Initialize mixer + * @return the mixer or NULL if JID conflict */ static struct rayo_mixer *rayo_mixer_init(struct rayo_mixer *mixer, switch_memory_pool_t *pool, const char *name, const char *file, int line) { char *mixer_jid = switch_mprintf("%s@%s", name, RAYO_JID(globals.server)); - rayo_actor_init(RAYO_ACTOR(mixer), pool, RAT_MIXER, "", name, mixer_jid, rayo_mixer_cleanup, rayo_mixer_send, file, line); - switch_core_hash_init(&mixer->members, pool); - switch_core_hash_init(&mixer->subscribers, pool); + mixer = RAYO_MIXER(rayo_actor_init(RAYO_ACTOR(mixer), pool, RAT_MIXER, "", name, mixer_jid, rayo_mixer_cleanup, rayo_mixer_send, file, line)); + if (mixer) { + switch_core_hash_init(&mixer->members); + switch_core_hash_init(&mixer->subscribers); + } switch_safe_free(mixer_jid); return mixer; } @@ -1268,15 +1288,18 @@ static struct rayo_mixer *rayo_mixer_init(struct rayo_mixer *mixer, switch_memor /** * Create Rayo mixer * @param name of this mixer - * @return the mixer + * @return the mixer or NULL if JID conflict */ static struct rayo_mixer *_rayo_mixer_create(const char *name, const char *file, int line) { switch_memory_pool_t *pool; struct rayo_mixer *mixer = NULL; switch_core_new_memory_pool(&pool); - mixer = switch_core_alloc(pool, sizeof(*mixer)); - return rayo_mixer_init(mixer, pool, name, file, line); + mixer = rayo_mixer_init(switch_core_alloc(pool, sizeof(*mixer)), pool, name, file, line); + if (!mixer) { + switch_core_destroy_memory_pool(&pool); + } + return mixer; } /** @@ -1302,7 +1325,7 @@ static void rayo_component_cleanup(struct rayo_actor *actor) * @param cleanup optional cleanup function * @param file file that called this function * @param line line number that called this function - * @return the component + * @return the component or NULL if JID conflict */ struct rayo_component *_rayo_component_init(struct rayo_component *component, switch_memory_pool_t *pool, const char *type, const char *subtype, const char *id, struct rayo_actor *parent, const char *client_jid, rayo_actor_cleanup_fn cleanup, const char *file, int line) { @@ -1312,13 +1335,14 @@ struct rayo_component *_rayo_component_init(struct rayo_component *component, sw id = jid; } - rayo_actor_init(RAYO_ACTOR(component), pool, type, subtype, id, jid, rayo_component_cleanup, rayo_component_send, file, line); - - RAYO_RDLOCK(parent); - component->client_jid = switch_core_strdup(pool, client_jid); - component->ref = switch_core_strdup(pool, ref); - component->parent = parent; - component->cleanup_fn = cleanup; + component = RAYO_COMPONENT(rayo_actor_init(RAYO_ACTOR(component), pool, type, subtype, id, jid, rayo_component_cleanup, rayo_component_send, file, line)); + if (component) { + RAYO_RDLOCK(parent); + component->client_jid = switch_core_strdup(pool, client_jid); + component->ref = switch_core_strdup(pool, ref); + component->parent = parent; + component->cleanup_fn = cleanup; + } switch_safe_free(ref); switch_safe_free(jid); @@ -1358,27 +1382,28 @@ static void rayo_client_cleanup(struct rayo_actor *actor) * @param availability of client * @param send message transmission function * @param peer_server NULL if locally connected client - * @return the new client + * @return the new client or NULL if JID conflict */ static struct rayo_client *rayo_client_init(struct rayo_client *client, switch_memory_pool_t *pool, const char *jid, const char *route, enum presence_status availability, rayo_actor_send_fn send, struct rayo_peer_server *peer_server) { - RAYO_ACTOR_INIT(RAYO_ACTOR(client), pool, RAT_CLIENT, "", jid, jid, rayo_client_cleanup, send); - client->availability = availability; - client->peer_server = peer_server; - client->last_probe = 0; - if (route) { - client->route = switch_core_strdup(pool, route); - } + client = RAYO_CLIENT(RAYO_ACTOR_INIT(RAYO_ACTOR(client), pool, RAT_CLIENT, "", jid, jid, rayo_client_cleanup, send)); + if (client) { + client->availability = availability; + client->peer_server = peer_server; + client->last_probe = 0; + if (route) { + client->route = switch_core_strdup(pool, route); + } - /* make client available for offers */ - switch_mutex_lock(globals.clients_mutex); - switch_core_hash_insert(globals.clients_roster, RAYO_JID(client), client); - if (peer_server) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Adding %s to peer server %s\n", RAYO_JID(client), RAYO_JID(peer_server)); - switch_core_hash_insert(peer_server->clients, RAYO_JID(client), client); + /* make client available for offers */ + switch_mutex_lock(globals.clients_mutex); + switch_core_hash_insert(globals.clients_roster, RAYO_JID(client), client); + if (peer_server) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Adding %s to peer server %s\n", RAYO_JID(client), RAYO_JID(peer_server)); + switch_core_hash_insert(peer_server->clients, RAYO_JID(client), client); + } + switch_mutex_unlock(globals.clients_mutex); } - switch_mutex_unlock(globals.clients_mutex); - return client; } @@ -1401,7 +1426,11 @@ static struct rayo_client *rayo_client_create(const char *jid, const char *route switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Memory Error\n"); return NULL; } - return rayo_client_init(rclient, pool, jid, route, availability, send, peer_server); + rclient = rayo_client_init(rclient, pool, jid, route, availability, send, peer_server); + if (!rclient) { + switch_core_destroy_memory_pool(&pool); + } + return rclient; } /** @@ -1455,8 +1484,12 @@ static struct rayo_peer_server *rayo_peer_server_create(const char *jid) switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Memory Error\n"); return NULL; } - RAYO_ACTOR_INIT(RAYO_ACTOR(rserver), pool, RAT_PEER_SERVER, "", jid, jid, rayo_peer_server_cleanup, rayo_peer_server_send); - switch_core_hash_init(&rserver->clients, pool); + rserver = RAYO_PEER_SERVER(RAYO_ACTOR_INIT(RAYO_ACTOR(rserver), pool, RAT_PEER_SERVER, "", jid, jid, rayo_peer_server_cleanup, rayo_peer_server_send)); + if (rserver) { + switch_core_hash_init(&rserver->clients); + } else { + switch_core_destroy_memory_pool(&pool); + } return rserver; } @@ -2289,14 +2322,61 @@ static void *SWITCH_THREAD_FUNC rayo_dial_thread(switch_thread_t *thread, void * char *dial_to_dup = NULL; const char *dial_from = iks_find_attrib(dial, "from"); const char *dial_timeout_ms = iks_find_attrib(dial, "timeout"); + const char *requested_call_uri = iks_find_attrib(dial, "uri"); const char *uuid = NULL; struct dial_gateway *gateway = NULL; struct rayo_call *call = NULL; switch_stream_handle_t stream = { 0 }; SWITCH_STANDARD_STREAM(stream); + /* Check if optional URI is valid. */ + if (!zstr(requested_call_uri)) { + + /* Split node and domain from URI */ + char *requested_call_uri_dup = switch_core_strdup(dtdata->pool, requested_call_uri); + char *requested_call_uri_domain = strchr(requested_call_uri_dup, '@'); + if (requested_call_uri_domain) { + *requested_call_uri_domain = '\0'; + requested_call_uri_domain++; + } + + /* is domain missing */ + if (zstr(requested_call_uri_domain)) { + response = iks_new_error_detailed(iq, STANZA_ERROR_BAD_REQUEST, "Bad uri"); + goto done; + } + + /* is domain correct? */ + if (strcmp(requested_call_uri_domain, RAYO_JID(globals.server))) { + response = iks_new_error_detailed(iq, STANZA_ERROR_BAD_REQUEST, "Bad uri (invalid domain)"); + goto done; + } + + /* is node identifier missing? */ + if (zstr(requested_call_uri_dup)) { + response = iks_new_error_detailed(iq, STANZA_ERROR_BAD_REQUEST, "Bad uri (missing node)"); + goto done; + } + + /* strip optional xmpp: from node identifier */ + if (!strncasecmp("xmpp:", requested_call_uri_dup, 5)) { + requested_call_uri_dup += 5; + if (zstr(requested_call_uri_dup)) { + response = iks_new_error_detailed(iq, STANZA_ERROR_BAD_REQUEST, "Bad uri (missing node)"); + goto done; + } + } + + /* success! */ + uuid = requested_call_uri_dup; + } + /* create call and link to DCP */ - call = rayo_call_create(NULL); + call = rayo_call_create(uuid); + if (!call) { + response = iks_new_error(iq, STANZA_ERROR_CONFLICT); + goto done; + } call->dcp_jid = switch_core_strdup(RAYO_POOL(call), dcp_jid); call->dial_request_id = iks_find_attrib(iq, "id"); switch_log_printf(SWITCH_CHANNEL_UUID_LOG(rayo_call_get_uuid(call)), SWITCH_LOG_INFO, "%s has control of call\n", dcp_jid); @@ -2309,7 +2389,7 @@ static void *SWITCH_THREAD_FUNC rayo_dial_thread(switch_thread_t *thread, void * /* parse optional params from dialstring and append to */ if (*dial_to == '{') { switch_event_t *params = NULL; - dial_to_dup = strdup(dial_to); + dial_to_dup = switch_core_strdup(dtdata->pool, dial_to); switch_event_create_brackets(dial_to_dup, '{', '}', ',', ¶ms, (char **)&dial_to, SWITCH_FALSE); if (params) { switch_event_header_t *param; @@ -2468,7 +2548,7 @@ done: /* response when error */ if (response) { /* send response to client */ - RAYO_SEND_REPLY(call, iks_find_attrib(response, "to"), response); + RAYO_SEND_REPLY(globals.server, iks_find_attrib(response, "to"), response); /* destroy call */ if (call) { @@ -2477,9 +2557,8 @@ done: } } - iks_delete(dial); + iks_delete(iq); switch_safe_free(stream.data); - switch_safe_free(dial_to_dup); { switch_memory_pool_t *pool = dtdata->pool; @@ -2757,18 +2836,23 @@ static void on_mixer_delete_member_event(struct rayo_mixer *mixer, switch_event_ } /* remove member from mixer */ + switch_mutex_lock(RAYO_ACTOR(mixer)->mutex); member = (struct rayo_mixer_member *)switch_core_hash_find(mixer->members, uuid); if (!member) { /* not a member */ + switch_mutex_unlock(RAYO_ACTOR(mixer)->mutex); return; } switch_core_hash_delete(mixer->members, uuid); + switch_mutex_unlock(RAYO_ACTOR(mixer)->mutex); /* flag call as available to join another mixer */ call = RAYO_CALL_LOCATE_BY_ID(uuid); if (call) { + switch_mutex_lock(RAYO_ACTOR(call)->mutex); call->joined = 0; call->joined_id = NULL; + switch_mutex_unlock(RAYO_ACTOR(call)->mutex); RAYO_UNLOCK(call); } @@ -2786,6 +2870,7 @@ static void on_mixer_delete_member_event(struct rayo_mixer *mixer, switch_event_ iks_delete(delete_member_event); /* remove member DCP as subscriber to mixer */ + switch_mutex_lock(RAYO_ACTOR(mixer)->mutex); subscriber = (struct rayo_mixer_subscriber *)switch_core_hash_find(mixer->subscribers, member->dcp_jid); if (subscriber) { subscriber->ref_count--; @@ -2793,6 +2878,7 @@ static void on_mixer_delete_member_event(struct rayo_mixer *mixer, switch_event_ switch_core_hash_delete(mixer->subscribers, member->dcp_jid); } } + switch_mutex_unlock(RAYO_ACTOR(mixer)->mutex); } /** @@ -2827,6 +2913,7 @@ static void on_mixer_add_member_event(struct rayo_mixer *mixer, switch_event_t * iks *add_member_event = NULL, *x; const char *uuid = switch_event_get_header(event, "Unique-ID"); struct rayo_call *call = RAYO_CALL_LOCATE_BY_ID(uuid); + struct rayo_mixer *lmixer = NULL; if (!mixer) { char *ver; @@ -2836,24 +2923,35 @@ static void on_mixer_add_member_event(struct rayo_mixer *mixer, switch_event_t * const char *mixer_name = switch_event_get_header(event, "Conference-Name"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "creating mixer: %s\n", mixer_name); mixer = rayo_mixer_create(mixer_name); + if (mixer) { + /* notify online clients of mixer presence */ + ver = calculate_entity_sha1_ver(&rayo_mixer_identity, rayo_mixer_features); - /* notify online clients of mixer presence */ - ver = calculate_entity_sha1_ver(&rayo_mixer_identity, rayo_mixer_features); + presence = iks_new_presence("c", IKS_NS_XMPP_ENTITY_CAPABILITIES, RAYO_JID(mixer), ""); + c = iks_find(presence, "c"); + iks_insert_attrib(c, "hash", "sha-1"); + iks_insert_attrib(c, "node", RAYO_MIXER_NS); + iks_insert_attrib(c, "ver", ver); + free(ver); - presence = iks_new_presence("c", IKS_NS_XMPP_ENTITY_CAPABILITIES, RAYO_JID(mixer), ""); - c = iks_find(presence, "c"); - iks_insert_attrib(c, "hash", "sha-1"); - iks_insert_attrib(c, "node", RAYO_MIXER_NS); - iks_insert_attrib(c, "ver", ver); - free(ver); - - broadcast_event(RAYO_ACTOR(mixer), presence, 1); + broadcast_event(RAYO_ACTOR(mixer), presence, 1); + } else { + /* must have lost the race to another add member event... there should be a mixer with mixer_name already */ + mixer = lmixer = RAYO_MIXER_LOCATE(mixer_name); + if (!mixer) { + /* this is unexpected */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "failed to find mixer: %s\n", mixer_name); + return; + } + } } if (call) { struct rayo_mixer_member *member = NULL; /* add member DCP as subscriber to mixer */ - struct rayo_mixer_subscriber *subscriber = (struct rayo_mixer_subscriber *)switch_core_hash_find(mixer->subscribers, call->dcp_jid); + struct rayo_mixer_subscriber *subscriber; + switch_mutex_lock(RAYO_ACTOR(mixer)->mutex); + subscriber = (struct rayo_mixer_subscriber *)switch_core_hash_find(mixer->subscribers, call->dcp_jid); if (!subscriber) { subscriber = switch_core_alloc(RAYO_POOL(mixer), sizeof(*subscriber)); subscriber->ref_count = 0; @@ -2868,6 +2966,9 @@ static void on_mixer_add_member_event(struct rayo_mixer *mixer, switch_event_t * member->dcp_jid = subscriber->jid; switch_core_hash_insert(mixer->members, uuid, member); + switch_mutex_unlock(RAYO_ACTOR(mixer)->mutex); + + switch_mutex_lock(RAYO_ACTOR(call)->mutex); call->joined = JOINED_MIXER; call->joined_id = switch_core_strdup(RAYO_POOL(call), rayo_mixer_get_name(mixer)); @@ -2882,6 +2983,7 @@ static void on_mixer_add_member_event(struct rayo_mixer *mixer, switch_event_t * RAYO_SEND_REPLY(call, iks_find_attrib_soft(request, "from"), result); iks_delete(request); } + switch_mutex_unlock(RAYO_ACTOR(call)->mutex); /* send mixer joined event to member DCP */ add_member_event = iks_new_presence("joined", RAYO_NS, RAYO_JID(call), call->dcp_jid); @@ -2898,6 +3000,10 @@ static void on_mixer_add_member_event(struct rayo_mixer *mixer, switch_event_t * iks_insert_attrib_printf(x, "call-uri", "xmpp:%s@%s", uuid, RAYO_JID(globals.server)); broadcast_mixer_event(mixer, add_member_event); iks_delete(add_member_event); + + if (lmixer) { + RAYO_UNLOCK(lmixer); + } } /** @@ -3402,6 +3508,13 @@ SWITCH_STANDARD_APP(rayo_app) iks *offer = NULL; call = rayo_call_create(switch_core_session_get_uuid(session)); + if (!call) { + /* nothing that can be done to recover... */ + switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Failed to create call entity!\n"); + switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_TEMPORARY_FAILURE); + return; + } + switch_channel_set_variable(switch_core_session_get_channel(session), "rayo_call_jid", RAYO_JID(call)); offer = rayo_create_offer(call, session); @@ -3410,11 +3523,11 @@ SWITCH_STANDARD_APP(rayo_app) /* Offer call to all ONLINE clients */ /* TODO load balance offers so first session doesn't always get offer first? */ switch_mutex_lock(globals.clients_mutex); - for (hi = switch_hash_first(NULL, globals.clients_roster); hi; hi = switch_hash_next(hi)) { + for (hi = switch_core_hash_first( globals.clients_roster); hi; hi = switch_core_hash_next(hi)) { struct rayo_client *rclient; const void *key; void *val; - switch_hash_this(hi, &key, NULL, &val); + switch_core_hash_this(hi, &key, NULL, &val); rclient = (struct rayo_client *)val; switch_assert(rclient); @@ -3489,7 +3602,13 @@ static void on_xmpp_stream_ready(struct xmpp_stream *stream) if (xmpp_stream_is_s2s(stream)) { if (xmpp_stream_is_incoming(stream)) { /* peer server belongs to a s2s inbound stream */ - xmpp_stream_set_private(stream, rayo_peer_server_create(xmpp_stream_get_jid(stream))); + struct rayo_peer_server *peer = rayo_peer_server_create(xmpp_stream_get_jid(stream)); + if (peer) { + xmpp_stream_set_private(stream, peer); + } else { + /* this went really bad... */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "failed to create peer server entity!\n"); + } } else { /* send directed presence to domain */ iks *presence = iks_new("presence"); @@ -3504,7 +3623,13 @@ static void on_xmpp_stream_ready(struct xmpp_stream *stream) } } else { /* client belongs to stream */ - xmpp_stream_set_private(stream, rayo_client_create(xmpp_stream_get_jid(stream), xmpp_stream_get_jid(stream), PS_OFFLINE, rayo_client_send, NULL)); + struct rayo_client *client = rayo_client_create(xmpp_stream_get_jid(stream), xmpp_stream_get_jid(stream), PS_OFFLINE, rayo_client_send, NULL); + if (client) { + xmpp_stream_set_private(stream, client); + } else { + /* this went really bad... */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "failed to create client entity!\n"); + } } } @@ -4147,8 +4272,8 @@ static switch_status_t list_actors(const char *line, const char *cursor, switch_ struct rayo_actor *actor; switch_mutex_lock(globals.actors_mutex); - for (hi = switch_hash_first(NULL, globals.actors); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, &vvar, NULL, &val); + for (hi = switch_core_hash_first( globals.actors); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, &vvar, NULL, &val); actor = (struct rayo_actor *) val; if (match(actor)) { @@ -4323,16 +4448,16 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_rayo_load) memset(&globals, 0, sizeof(globals)); globals.pool = pool; - switch_core_hash_init(&globals.command_handlers, pool); - switch_core_hash_init(&globals.event_handlers, pool); - switch_core_hash_init(&globals.clients_roster, pool); + switch_core_hash_init(&globals.command_handlers); + switch_core_hash_init(&globals.event_handlers); + switch_core_hash_init(&globals.clients_roster); switch_mutex_init(&globals.clients_mutex, SWITCH_MUTEX_NESTED, pool); - switch_core_hash_init(&globals.actors, pool); - switch_core_hash_init(&globals.destroy_actors, pool); - switch_core_hash_init(&globals.actors_by_id, pool); + switch_core_hash_init(&globals.actors); + switch_core_hash_init(&globals.destroy_actors); + switch_core_hash_init(&globals.actors_by_id); switch_mutex_init(&globals.actors_mutex, SWITCH_MUTEX_NESTED, pool); - switch_core_hash_init(&globals.dial_gateways, pool); - switch_core_hash_init(&globals.cmd_aliases, pool); + switch_core_hash_init(&globals.dial_gateways); + switch_core_hash_init(&globals.cmd_aliases); switch_thread_rwlock_create(&globals.shutdown_rwlock, pool); switch_queue_create(&globals.msg_queue, 25000, pool); @@ -4386,6 +4511,10 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_rayo_load) /* create admin client */ globals.console = rayo_console_client_create(); + if (!globals.console) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Failed to create console client entity!\n"); + return SWITCH_STATUS_TERM; + } switch_console_set_complete("add rayo status"); switch_console_set_complete("add rayo msg ::rayo::list_all"); diff --git a/src/mod/event_handlers/mod_rayo/nlsml.c b/src/mod/event_handlers/mod_rayo/nlsml.c index b050565071..867b31b5c1 100644 --- a/src/mod/event_handlers/mod_rayo/nlsml.c +++ b/src/mod/event_handlers/mod_rayo/nlsml.c @@ -99,7 +99,7 @@ struct nlsml_parser { static struct tag_def *add_tag_def(const char *tag, tag_attribs_fn attribs_fn, tag_cdata_fn cdata_fn, const char *children_tags) { struct tag_def *def = switch_core_alloc(globals.pool, sizeof(*def)); - switch_core_hash_init(&def->children_tags, globals.pool); + switch_core_hash_init(&def->children_tags); if (!zstr(children_tags)) { char *children_tags_dup = switch_core_strdup(globals.pool, children_tags); char *tags[32] = { 0 }; @@ -451,7 +451,7 @@ int nlsml_init(void) globals.init = SWITCH_TRUE; switch_core_new_memory_pool(&globals.pool); - switch_core_hash_init(&globals.tag_defs, globals.pool); + switch_core_hash_init(&globals.tag_defs); add_root_tag_def("result", process_attribs_ignore, process_cdata_ignore, "interpretation"); add_tag_def("interpretation", process_attribs_ignore, process_cdata_ignore, "input,model,xf:model,instance,xf:instance"); diff --git a/src/mod/event_handlers/mod_rayo/rayo_cpa_component.c b/src/mod/event_handlers/mod_rayo/rayo_cpa_component.c index bbb288d920..c349e2df41 100644 --- a/src/mod/event_handlers/mod_rayo/rayo_cpa_component.c +++ b/src/mod/event_handlers/mod_rayo/rayo_cpa_component.c @@ -82,7 +82,7 @@ static void subscribe(const char *uuid, const char *signal_type, const char *jid switch_log_printf(SWITCH_CHANNEL_UUID_LOG(uuid), SWITCH_LOG_DEBUG, "Subscribe %s => %s\n", signal_type, jid); if (!signal_subscribers) { switch_log_printf(SWITCH_CHANNEL_UUID_LOG(uuid), SWITCH_LOG_DEBUG, "Create %s subscriber hash\n", signal_type); - switch_core_hash_init(&signal_subscribers, NULL); + switch_core_hash_init(&signal_subscribers); switch_core_hash_insert(globals.subscribers, key, signal_subscribers); } switch_core_hash_insert(signal_subscribers, jid, "1"); @@ -285,9 +285,13 @@ iks *rayo_cpa_component_start(struct rayo_actor *call, struct rayo_message *msg, /* create CPA component */ switch_core_new_memory_pool(&pool); component = switch_core_alloc(pool, sizeof(*component)); - rayo_component_init((struct rayo_component *)component, pool, RAT_CALL_COMPONENT, "cpa", NULL, call, iks_find_attrib(iq, "from")); + component = CPA_COMPONENT(rayo_component_init((struct rayo_component *)component, pool, RAT_CALL_COMPONENT, "cpa", NULL, call, iks_find_attrib(iq, "from"))); + if (!component) { + switch_core_destroy_memory_pool(&pool); + return iks_new_error_detailed(iq, STANZA_ERROR_INTERNAL_SERVER_ERROR, "Failed to create CPA entity"); + } - switch_core_hash_init(&component->signals, pool); + switch_core_hash_init(&component->signals); /* start CPA detectors */ for (grammar = iks_find(input, "grammar"); grammar; grammar = iks_next_tag(grammar)) { @@ -372,7 +376,7 @@ switch_status_t rayo_cpa_component_load(switch_loadable_module_interface_t **mod switch_event_bind("rayo_cpa_component", SWITCH_EVENT_CHANNEL_HANGUP_COMPLETE, NULL, on_channel_hangup_complete_event, NULL); globals.pool = pool; - switch_core_hash_init(&globals.subscribers, pool); + switch_core_hash_init(&globals.subscribers); switch_mutex_init(&globals.subscribers_mutex, SWITCH_MUTEX_NESTED, pool); return rayo_cpa_detector_load(module_interface, pool, config_file); diff --git a/src/mod/event_handlers/mod_rayo/rayo_cpa_detector.c b/src/mod/event_handlers/mod_rayo/rayo_cpa_detector.c index ed1d87d152..1f4cbb58ee 100644 --- a/src/mod/event_handlers/mod_rayo/rayo_cpa_detector.c +++ b/src/mod/event_handlers/mod_rayo/rayo_cpa_detector.c @@ -261,7 +261,7 @@ static switch_status_t do_config(switch_memory_pool_t *pool, const char *config_ return SWITCH_STATUS_TERM; } - switch_core_hash_init(&bound_events, pool); + switch_core_hash_init(&bound_events); cpa_xml = switch_xml_child(cfg, "cpa"); if (cpa_xml) { @@ -279,7 +279,7 @@ static switch_status_t do_config(switch_memory_pool_t *pool, const char *config_ } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CPA detector: %s\n", name); detector = switch_core_alloc(pool, sizeof(*detector)); - switch_core_hash_init(&detector->signal_type_map, pool); + switch_core_hash_init(&detector->signal_type_map); detector->name = switch_core_strdup(pool, name); switch_uuid_str(id, sizeof(id)); detector->uuid = switch_core_strdup(pool, id); @@ -390,8 +390,8 @@ static switch_status_t rayo_cpa_detector_signal_types(const char *line, const ch const void *vvar; switch_console_callback_match_t *my_matches = NULL; - for (hi = switch_hash_first(NULL, globals.detectors); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, &vvar, NULL, &val); + for (hi = switch_core_hash_first( globals.detectors); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, &vvar, NULL, &val); switch_console_push_match(&my_matches, (const char *) vvar); } @@ -420,7 +420,7 @@ switch_status_t rayo_cpa_detector_load(switch_loadable_module_interface_t **modu switch_console_set_complete("add rayo_cpa ::console::list_uuid ::rayo_cpa::list_signal_types stop"); switch_console_add_complete_func("::rayo_cpa::list_signal_types", rayo_cpa_detector_signal_types); - switch_core_hash_init(&globals.detectors, pool); + switch_core_hash_init(&globals.detectors); if (do_config(pool, config_file) != SWITCH_STATUS_SUCCESS) { return SWITCH_STATUS_TERM; } diff --git a/src/mod/event_handlers/mod_rayo/rayo_fax_components.c b/src/mod/event_handlers/mod_rayo/rayo_fax_components.c index 4a4fc76f6b..e787dbe9e5 100644 --- a/src/mod/event_handlers/mod_rayo/rayo_fax_components.c +++ b/src/mod/event_handlers/mod_rayo/rayo_fax_components.c @@ -1,6 +1,6 @@ /* * mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * Copyright (C) 2013, Grasshopper + * Copyright (C) 2013-2014, Grasshopper * * Version: MPL 1.1 * @@ -177,7 +177,11 @@ static iks *start_sendfax_component(struct rayo_actor *call, struct rayo_message /* create sendfax component */ switch_core_new_memory_pool(&pool); sendfax_component = switch_core_alloc(pool, sizeof(*sendfax_component)); - rayo_component_init((struct rayo_component *)sendfax_component, pool, RAT_CALL_COMPONENT, "sendfax", NULL, call, iks_find_attrib(iq, "from")); + sendfax_component = FAX_COMPONENT(rayo_component_init((struct rayo_component *)sendfax_component, pool, RAT_CALL_COMPONENT, "sendfax", NULL, call, iks_find_attrib(iq, "from"))); + if (!sendfax_component) { + switch_core_destroy_memory_pool(&pool); + return iks_new_error_detailed(iq, STANZA_ERROR_INTERNAL_SERVER_ERROR, "Failed to create sendfax entity"); + } /* add channel variable so that fax component can be located from fax events */ switch_channel_set_variable(channel, "rayo_fax_jid", RAYO_JID(sendfax_component)); @@ -265,7 +269,11 @@ static iks *start_receivefax_component(struct rayo_actor *call, struct rayo_mess /* create receivefax component */ switch_core_new_memory_pool(&pool); receivefax_component = switch_core_alloc(pool, sizeof(*receivefax_component)); - rayo_component_init((struct rayo_component *)receivefax_component, pool, RAT_CALL_COMPONENT, "receivefax", NULL, call, iks_find_attrib(iq, "from")); + receivefax_component = RECEIVEFAX_COMPONENT(rayo_component_init((struct rayo_component *)receivefax_component, pool, RAT_CALL_COMPONENT, "receivefax", NULL, call, iks_find_attrib(iq, "from"))); + if (!receivefax_component) { + switch_core_destroy_memory_pool(&pool); + return iks_new_error_detailed(iq, STANZA_ERROR_INTERNAL_SERVER_ERROR, "Failed to create sendfax entity"); + } file_no = rayo_actor_seq_next(call); receivefax_component->filename = switch_core_sprintf(pool, "%s%s%s-%d.tif", globals.file_prefix, SWITCH_PATH_SEPARATOR, switch_core_session_get_uuid(session), file_no); diff --git a/src/mod/event_handlers/mod_rayo/rayo_input_component.c b/src/mod/event_handlers/mod_rayo/rayo_input_component.c index f9cae65e50..d7f67ec7a1 100644 --- a/src/mod/event_handlers/mod_rayo/rayo_input_component.c +++ b/src/mod/event_handlers/mod_rayo/rayo_input_component.c @@ -568,7 +568,7 @@ static iks *start_call_input(struct input_component *component, switch_core_sess /* create input component */ handler = switch_core_session_alloc(session, sizeof(*handler)); switch_mutex_init(&handler->mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); - switch_core_hash_init(&handler->dtmf_components, NULL); + switch_core_hash_init(&handler->dtmf_components); switch_channel_set_private(switch_core_session_get_channel(session), RAYO_INPUT_COMPONENT_PRIVATE_VAR, handler); handler->last_recognizer = ""; @@ -666,7 +666,11 @@ static iks *start_call_input_component(struct rayo_actor *call, struct rayo_mess switch_core_new_memory_pool(&pool); input_component = switch_core_alloc(pool, sizeof(*input_component)); - rayo_component_init(RAYO_COMPONENT(input_component), pool, RAT_CALL_COMPONENT, "input", component_id, call, iks_find_attrib(iq, "from")); + input_component = INPUT_COMPONENT(rayo_component_init(RAYO_COMPONENT(input_component), pool, RAT_CALL_COMPONENT, "input", component_id, call, iks_find_attrib(iq, "from"))); + if (!input_component) { + switch_core_destroy_memory_pool(&pool); + return iks_new_error_detailed(iq, STANZA_ERROR_INTERNAL_SERVER_ERROR, "Failed to create input entity"); + } return start_call_input(input_component, session, input, iq, NULL, 0); } diff --git a/src/mod/event_handlers/mod_rayo/rayo_output_component.c b/src/mod/event_handlers/mod_rayo/rayo_output_component.c index 5b9ed2eff5..25ca3d4545 100644 --- a/src/mod/event_handlers/mod_rayo/rayo_output_component.c +++ b/src/mod/event_handlers/mod_rayo/rayo_output_component.c @@ -68,17 +68,20 @@ static struct rayo_component *create_output_component(struct rayo_actor *actor, switch_core_new_memory_pool(&pool); output_component = switch_core_alloc(pool, sizeof(*output_component)); - rayo_component_init((struct rayo_component *)output_component, pool, type, "output", NULL, actor, client_jid); + output_component = OUTPUT_COMPONENT(rayo_component_init((struct rayo_component *)output_component, pool, type, "output", NULL, actor, client_jid)); + if (output_component) { + output_component->document = iks_copy(output); + output_component->start_offset_ms = iks_find_int_attrib(output, "start-offset"); + output_component->repeat_interval_ms = iks_find_int_attrib(output, "repeat-interval"); + output_component->repeat_times = iks_find_int_attrib(output, "repeat-times"); + output_component->max_time_ms = iks_find_int_attrib(output, "max-time"); + output_component->start_paused = iks_find_bool_attrib(output, "start-paused"); + output_component->renderer = iks_find_attrib(output, "renderer"); + } else { + switch_core_destroy_memory_pool(&pool); + } - output_component->document = iks_copy(output); - output_component->start_offset_ms = iks_find_int_attrib(output, "start-offset"); - output_component->repeat_interval_ms = iks_find_int_attrib(output, "repeat-interval"); - output_component->repeat_times = iks_find_int_attrib(output, "repeat-times"); - output_component->max_time_ms = iks_find_int_attrib(output, "max-time"); - output_component->start_paused = iks_find_bool_attrib(output, "start-paused"); - output_component->renderer = iks_find_attrib(output, "renderer"); - - return (struct rayo_component *)output_component; + return RAYO_COMPONENT(output_component); } /** @@ -153,6 +156,9 @@ static iks *start_call_output_component(struct rayo_actor *call, struct rayo_mes } output_component = create_output_component(call, RAT_CALL_COMPONENT, output, iks_find_attrib(iq, "from")); + if (!output_component) { + return iks_new_error_detailed(iq, STANZA_ERROR_INTERNAL_SERVER_ERROR, "Failed to create output entity"); + } return start_call_output(output_component, session, output, iq); } @@ -179,6 +185,9 @@ static iks *start_mixer_output_component(struct rayo_actor *mixer, struct rayo_m } component = create_output_component(mixer, RAT_MIXER_COMPONENT, output, iks_find_attrib(iq, "from")); + if (!component) { + return iks_new_error_detailed(iq, STANZA_ERROR_INTERNAL_SERVER_ERROR, "Failed to create output entity"); + } /* build conference command */ SWITCH_STANDARD_STREAM(stream); @@ -1195,7 +1204,7 @@ switch_status_t rayo_output_component_load(switch_loadable_module_interface_t ** file_interface->file_seek = rayo_file_seek; switch_mutex_init(&fileman_globals.mutex, SWITCH_MUTEX_NESTED, pool); - switch_core_hash_init(&fileman_globals.hash, pool); + switch_core_hash_init(&fileman_globals.hash); file_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_FILE_INTERFACE); file_interface->interface_name = "mod_rayo"; diff --git a/src/mod/event_handlers/mod_rayo/rayo_prompt_component.c b/src/mod/event_handlers/mod_rayo/rayo_prompt_component.c index 9cd946fc43..7431558a0a 100644 --- a/src/mod/event_handlers/mod_rayo/rayo_prompt_component.c +++ b/src/mod/event_handlers/mod_rayo/rayo_prompt_component.c @@ -1,6 +1,6 @@ /* * mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * Copyright (C) 2013, Grasshopper + * Copyright (C) 2013-2014, Grasshopper * * Version: MPL 1.1 * @@ -559,7 +559,11 @@ static iks *start_call_prompt_component(struct rayo_actor *call, struct rayo_mes /* create prompt component, linked to call */ switch_core_new_memory_pool(&pool); prompt_component = switch_core_alloc(pool, sizeof(*prompt_component)); - rayo_component_init(RAYO_COMPONENT(prompt_component), pool, RAT_CALL_COMPONENT, "prompt", NULL, call, iks_find_attrib(iq, "from")); + prompt_component = PROMPT_COMPONENT(rayo_component_init(RAYO_COMPONENT(prompt_component), pool, RAT_CALL_COMPONENT, "prompt", NULL, call, iks_find_attrib(iq, "from"))); + if (!prompt_component) { + switch_core_destroy_memory_pool(&pool); + return iks_new_error_detailed(iq, STANZA_ERROR_INTERNAL_SERVER_ERROR, "Failed to create prompt entity"); + } prompt_component->iq = iks_copy(iq); /* start output */ diff --git a/src/mod/event_handlers/mod_rayo/rayo_record_component.c b/src/mod/event_handlers/mod_rayo/rayo_record_component.c index 03b0ca40db..1f3f3a6850 100644 --- a/src/mod/event_handlers/mod_rayo/rayo_record_component.c +++ b/src/mod/event_handlers/mod_rayo/rayo_record_component.c @@ -1,6 +1,6 @@ /* * mod_rayo for FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application - * Copyright (C) 2013, Grasshopper + * Copyright (C) 2013-2014, Grasshopper * * Version: MPL 1.1 * @@ -156,11 +156,6 @@ static struct rayo_component *record_component_create(struct rayo_actor *actor, char *fs_file_path; switch_bool_t start_paused; - /* validate record attributes */ - if (!VALIDATE_RAYO_RECORD(record)) { - return NULL; - } - start_paused = iks_find_bool_attrib(record, "start-paused"); /* create record filename from session UUID and ref */ @@ -175,16 +170,20 @@ static struct rayo_component *record_component_create(struct rayo_actor *actor, switch_core_new_memory_pool(&pool); record_component = switch_core_alloc(pool, sizeof(*record_component)); - rayo_component_init(RAYO_COMPONENT(record_component), pool, type, "record", fs_file_path, actor, client_jid); - record_component->max_duration = iks_find_int_attrib(record, "max-duration"); - record_component->initial_timeout = iks_find_int_attrib(record, "initial-timeout"); - record_component->final_timeout = iks_find_int_attrib(record, "final-timeout"); - record_component->direction = switch_core_strdup(RAYO_POOL(record_component), iks_find_attrib_soft(record, "direction")); - record_component->mix = iks_find_bool_attrib(record, "mix"); - record_component->start_beep = iks_find_bool_attrib(record, "start-beep"); - record_component->stop_beep = iks_find_bool_attrib(record, "stop-beep"); - record_component->start_time = start_paused ? 0 : switch_micro_time_now(); - record_component->local_file_path = switch_core_strdup(RAYO_POOL(record_component), local_file_path); + record_component = RECORD_COMPONENT(rayo_component_init(RAYO_COMPONENT(record_component), pool, type, "record", fs_file_path, actor, client_jid));\ + if (record_component) { + record_component->max_duration = iks_find_int_attrib(record, "max-duration"); + record_component->initial_timeout = iks_find_int_attrib(record, "initial-timeout"); + record_component->final_timeout = iks_find_int_attrib(record, "final-timeout"); + record_component->direction = switch_core_strdup(RAYO_POOL(record_component), iks_find_attrib_soft(record, "direction")); + record_component->mix = iks_find_bool_attrib(record, "mix"); + record_component->start_beep = iks_find_bool_attrib(record, "start-beep"); + record_component->stop_beep = iks_find_bool_attrib(record, "stop-beep"); + record_component->start_time = start_paused ? 0 : switch_micro_time_now(); + record_component->local_file_path = switch_core_strdup(RAYO_POOL(record_component), local_file_path); + } else { + switch_core_destroy_memory_pool(&pool); + } switch_safe_free(local_file_path); switch_safe_free(fs_file_path); @@ -270,9 +269,14 @@ static iks *start_call_record_component(struct rayo_actor *call, struct rayo_mes struct rayo_component *component = NULL; iks *record = iks_find(iq, "record"); + /* validate record attributes */ + if (!VALIDATE_RAYO_RECORD(record)) { + return iks_new_error(iq, STANZA_ERROR_BAD_REQUEST); + } + component = record_component_create(call, RAT_CALL_COMPONENT, iks_find_attrib(iq, "from"), record); if (!component) { - return iks_new_error(iq, STANZA_ERROR_BAD_REQUEST); + return iks_new_error_detailed(iq, STANZA_ERROR_INTERNAL_SERVER_ERROR, "Failed to create record entity"); } if (start_call_record(session, component)) { @@ -396,9 +400,14 @@ static iks *start_mixer_record_component(struct rayo_actor *mixer, struct rayo_m struct rayo_component *component = NULL; iks *record = iks_find(iq, "record"); + /* validate record attributes */ + if (!VALIDATE_RAYO_RECORD(record)) { + return iks_new_error(iq, STANZA_ERROR_BAD_REQUEST); + } + component = record_component_create(mixer, RAT_MIXER_COMPONENT, iks_find_attrib(iq, "from"), record); if (!component) { - return iks_new_error(iq, STANZA_ERROR_BAD_REQUEST); + return iks_new_error_detailed(iq, STANZA_ERROR_INTERNAL_SERVER_ERROR, "Failed to create record entity"); } /* mixer doesn't allow "send" */ diff --git a/src/mod/event_handlers/mod_rayo/srgs.c b/src/mod/event_handlers/mod_rayo/srgs.c index 86cf825635..111ff4ab18 100644 --- a/src/mod/event_handlers/mod_rayo/srgs.c +++ b/src/mod/event_handlers/mod_rayo/srgs.c @@ -387,7 +387,7 @@ static struct srgs_node *sn_insert_string(switch_memory_pool_t *pool, struct srg static struct tag_def *add_tag_def(const char *tag, tag_attribs_fn attribs_fn, tag_cdata_fn cdata_fn, const char *children_tags) { struct tag_def *def = switch_core_alloc(globals.pool, sizeof(*def)); - switch_core_hash_init(&def->children_tags, globals.pool); + switch_core_hash_init(&def->children_tags); if (!zstr(children_tags)) { char *children_tags_dup = switch_core_strdup(globals.pool, children_tags); char *tags[32] = { 0 }; @@ -821,7 +821,7 @@ struct srgs_grammar *srgs_grammar_new(struct srgs_parser *parser) grammar->root = NULL; grammar->cur = NULL; grammar->uuid = (parser && !zstr(parser->uuid)) ? switch_core_strdup(pool, parser->uuid) : ""; - switch_core_hash_init(&grammar->rules, pool); + switch_core_hash_init(&grammar->rules); switch_mutex_init(&grammar->mutex, SWITCH_MUTEX_NESTED, pool); return grammar; } @@ -856,7 +856,7 @@ struct srgs_parser *srgs_parser_new(const char *uuid) parser = switch_core_alloc(pool, sizeof(*parser)); parser->pool = pool; parser->uuid = zstr(uuid) ? "" : switch_core_strdup(pool, uuid); - switch_core_hash_init(&parser->cache, pool); + switch_core_hash_init(&parser->cache); switch_mutex_init(&parser->mutex, SWITCH_MUTEX_NESTED, pool); } return parser; @@ -1611,7 +1611,7 @@ int srgs_init(void) globals.init = SWITCH_TRUE; switch_core_new_memory_pool(&globals.pool); - switch_core_hash_init(&globals.tag_defs, globals.pool); + switch_core_hash_init(&globals.tag_defs); add_root_tag_def("grammar", process_grammar, process_cdata_bad, "meta,metadata,lexicon,tag,rule"); add_tag_def("ruleref", process_ruleref, process_cdata_bad, ""); diff --git a/src/mod/event_handlers/mod_rayo/test_iks/Makefile b/src/mod/event_handlers/mod_rayo/test_iks/Makefile deleted file mode 100644 index d75a967feb..0000000000 --- a/src/mod/event_handlers/mod_rayo/test_iks/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -BASE=../../../../.. - -IKS_DIR=$(BASE)/libs/iksemel -IKS_LA=$(IKS_DIR)/src/libiksemel.la -LOCAL_CFLAGS += -I../ -I$(BASE)/libs/iksemel/include -LOCAL_OBJS= $(PCRE_LA) $(IKS_LA) main.o ../iks_helpers.o -LOCAL_SOURCES= main.c -include $(BASE)/build/modmake.rules - -$(IKS_LA): $(IKS_DIR) $(IKS_DIR)/.update - @cd $(IKS_DIR) && $(MAKE) - @$(TOUCH_TARGET) - -local_all: - libtool --mode=link gcc main.o ../iks_helpers.o -o test test_iks.la - -local_clean: - -rm test diff --git a/src/mod/event_handlers/mod_rayo/test_nlsml/Makefile b/src/mod/event_handlers/mod_rayo/test_nlsml/Makefile deleted file mode 100644 index f363f55590..0000000000 --- a/src/mod/event_handlers/mod_rayo/test_nlsml/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -BASE=../../../../.. - -IKS_DIR=$(BASE)/libs/iksemel -IKS_LA=$(IKS_DIR)/src/libiksemel.la -LOCAL_CFLAGS += -I../ -I$(BASE)/libs/iksemel/include -LOCAL_OBJS= $(PCRE_LA) $(IKS_LA) main.o ../nlsml.o -LOCAL_SOURCES= main.c -include $(BASE)/build/modmake.rules - -$(IKS_LA): $(IKS_DIR) $(IKS_DIR)/.update - @cd $(IKS_DIR) && $(MAKE) - @$(TOUCH_TARGET) - -local_all: - libtool --mode=link gcc main.o ../nlsml.o -o test test_nlsml.la - -local_clean: - -rm test diff --git a/src/mod/event_handlers/mod_rayo/test_srgs/Makefile b/src/mod/event_handlers/mod_rayo/test_srgs/Makefile deleted file mode 100644 index d35ddb5a02..0000000000 --- a/src/mod/event_handlers/mod_rayo/test_srgs/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -BASE=../../../../.. - -IKS_DIR=$(BASE)/libs/iksemel -PCRE_DIR=$(BASE)/libs/pcre -IKS_LA=$(IKS_DIR)/src/libiksemel.la -PCRE_LA=$(PCRE_DIR)/libpcre.la -LOCAL_CFLAGS += -I../ -I$(BASE)/libs/iksemel/include -I$(BASE)/libs/pcre/include -LOCAL_OBJS= $(PCRE_LA) $(IKS_LA) main.o ../srgs.o -LOCAL_SOURCES= main.c -include $(BASE)/build/modmake.rules - -$(IKS_LA): $(IKS_DIR) $(IKS_DIR)/.update - @cd $(IKS_DIR) && $(MAKE) - @$(TOUCH_TARGET) - -$(PCRE_LA): $(PCRE_DIR) $(PCRE_DIR)/.update - @cd $(PCRE_DIR) && $(MAKE) - @$(TOUCH_TARGET) - -local_all: - libtool --mode=link gcc main.o ../srgs.o -o test test_srgs.la - -local_clean: - -rm test diff --git a/src/mod/event_handlers/mod_rayo/xmpp_streams.c b/src/mod/event_handlers/mod_rayo/xmpp_streams.c index 033fdb8fb4..d0317fdba6 100644 --- a/src/mod/event_handlers/mod_rayo/xmpp_streams.c +++ b/src/mod/event_handlers/mod_rayo/xmpp_streams.c @@ -1750,8 +1750,8 @@ struct xmpp_stream_context *xmpp_stream_context_create(const char *domain, const context = switch_core_alloc(pool, sizeof(*context)); context->pool = pool; switch_mutex_init(&context->streams_mutex, SWITCH_MUTEX_NESTED, context->pool); - switch_core_hash_init(&context->routes, context->pool); - switch_core_hash_init(&context->streams, context->pool); + switch_core_hash_init(&context->routes); + switch_core_hash_init(&context->streams); context->dialback_secret = switch_core_strdup(context->pool, domain_secret); context->ready_callback = ready; context->destroy_callback = destroy; @@ -1759,7 +1759,7 @@ struct xmpp_stream_context *xmpp_stream_context_create(const char *domain, const context->shutdown = 0; context->domain = switch_core_strdup(context->pool, domain); switch_thread_rwlock_create(&context->shutdown_rwlock, context->pool); - switch_core_hash_init(&context->users, context->pool); + switch_core_hash_init(&context->users); return context; } diff --git a/src/mod/event_handlers/mod_snmp/Makefile b/src/mod/event_handlers/mod_snmp/Makefile deleted file mode 100644 index f95227b4b5..0000000000 --- a/src/mod/event_handlers/mod_snmp/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -include ../../../../build/modmake.rules - -LOCAL_CFLAGS=`net-snmp-config --cflags` -LOCAL_LDFLAGS=`net-snmp-config --agent-libs` -LOCAL_OBJS=subagent.o - -local_depend: $(LOCAL_OBJS) diff --git a/src/mod/event_handlers/mod_snmp/Makefile.am b/src/mod/event_handlers/mod_snmp/Makefile.am new file mode 100644 index 0000000000..7c84fdd1bc --- /dev/null +++ b/src/mod/event_handlers/mod_snmp/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_snmp + +mod_LTLIBRARIES = mod_snmp.la +mod_snmp_la_SOURCES = mod_snmp.c subagent.c +mod_snmp_la_CFLAGS = $(AM_CFLAGS) `net-snmp-config --cflags` +mod_snmp_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_snmp_la_LDFLAGS = -avoid-version -module -no-undefined -shared `net-snmp-config --agent-libs` diff --git a/src/mod/formats/mod_local_stream/Makefile b/src/mod/formats/mod_local_stream/Makefile deleted file mode 100644 index d61a011991..0000000000 --- a/src/mod/formats/mod_local_stream/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -MODNAME=mod_local_stream -include ../../../../build/modmake.rules diff --git a/src/mod/formats/mod_local_stream/Makefile.am b/src/mod/formats/mod_local_stream/Makefile.am new file mode 100644 index 0000000000..c34977df9f --- /dev/null +++ b/src/mod/formats/mod_local_stream/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_local_stream + +mod_LTLIBRARIES = mod_local_stream.la +mod_local_stream_la_SOURCES = mod_local_stream.c +mod_local_stream_la_CFLAGS = $(AM_CFLAGS) +mod_local_stream_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_local_stream_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/formats/mod_local_stream/mod_local_stream.c b/src/mod/formats/mod_local_stream/mod_local_stream.c index 6b72cb3f16..b75e69ec01 100644 --- a/src/mod/formats/mod_local_stream/mod_local_stream.c +++ b/src/mod/formats/mod_local_stream/mod_local_stream.c @@ -810,8 +810,8 @@ SWITCH_STANDARD_API(show_local_stream_function) switch_mutex_lock(globals.mutex); if (zstr(cmd)) { - for (hi = switch_hash_first(NULL, globals.source_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, &var, NULL, &val); + for (hi = switch_core_hash_first( globals.source_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, &var, NULL, &val); if ((source = (local_stream_source_t *) val)) { stream->write_function(stream, "%s,%s\n", source->name, source->location); } @@ -981,7 +981,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_local_stream_load) memset(&globals, 0, sizeof(globals)); switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, pool); - switch_core_hash_init(&globals.source_hash, pool); + switch_core_hash_init(&globals.source_hash); if (!launch_streams(NULL)) { return SWITCH_STATUS_GENERR; } diff --git a/src/mod/formats/mod_native_file/Makefile.am b/src/mod/formats/mod_native_file/Makefile.am new file mode 100644 index 0000000000..c15a95a307 --- /dev/null +++ b/src/mod/formats/mod_native_file/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_native_file + +mod_LTLIBRARIES = mod_native_file.la +mod_native_file_la_SOURCES = mod_native_file.c +mod_native_file_la_CFLAGS = $(AM_CFLAGS) +mod_native_file_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_native_file_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/formats/mod_portaudio_stream/Makefile.am b/src/mod/formats/mod_portaudio_stream/Makefile.am index ae9896a7b0..4ca5d80757 100644 --- a/src/mod/formats/mod_portaudio_stream/Makefile.am +++ b/src/mod/formats/mod_portaudio_stream/Makefile.am @@ -6,7 +6,7 @@ PALA=$(switch_builddir)/libs/portaudio/lib/libportaudio.la MODPA_DIR=$(switch_srcdir)/src/mod/endpoints/mod_portaudio mod_LTLIBRARIES = mod_portaudio_stream.la -mod_portaudio_stream_la_SOURCES = mod_portaudio_stream.c $(MODPA_DIR)/pablio.c $(MODPA_DIR)/pa_ringbuffer.c +mod_portaudio_stream_la_SOURCES = mod_portaudio_stream.c ../../endpoints/mod_portaudio/pablio.c ../../endpoints/mod_portaudio/pa_ringbuffer.c mod_portaudio_stream_la_CFLAGS = -I. -I$(PA_DIR)/include -D__EXTENSION__=1 -I$(MODPA_DIR) $(AM_CFLAGS) mod_portaudio_stream_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(PALA) mod_portaudio_stream_la_LDFLAGS = -avoid-version -module -no-undefined -shared $(PA_LIBS) diff --git a/src/mod/formats/mod_portaudio_stream/mod_portaudio_stream.c b/src/mod/formats/mod_portaudio_stream/mod_portaudio_stream.c index b5c8c5d878..005a9cbb6e 100644 --- a/src/mod/formats/mod_portaudio_stream/mod_portaudio_stream.c +++ b/src/mod/formats/mod_portaudio_stream/mod_portaudio_stream.c @@ -582,7 +582,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_portaudio_stream_load) globals.running = 1; globals.threads = 0; switch_mutex_init(&globals.mutex, SWITCH_MUTEX_NESTED, module_pool); - switch_core_hash_init(&globals.source_hash, module_pool); + switch_core_hash_init(&globals.source_hash); /* indicate that the module should continue to be loaded */ diff --git a/src/mod/formats/mod_shell_stream/Makefile.am b/src/mod/formats/mod_shell_stream/Makefile.am new file mode 100644 index 0000000000..3a780b7b14 --- /dev/null +++ b/src/mod/formats/mod_shell_stream/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_shell_stream + +mod_LTLIBRARIES = mod_shell_stream.la +mod_shell_stream_la_SOURCES = mod_shell_stream.c +mod_shell_stream_la_CFLAGS = $(AM_CFLAGS) +mod_shell_stream_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_shell_stream_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/formats/mod_shout/Makefile b/src/mod/formats/mod_shout/Makefile.am similarity index 57% rename from src/mod/formats/mod_shout/Makefile rename to src/mod/formats/mod_shout/Makefile.am index f059677e7e..fb2cb5e4f7 100644 --- a/src/mod/formats/mod_shout/Makefile +++ b/src/mod/formats/mod_shout/Makefile.am @@ -1,7 +1,9 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_shout + LAME=lame-3.98.4 SHOUT=libshout-2.2.2 MPG123=mpg123-1.13.2 -BASE=../../../.. LAME_DIR=$(switch_srcdir)/libs/$(LAME) SHOUT_DIR=$(switch_srcdir)/libs/$(SHOUT) @@ -15,20 +17,21 @@ LAMELA=$(LAME_BUILDDIR)/libmp3lame/libmp3lame.la SHOUTLA=$(SHOUT_BUILDDIR)/src/libshout.la MPG123LA=$(MPG123_BUILDDIR)/src/libmpg123/libmpg123.la -LOCAL_CFLAGS=-I$(SHOUT_DIR)/include -I$(LAME_DIR)/include -I$(MPG123_DIR)/src -I$(MPG123_BUILDDIR)/src -I$(SHOUT_BUILDDIR)/include -LOCAL_LIBADD=$(LAMELA) $(SHOUTLA) $(MPG123LA) -LOCAL_LDFLAGS=`cat $(SHOUT_BUILDDIR)/Makefile | grep SPEEX_LIBS | sed -e 's|^SPEEX_LIBS =||'` `cat $(SHOUTLA) | grep dependency_libs | sed -e 's|^dependency_libs=||' | sed -e "s|'||g"` +mod_LTLIBRARIES = mod_shout.la +mod_shout_la_SOURCES = mod_shout.c +mod_shout_la_CFLAGS = $(AM_CFLAGS) +mod_shout_la_CFLAGS += -I$(SHOUT_DIR)/include -I$(LAME_DIR)/include -I$(MPG123_DIR)/src -I$(MPG123_BUILDDIR)/src -I$(SHOUT_BUILDDIR)/include +mod_shout_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(LAMELA) $(SHOUTLA) $(MPG123LA) +mod_shout_la_LDFLAGS = -avoid-version -module -no-undefined -shared `cat $(SHOUT_BUILDDIR)/Makefile | grep SPEEX_LIBS | sed -e 's|^SPEEX_LIBS =||'` `cat $(SHOUTLA) | grep dependency_libs | sed -e 's|^dependency_libs=||' | sed -e "s|'||g"` -include $(BASE)/build/modmake.rules - -$(MODNAME).lo: $(LOCAL_LIBADD) +BUILT_SOURCES=$(LAMELA) $(SHOUTLA) $(MPG123LA) $(MPG123_DIR): $(GETLIB) $(MPG123).tar.gz $(MPG123_BUILDDIR)/Makefile: $(MPG123_DIR) mkdir -p $(MPG123_BUILDDIR) - cd $(MPG123_BUILDDIR) && $(DEFAULT_VARS) $(MPG123_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(MPG123_DIR) CPPFLAGS= LDFLAGS= + cd $(MPG123_BUILDDIR) && $(DEFAULT_VARS) $(MPG123_DIR)/configure $(DEFAULT_ARGS) --disable-shared --with-pic --srcdir=$(MPG123_DIR) CPPFLAGS= LDFLAGS= $(TOUCH_TARGET) $(MPG123LA): $(MPG123_BUILDDIR)/Makefile @@ -40,7 +43,7 @@ $(LAME_DIR): $(LAME_BUILDDIR)/Makefile: $(LAME_DIR) mkdir -p $(LAME_BUILDDIR) - cd $(LAME_BUILDDIR) && $(DEFAULT_VARS) $(LAME_DIR)/configure $(DEFAULT_ARGS) --disable-decoder --srcdir=$(LAME_DIR) CPPFLAGS= LDFLAGS= + cd $(LAME_BUILDDIR) && $(DEFAULT_VARS) $(LAME_DIR)/configure $(DEFAULT_ARGS) --disable-shared --with-pic --disable-decoder --srcdir=$(LAME_DIR) CPPFLAGS= LDFLAGS= $(TOUCH_TARGET) $(LAMELA): $(LAME_BUILDDIR)/Makefile @@ -53,12 +56,10 @@ $(SHOUT_DIR): $(SHOUT_BUILDDIR)/Makefile: $(SHOUT_DIR) mkdir -p $(SHOUT_BUILDDIR) - cd $(SHOUT_BUILDDIR) && $(DEFAULT_VARS) $(SHOUT_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(SHOUT_DIR) --without-speex --without-vorbis --without-ogg CPPFLAGS= LDFLAGS= + cd $(SHOUT_BUILDDIR) && $(DEFAULT_VARS) $(SHOUT_DIR)/configure $(DEFAULT_ARGS) --disable-shared --with-pic --srcdir=$(SHOUT_DIR) --without-speex --without-vorbis --without-ogg CPPFLAGS= LDFLAGS= $(TOUCH_TARGET) $(SHOUTLA): $(SHOUT_BUILDDIR)/Makefile cd $(SHOUT_BUILDDIR) && $(MAKE) $(TOUCH_TARGET) - - diff --git a/src/mod/formats/mod_shout/mod_shout.c b/src/mod/formats/mod_shout/mod_shout.c index b05e4b393e..662de882c3 100644 --- a/src/mod/formats/mod_shout/mod_shout.c +++ b/src/mod/formats/mod_shout/mod_shout.c @@ -32,8 +32,8 @@ * example filename: shout://user:pass@host.com/mount.mp3 * */ -#include "libmpg123/mpg123.h" #include +#include "libmpg123/mpg123.h" #include #include #include diff --git a/src/mod/formats/mod_sndfile/Makefile b/src/mod/formats/mod_sndfile/Makefile deleted file mode 100644 index 1f27f2aeaf..0000000000 --- a/src/mod/formats/mod_sndfile/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -BASE=../../../.. - -SNDFILE_DIR=$(switch_srcdir)/libs/libsndfile -SNDFILE_BUILDDIR=$(switch_builddir)/libs/libsndfile -SNDFILELA=$(SNDFILE_BUILDDIR)/src/libsndfile.la - -LOCAL_CFLAGS=-I$(SNDFILE_DIR)/src -I$(SNDFILE_BUILDDIR)/src -LOCAL_LIBADD=$(SNDFILELA) - -include $(BASE)/build/modmake.rules - -$(SNDFILELA): $(SNDFILE_DIR) $(SNDFILE_DIR)/.update - cd $(SNDFILE_BUILDDIR) && $(MAKE) - $(TOUCH_TARGET) diff --git a/src/mod/formats/mod_sndfile/Makefile.am b/src/mod/formats/mod_sndfile/Makefile.am new file mode 100644 index 0000000000..a633525b72 --- /dev/null +++ b/src/mod/formats/mod_sndfile/Makefile.am @@ -0,0 +1,18 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_sndfile + +SNDFILE_DIR=$(switch_srcdir)/libs/libsndfile +SNDFILE_BUILDDIR=$(switch_builddir)/libs/libsndfile +SNDFILELA=$(SNDFILE_BUILDDIR)/src/libsndfile.la + +mod_LTLIBRARIES = mod_sndfile.la +mod_sndfile_la_SOURCES = mod_sndfile.c +mod_sndfile_la_CFLAGS = $(AM_CFLAGS) -I$(SNDFILE_DIR)/src -I$(SNDFILE_BUILDDIR)/src +mod_sndfile_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(SNDFILELA) +mod_sndfile_la_LDFLAGS = -avoid-version -module -no-undefined -shared + +BUILT_SOURCES=$(SNDFILELA) + +$(SNDFILELA): $(SNDFILE_DIR) $(SNDFILE_DIR)/.update + cd $(SNDFILE_BUILDDIR) && $(MAKE) + $(TOUCH_TARGET) diff --git a/src/mod/formats/mod_sndfile/mod_sndfile.c b/src/mod/formats/mod_sndfile/mod_sndfile.c index 6043115555..5d8d0865b5 100644 --- a/src/mod/formats/mod_sndfile/mod_sndfile.c +++ b/src/mod/formats/mod_sndfile/mod_sndfile.c @@ -434,7 +434,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_sndfile_load) { switch_file_interface_t *file_interface; - switch_core_hash_init(&globals.format_hash, pool); + switch_core_hash_init(&globals.format_hash); if (setup_formats() != SWITCH_STATUS_SUCCESS) { return SWITCH_STATUS_FALSE; diff --git a/src/mod/formats/mod_ssml/Makefile b/src/mod/formats/mod_ssml/Makefile deleted file mode 100644 index c18e12fd76..0000000000 --- a/src/mod/formats/mod_ssml/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -BASE=../../../.. - -IKS_DIR=$(BASE)/libs/iksemel -IKS_LA=$(IKS_DIR)/src/libiksemel.la -LOCAL_CFLAGS += -I$(BASE)/libs/iksemel/include -LOCAL_OBJS= $(IKS_LA) -include $(BASE)/build/modmake.rules - -$(IKS_LA): $(IKS_DIR) $(IKS_DIR)/.update - @cd $(IKS_DIR) && $(MAKE) - @$(TOUCH_TARGET) diff --git a/src/mod/formats/mod_ssml/Makefile.am b/src/mod/formats/mod_ssml/Makefile.am new file mode 100644 index 0000000000..ad91a27f29 --- /dev/null +++ b/src/mod/formats/mod_ssml/Makefile.am @@ -0,0 +1,18 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_ssml + +IKS_DIR=$(switch_srcdir)/libs/iksemel +IKS_BUILDDIR=$(switch_builddir)/libs/iksemel +IKS_LA=$(IKS_BUILDDIR)/src/libiksemel.la + +mod_LTLIBRARIES = mod_ssml.la +mod_ssml_la_SOURCES = mod_ssml.c +mod_ssml_la_CFLAGS = $(AM_CFLAGS) -I$(IKS_DIR)/include +mod_ssml_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(IKS_LA) +mod_ssml_la_LDFLAGS = -avoid-version -module -no-undefined -shared + +BUILT_SOURCES=$(IKS_LA) + +$(IKS_LA): $(IKS_DIR) $(IKS_DIR)/.update + @cd $(IKS_DIR) && $(MAKE) + @$(TOUCH_TARGET) diff --git a/src/mod/formats/mod_ssml/mod_ssml.c b/src/mod/formats/mod_ssml/mod_ssml.c index ae2670a74c..eb227cbad4 100644 --- a/src/mod/formats/mod_ssml/mod_ssml.c +++ b/src/mod/formats/mod_ssml/mod_ssml.c @@ -198,7 +198,7 @@ struct ssml_context { static struct tag_def *add_tag_def(const char *tag, tag_attribs_fn attribs_fn, tag_cdata_fn cdata_fn, const char *children_tags) { struct tag_def *def = switch_core_alloc(globals.pool, sizeof(*def)); - switch_core_hash_init(&def->children_tags, globals.pool); + switch_core_hash_init(&def->children_tags); if (!zstr(children_tags)) { char *children_tags_dup = switch_core_strdup(globals.pool, children_tags); char *tags[32] = { 0 }; @@ -339,12 +339,12 @@ static struct voice *find_voice(struct ssml_node *cur_node, switch_hash_t *map, } /* find best language, name, gender match */ - for (hi = switch_hash_first(NULL, map); hi; hi = switch_hash_next(hi)) { + for (hi = switch_core_hash_first( map); hi; hi = switch_core_hash_next(hi)) { const void *key; void *val; struct voice *candidate; int candidate_score = 0; - switch_hash_this(hi, &key, NULL, &val); + switch_core_hash_this(hi, &key, NULL, &val); candidate = (struct voice *)val; candidate_score = score_voice(candidate, cur_node, lang_required); if (candidate_score > 0 && candidate_score > best_score) { @@ -1110,12 +1110,12 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_ssml_load) */ globals.pool = pool; - switch_core_hash_init(&globals.voice_cache, pool); - switch_core_hash_init(&globals.tts_voice_map, pool); - switch_core_hash_init(&globals.say_voice_map, pool); - switch_core_hash_init(&globals.interpret_as_map, pool); - switch_core_hash_init(&globals.language_map, pool); - switch_core_hash_init(&globals.tag_defs, pool); + switch_core_hash_init(&globals.voice_cache); + switch_core_hash_init(&globals.tts_voice_map); + switch_core_hash_init(&globals.say_voice_map); + switch_core_hash_init(&globals.interpret_as_map); + switch_core_hash_init(&globals.language_map); + switch_core_hash_init(&globals.tag_defs); add_root_tag_def("speak", process_xml_lang, process_cdata_tts, "audio,break,emphasis,mark,phoneme,prosody,say-as,voice,sub,p,s,lexicon,metadata,meta"); add_tag_def("p", process_xml_lang, process_cdata_tts, "audio,break,emphasis,mark,phoneme,prosody,say-as,voice,sub,s"); diff --git a/src/mod/formats/mod_tone_stream/Makefile.am b/src/mod/formats/mod_tone_stream/Makefile.am new file mode 100644 index 0000000000..217dd9fd0e --- /dev/null +++ b/src/mod/formats/mod_tone_stream/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_tone_stream + +mod_LTLIBRARIES = mod_tone_stream.la +mod_tone_stream_la_SOURCES = mod_tone_stream.c +mod_tone_stream_la_CFLAGS = $(AM_CFLAGS) +mod_tone_stream_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_tone_stream_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/formats/mod_vlc/Makefile b/src/mod/formats/mod_vlc/Makefile deleted file mode 100644 index a41d9b3109..0000000000 --- a/src/mod/formats/mod_vlc/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -BASE=../../../.. -include $(BASE)/build/modmake.rules - -LOCAL_LDFLAGS= -lvlc diff --git a/src/mod/formats/mod_vlc/Makefile.am b/src/mod/formats/mod_vlc/Makefile.am new file mode 100644 index 0000000000..65720ab2db --- /dev/null +++ b/src/mod/formats/mod_vlc/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_vlc + +mod_LTLIBRARIES = mod_vlc.la +mod_vlc_la_SOURCES = mod_vlc.c +mod_vlc_la_CFLAGS = $(AM_CFLAGS) +mod_vlc_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_vlc_la_LDFLAGS = -avoid-version -module -no-undefined -shared -lvlc diff --git a/src/mod/languages/mod_java/Makefile.in b/src/mod/languages/mod_java/Makefile.am similarity index 57% rename from src/mod/languages/mod_java/Makefile.in rename to src/mod/languages/mod_java/Makefile.am index 4a1c173682..34ac2923e6 100644 --- a/src/mod/languages/mod_java/Makefile.in +++ b/src/mod/languages/mod_java/Makefile.am @@ -1,22 +1,25 @@ -# define these targets in your makefile if you wish -# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_java -# and define these variables to impact your build +mod_LTLIBRARIES = mod_java.la +mod_java_la_SOURCES = mod_java.cpp freeswitch_java.cpp switch_swig_wrap.cpp modjava.c +mod_java_la_CFLAGS = $(AM_CFLAGS) +mod_java_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_java_la_LDFLAGS = -avoid-version -module -no-undefined -shared -JAVA_FLAGS=@JAVA_FLAGS@ # Without -fno-strict-aliasing, g++ generates invalid code for Java_org_freeswitch_freeswitchJNI_SWIGJavaSessionUpcast, which segfaults -LOCAL_CFLAGS=$(JAVA_FLAGS) -fno-strict-aliasing -I/usr/lib/jvm/java-gcj/include -I/usr/lib/jvm/java-gcj/include/linux -LOCAL_OBJS=freeswitch_java.o switch_swig_wrap.o modjava.o +mod_java_la_CFLAGS += $(JAVA_FLAGS) -fno-strict-aliasing -I/usr/lib/jvm/java-gcj/include -I/usr/lib/jvm/java-gcj/include/linux + CLASSES=src/org/freeswitch/Launcher.java \ src/org/freeswitch/HangupHook.java \ src/org/freeswitch/DTMFCallback.java \ src/org/freeswitch/FreeswitchScript.java \ src/org/freeswitch/Event.java \ src/org/freeswitch/swig/* -include ../../../../build/modmake.rules +BUILT_SOURCES=classes -local_depend: +classes: mkdir -p classes javac -sourcepath src -d classes $(CLASSES) jar cf freeswitch.jar -C classes org @@ -25,6 +28,6 @@ reswig: rm -f switch_swig_wrap.cpp swig -java -c++ -I../../../include -package org.freeswitch.swig -outdir src/org/freeswitch/swig -o switch_swig_wrap.cpp mod_java.i -local_install: +install: cp freeswitch.jar $(DESTDIR)@scriptdir@ diff --git a/src/mod/languages/mod_managed/Makefile b/src/mod/languages/mod_managed/Makefile.am similarity index 59% rename from src/mod/languages/mod_managed/Makefile rename to src/mod/languages/mod_managed/Makefile.am index 4a34afbc8f..2880f4037b 100644 --- a/src/mod/languages/mod_managed/Makefile +++ b/src/mod/languages/mod_managed/Makefile.am @@ -1,43 +1,41 @@ -LOCAL_INSERT_CFLAGS= /usr/bin/pkg-config mono-2 --cflags -LOCAL_INSERT_LDFLAGS= /usr/bin/pkg-config mono-2 --libs -#MOD_CFLAGS=-D_REENTRANT -pthread -I/usr/lib/mono -lmono -BASE=../../../.. -VERBOSE=1 -include $(BASE)/build/modmake.rules -LOCAL_OBJS=freeswitch_managed.o freeswitch_wrap.o - -local_depend: $(LOCAL_OBJS) - -freeswitch_managed.o: freeswitch_managed.h freeswitch_managed.cpp - -freeswitch_wrap.o: freeswitch_wrap.cpp - -freeswitch_wrap.cpp: freeswitch_wrap.cxx - cp freeswitch_wrap.cxx freeswitch_wrap.cpp - -reswig: swigclean freeswitch_wrap.cxx - -local_depend: - cd managed && $(MAKE) - -local_install: $(DESTDIR)$(modulesdir)/mod_managed.$(LIBTOOL_LIB_EXTEN) - cd managed && $(MAKE) INSTALL="$(LTINSTALL)" MODINSTDIR=$(modulesdir) DESTDIR=$(DESTDIR) install - -local_uninstall: - rm -fr $(DESTDIR)$(modulesdir)/mod_managed.so - cd managed && $(MAKE) UNINSTALL="$(LTUNINSTALL)" MODINSTDIR=$(modulesdir) uninstall - -local_clean: - cd managed && $(MAKE) clean - -swigclean: clean - rm -f freeswitch_wrap.cxx freeswitch_wrap.cpp managed/swig.cs - -freeswitch_wrap.cxx: - swig2.0 -I../../../include -v -O -c++ -csharp -namespace FreeSWITCH.Native -dllimport mod_managed -DSWIG_CSHARP_NO_STRING_HELPER freeswitch.i - rm -f ./managed/swig.cs - cat *.cs > ./managed/swig.cs - rm -f *.cs - -depend_install: - mkdir -p $(DESTDIR)$(modulesdir)/managed +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_managed + +mod_LTLIBRARIES = mod_managed.la +mod_managed_la_SOURCES = mod_managed.cpp freeswitch_managed.cpp freeswitch_wrap.cpp +mod_managed_la_CFLAGS = $(AM_CFLAGS) +mod_managed_la_CPPFLAGS = `/usr/bin/pkg-config mono-2 --cflags` -I$(switch_srcdir)/libs/stfu/ -I$(switch_srcdir)/libs/libteletone/src/ +mod_managed_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_managed_la_LDFLAGS = -avoid-version -module -no-undefined -shared `/usr/bin/pkg-config mono-2 --libs` + +freeswitch_managed.o: freeswitch_managed.h freeswitch_managed.cpp + +freeswitch_wrap.o: freeswitch_wrap.cpp + +freeswitch_wrap.cpp: freeswitch_wrap.cxx + cp freeswitch_wrap.cxx freeswitch_wrap.cpp + +reswig: swigclean freeswitch_wrap.cxx + +local_depend: + cd managed && $(MAKE) + +install: $(DESTDIR)$(modulesdir)/mod_managed.$(LIBTOOL_LIB_EXTEN) + mkdir -p $(DESTDIR)$(modulesdir)/managed + cd managed && $(MAKE) INSTALL="$(LTINSTALL)" MODINSTDIR=$(modulesdir) DESTDIR=$(DESTDIR) install + +uninstall: + rm -fr $(DESTDIR)$(modulesdir)/mod_managed.so + cd managed && $(MAKE) UNINSTALL="$(LTUNINSTALL)" MODINSTDIR=$(modulesdir) uninstall + +clean: + cd managed && $(MAKE) clean + +swigclean: clean + rm -f freeswitch_wrap.cxx freeswitch_wrap.cpp managed/swig.cs + +freeswitch_wrap.cxx: + swig2.0 -I../../../include -v -O -c++ -csharp -namespace FreeSWITCH.Native -dllimport mod_managed -DSWIG_CSHARP_NO_STRING_HELPER freeswitch.i + rm -f ./managed/swig.cs + cat *.cs > ./managed/swig.cs + rm -f *.cs diff --git a/src/mod/languages/mod_managed/freeswitch_wrap.2010.cxx b/src/mod/languages/mod_managed/freeswitch_wrap.2010.cxx index ec672e735f..3e7e34b85a 100644 --- a/src/mod/languages/mod_managed/freeswitch_wrap.2010.cxx +++ b/src/mod/languages/mod_managed/freeswitch_wrap.2010.cxx @@ -5644,6 +5644,592 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_loadable_module_function_table_ } +SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_type_set(void * jarg1, int jarg2) { + payload_map_t *arg1 = (payload_map_t *) 0 ; + switch_media_type_t arg2 ; + + arg1 = (payload_map_t *)jarg1; + arg2 = (switch_media_type_t)jarg2; + if (arg1) (arg1)->type = arg2; +} + + +SWIGEXPORT int SWIGSTDCALL CSharp_payload_map_t_type_get(void * jarg1) { + int jresult ; + payload_map_t *arg1 = (payload_map_t *) 0 ; + switch_media_type_t result; + + arg1 = (payload_map_t *)jarg1; + result = (switch_media_type_t) ((arg1)->type); + jresult = result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_sdp_type_set(void * jarg1, int jarg2) { + payload_map_t *arg1 = (payload_map_t *) 0 ; + switch_sdp_type_t arg2 ; + + arg1 = (payload_map_t *)jarg1; + arg2 = (switch_sdp_type_t)jarg2; + if (arg1) (arg1)->sdp_type = arg2; +} + + +SWIGEXPORT int SWIGSTDCALL CSharp_payload_map_t_sdp_type_get(void * jarg1) { + int jresult ; + payload_map_t *arg1 = (payload_map_t *) 0 ; + switch_sdp_type_t result; + + arg1 = (payload_map_t *)jarg1; + result = (switch_sdp_type_t) ((arg1)->sdp_type); + jresult = result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_ptime_set(void * jarg1, unsigned long jarg2) { + payload_map_t *arg1 = (payload_map_t *) 0 ; + uint32_t arg2 ; + + arg1 = (payload_map_t *)jarg1; + arg2 = (uint32_t)jarg2; + if (arg1) (arg1)->ptime = arg2; +} + + +SWIGEXPORT unsigned long SWIGSTDCALL CSharp_payload_map_t_ptime_get(void * jarg1) { + unsigned long jresult ; + payload_map_t *arg1 = (payload_map_t *) 0 ; + uint32_t result; + + arg1 = (payload_map_t *)jarg1; + result = (uint32_t) ((arg1)->ptime); + jresult = (unsigned long)result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_rate_set(void * jarg1, unsigned long jarg2) { + payload_map_t *arg1 = (payload_map_t *) 0 ; + uint32_t arg2 ; + + arg1 = (payload_map_t *)jarg1; + arg2 = (uint32_t)jarg2; + if (arg1) (arg1)->rate = arg2; +} + + +SWIGEXPORT unsigned long SWIGSTDCALL CSharp_payload_map_t_rate_get(void * jarg1) { + unsigned long jresult ; + payload_map_t *arg1 = (payload_map_t *) 0 ; + uint32_t result; + + arg1 = (payload_map_t *)jarg1; + result = (uint32_t) ((arg1)->rate); + jresult = (unsigned long)result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_allocated_set(void * jarg1, unsigned char jarg2) { + payload_map_t *arg1 = (payload_map_t *) 0 ; + uint8_t arg2 ; + + arg1 = (payload_map_t *)jarg1; + arg2 = (uint8_t)jarg2; + if (arg1) (arg1)->allocated = arg2; +} + + +SWIGEXPORT unsigned char SWIGSTDCALL CSharp_payload_map_t_allocated_get(void * jarg1) { + unsigned char jresult ; + payload_map_t *arg1 = (payload_map_t *) 0 ; + uint8_t result; + + arg1 = (payload_map_t *)jarg1; + result = (uint8_t) ((arg1)->allocated); + jresult = result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_negotiated_set(void * jarg1, unsigned char jarg2) { + payload_map_t *arg1 = (payload_map_t *) 0 ; + uint8_t arg2 ; + + arg1 = (payload_map_t *)jarg1; + arg2 = (uint8_t)jarg2; + if (arg1) (arg1)->negotiated = arg2; +} + + +SWIGEXPORT unsigned char SWIGSTDCALL CSharp_payload_map_t_negotiated_get(void * jarg1) { + unsigned char jresult ; + payload_map_t *arg1 = (payload_map_t *) 0 ; + uint8_t result; + + arg1 = (payload_map_t *)jarg1; + result = (uint8_t) ((arg1)->negotiated); + jresult = result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_current_set(void * jarg1, unsigned char jarg2) { + payload_map_t *arg1 = (payload_map_t *) 0 ; + uint8_t arg2 ; + + arg1 = (payload_map_t *)jarg1; + arg2 = (uint8_t)jarg2; + if (arg1) (arg1)->current = arg2; +} + + +SWIGEXPORT unsigned char SWIGSTDCALL CSharp_payload_map_t_current_get(void * jarg1) { + unsigned char jresult ; + payload_map_t *arg1 = (payload_map_t *) 0 ; + uint8_t result; + + arg1 = (payload_map_t *)jarg1; + result = (uint8_t) ((arg1)->current); + jresult = result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_hash_set(void * jarg1, unsigned long jarg2) { + payload_map_t *arg1 = (payload_map_t *) 0 ; + unsigned long arg2 ; + + arg1 = (payload_map_t *)jarg1; + arg2 = (unsigned long)jarg2; + if (arg1) (arg1)->hash = arg2; +} + + +SWIGEXPORT unsigned long SWIGSTDCALL CSharp_payload_map_t_hash_get(void * jarg1) { + unsigned long jresult ; + payload_map_t *arg1 = (payload_map_t *) 0 ; + unsigned long result; + + arg1 = (payload_map_t *)jarg1; + result = (unsigned long) ((arg1)->hash); + jresult = (unsigned long)result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_rm_encoding_set(void * jarg1, char * jarg2) { + payload_map_t *arg1 = (payload_map_t *) 0 ; + char *arg2 = (char *) 0 ; + + arg1 = (payload_map_t *)jarg1; + arg2 = (char *)jarg2; + { + if (arg1->rm_encoding) delete [] arg1->rm_encoding; + if (arg2) { + arg1->rm_encoding = (char *) (new char[strlen((const char *)arg2)+1]); + strcpy((char *)arg1->rm_encoding, (const char *)arg2); + } else { + arg1->rm_encoding = 0; + } + } +} + + +SWIGEXPORT char * SWIGSTDCALL CSharp_payload_map_t_rm_encoding_get(void * jarg1) { + char * jresult ; + payload_map_t *arg1 = (payload_map_t *) 0 ; + char *result = 0 ; + + arg1 = (payload_map_t *)jarg1; + result = (char *) ((arg1)->rm_encoding); + jresult = SWIG_csharp_string_callback((const char *)result); + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_iananame_set(void * jarg1, char * jarg2) { + payload_map_t *arg1 = (payload_map_t *) 0 ; + char *arg2 = (char *) 0 ; + + arg1 = (payload_map_t *)jarg1; + arg2 = (char *)jarg2; + { + if (arg1->iananame) delete [] arg1->iananame; + if (arg2) { + arg1->iananame = (char *) (new char[strlen((const char *)arg2)+1]); + strcpy((char *)arg1->iananame, (const char *)arg2); + } else { + arg1->iananame = 0; + } + } +} + + +SWIGEXPORT char * SWIGSTDCALL CSharp_payload_map_t_iananame_get(void * jarg1) { + char * jresult ; + payload_map_t *arg1 = (payload_map_t *) 0 ; + char *result = 0 ; + + arg1 = (payload_map_t *)jarg1; + result = (char *) ((arg1)->iananame); + jresult = SWIG_csharp_string_callback((const char *)result); + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_pt_set(void * jarg1, unsigned char jarg2) { + payload_map_t *arg1 = (payload_map_t *) 0 ; + switch_payload_t arg2 ; + + arg1 = (payload_map_t *)jarg1; + arg2 = (switch_payload_t)jarg2; + if (arg1) (arg1)->pt = arg2; +} + + +SWIGEXPORT unsigned char SWIGSTDCALL CSharp_payload_map_t_pt_get(void * jarg1) { + unsigned char jresult ; + payload_map_t *arg1 = (payload_map_t *) 0 ; + switch_payload_t result; + + arg1 = (payload_map_t *)jarg1; + result = (switch_payload_t) ((arg1)->pt); + jresult = result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_rm_rate_set(void * jarg1, unsigned long jarg2) { + payload_map_t *arg1 = (payload_map_t *) 0 ; + unsigned long arg2 ; + + arg1 = (payload_map_t *)jarg1; + arg2 = (unsigned long)jarg2; + if (arg1) (arg1)->rm_rate = arg2; +} + + +SWIGEXPORT unsigned long SWIGSTDCALL CSharp_payload_map_t_rm_rate_get(void * jarg1) { + unsigned long jresult ; + payload_map_t *arg1 = (payload_map_t *) 0 ; + unsigned long result; + + arg1 = (payload_map_t *)jarg1; + result = (unsigned long) ((arg1)->rm_rate); + jresult = (unsigned long)result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_adv_rm_rate_set(void * jarg1, unsigned long jarg2) { + payload_map_t *arg1 = (payload_map_t *) 0 ; + unsigned long arg2 ; + + arg1 = (payload_map_t *)jarg1; + arg2 = (unsigned long)jarg2; + if (arg1) (arg1)->adv_rm_rate = arg2; +} + + +SWIGEXPORT unsigned long SWIGSTDCALL CSharp_payload_map_t_adv_rm_rate_get(void * jarg1) { + unsigned long jresult ; + payload_map_t *arg1 = (payload_map_t *) 0 ; + unsigned long result; + + arg1 = (payload_map_t *)jarg1; + result = (unsigned long) ((arg1)->adv_rm_rate); + jresult = (unsigned long)result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_codec_ms_set(void * jarg1, unsigned long jarg2) { + payload_map_t *arg1 = (payload_map_t *) 0 ; + uint32_t arg2 ; + + arg1 = (payload_map_t *)jarg1; + arg2 = (uint32_t)jarg2; + if (arg1) (arg1)->codec_ms = arg2; +} + + +SWIGEXPORT unsigned long SWIGSTDCALL CSharp_payload_map_t_codec_ms_get(void * jarg1) { + unsigned long jresult ; + payload_map_t *arg1 = (payload_map_t *) 0 ; + uint32_t result; + + arg1 = (payload_map_t *)jarg1; + result = (uint32_t) ((arg1)->codec_ms); + jresult = (unsigned long)result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_bitrate_set(void * jarg1, unsigned long jarg2) { + payload_map_t *arg1 = (payload_map_t *) 0 ; + uint32_t arg2 ; + + arg1 = (payload_map_t *)jarg1; + arg2 = (uint32_t)jarg2; + if (arg1) (arg1)->bitrate = arg2; +} + + +SWIGEXPORT unsigned long SWIGSTDCALL CSharp_payload_map_t_bitrate_get(void * jarg1) { + unsigned long jresult ; + payload_map_t *arg1 = (payload_map_t *) 0 ; + uint32_t result; + + arg1 = (payload_map_t *)jarg1; + result = (uint32_t) ((arg1)->bitrate); + jresult = (unsigned long)result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_rm_fmtp_set(void * jarg1, char * jarg2) { + payload_map_t *arg1 = (payload_map_t *) 0 ; + char *arg2 = (char *) 0 ; + + arg1 = (payload_map_t *)jarg1; + arg2 = (char *)jarg2; + { + if (arg1->rm_fmtp) delete [] arg1->rm_fmtp; + if (arg2) { + arg1->rm_fmtp = (char *) (new char[strlen((const char *)arg2)+1]); + strcpy((char *)arg1->rm_fmtp, (const char *)arg2); + } else { + arg1->rm_fmtp = 0; + } + } +} + + +SWIGEXPORT char * SWIGSTDCALL CSharp_payload_map_t_rm_fmtp_get(void * jarg1) { + char * jresult ; + payload_map_t *arg1 = (payload_map_t *) 0 ; + char *result = 0 ; + + arg1 = (payload_map_t *)jarg1; + result = (char *) ((arg1)->rm_fmtp); + jresult = SWIG_csharp_string_callback((const char *)result); + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_agreed_pt_set(void * jarg1, unsigned char jarg2) { + payload_map_t *arg1 = (payload_map_t *) 0 ; + switch_payload_t arg2 ; + + arg1 = (payload_map_t *)jarg1; + arg2 = (switch_payload_t)jarg2; + if (arg1) (arg1)->agreed_pt = arg2; +} + + +SWIGEXPORT unsigned char SWIGSTDCALL CSharp_payload_map_t_agreed_pt_get(void * jarg1) { + unsigned char jresult ; + payload_map_t *arg1 = (payload_map_t *) 0 ; + switch_payload_t result; + + arg1 = (payload_map_t *)jarg1; + result = (switch_payload_t) ((arg1)->agreed_pt); + jresult = result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_recv_pt_set(void * jarg1, unsigned char jarg2) { + payload_map_t *arg1 = (payload_map_t *) 0 ; + switch_payload_t arg2 ; + + arg1 = (payload_map_t *)jarg1; + arg2 = (switch_payload_t)jarg2; + if (arg1) (arg1)->recv_pt = arg2; +} + + +SWIGEXPORT unsigned char SWIGSTDCALL CSharp_payload_map_t_recv_pt_get(void * jarg1) { + unsigned char jresult ; + payload_map_t *arg1 = (payload_map_t *) 0 ; + switch_payload_t result; + + arg1 = (payload_map_t *)jarg1; + result = (switch_payload_t) ((arg1)->recv_pt); + jresult = result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_fmtp_out_set(void * jarg1, char * jarg2) { + payload_map_t *arg1 = (payload_map_t *) 0 ; + char *arg2 = (char *) 0 ; + + arg1 = (payload_map_t *)jarg1; + arg2 = (char *)jarg2; + { + if (arg1->fmtp_out) delete [] arg1->fmtp_out; + if (arg2) { + arg1->fmtp_out = (char *) (new char[strlen((const char *)arg2)+1]); + strcpy((char *)arg1->fmtp_out, (const char *)arg2); + } else { + arg1->fmtp_out = 0; + } + } +} + + +SWIGEXPORT char * SWIGSTDCALL CSharp_payload_map_t_fmtp_out_get(void * jarg1) { + char * jresult ; + payload_map_t *arg1 = (payload_map_t *) 0 ; + char *result = 0 ; + + arg1 = (payload_map_t *)jarg1; + result = (char *) ((arg1)->fmtp_out); + jresult = SWIG_csharp_string_callback((const char *)result); + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_remote_sdp_ip_set(void * jarg1, char * jarg2) { + payload_map_t *arg1 = (payload_map_t *) 0 ; + char *arg2 = (char *) 0 ; + + arg1 = (payload_map_t *)jarg1; + arg2 = (char *)jarg2; + { + if (arg1->remote_sdp_ip) delete [] arg1->remote_sdp_ip; + if (arg2) { + arg1->remote_sdp_ip = (char *) (new char[strlen((const char *)arg2)+1]); + strcpy((char *)arg1->remote_sdp_ip, (const char *)arg2); + } else { + arg1->remote_sdp_ip = 0; + } + } +} + + +SWIGEXPORT char * SWIGSTDCALL CSharp_payload_map_t_remote_sdp_ip_get(void * jarg1) { + char * jresult ; + payload_map_t *arg1 = (payload_map_t *) 0 ; + char *result = 0 ; + + arg1 = (payload_map_t *)jarg1; + result = (char *) ((arg1)->remote_sdp_ip); + jresult = SWIG_csharp_string_callback((const char *)result); + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_remote_sdp_port_set(void * jarg1, unsigned short jarg2) { + payload_map_t *arg1 = (payload_map_t *) 0 ; + switch_port_t arg2 ; + + arg1 = (payload_map_t *)jarg1; + arg2 = (switch_port_t)jarg2; + if (arg1) (arg1)->remote_sdp_port = arg2; +} + + +SWIGEXPORT unsigned short SWIGSTDCALL CSharp_payload_map_t_remote_sdp_port_get(void * jarg1) { + unsigned short jresult ; + payload_map_t *arg1 = (payload_map_t *) 0 ; + switch_port_t result; + + arg1 = (payload_map_t *)jarg1; + result = (switch_port_t) ((arg1)->remote_sdp_port); + jresult = result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_channels_set(void * jarg1, int jarg2) { + payload_map_t *arg1 = (payload_map_t *) 0 ; + int arg2 ; + + arg1 = (payload_map_t *)jarg1; + arg2 = (int)jarg2; + if (arg1) (arg1)->channels = arg2; +} + + +SWIGEXPORT int SWIGSTDCALL CSharp_payload_map_t_channels_get(void * jarg1) { + int jresult ; + payload_map_t *arg1 = (payload_map_t *) 0 ; + int result; + + arg1 = (payload_map_t *)jarg1; + result = (int) ((arg1)->channels); + jresult = result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_adv_channels_set(void * jarg1, int jarg2) { + payload_map_t *arg1 = (payload_map_t *) 0 ; + int arg2 ; + + arg1 = (payload_map_t *)jarg1; + arg2 = (int)jarg2; + if (arg1) (arg1)->adv_channels = arg2; +} + + +SWIGEXPORT int SWIGSTDCALL CSharp_payload_map_t_adv_channels_get(void * jarg1) { + int jresult ; + payload_map_t *arg1 = (payload_map_t *) 0 ; + int result; + + arg1 = (payload_map_t *)jarg1; + result = (int) ((arg1)->adv_channels); + jresult = result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_next_set(void * jarg1, void * jarg2) { + payload_map_t *arg1 = (payload_map_t *) 0 ; + payload_map_s *arg2 = (payload_map_s *) 0 ; + + arg1 = (payload_map_t *)jarg1; + arg2 = (payload_map_s *)jarg2; + if (arg1) (arg1)->next = arg2; +} + + +SWIGEXPORT void * SWIGSTDCALL CSharp_payload_map_t_next_get(void * jarg1) { + void * jresult ; + payload_map_t *arg1 = (payload_map_t *) 0 ; + payload_map_s *result = 0 ; + + arg1 = (payload_map_t *)jarg1; + result = (payload_map_s *) ((arg1)->next); + jresult = (void *)result; + return jresult; +} + + +SWIGEXPORT void * SWIGSTDCALL CSharp_new_payload_map_t() { + void * jresult ; + payload_map_t *result = 0 ; + + result = (payload_map_t *)new payload_map_t(); + jresult = (void *)result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_delete_payload_map_t(void * jarg1) { + payload_map_t *arg1 = (payload_map_t *) 0 ; + + arg1 = (payload_map_t *)jarg1; + delete arg1; +} + + SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_db_close(void * jarg1) { int jresult ; switch_core_db_t *arg1 = (switch_core_db_t *) 0 ; @@ -11324,17 +11910,15 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_recv_dtmf(void * jarg1, vo } -SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_hash_init_case(void * jarg1, void * jarg2, int jarg3) { +SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_hash_init_case(void * jarg1, int jarg2) { int jresult ; switch_hash_t **arg1 = (switch_hash_t **) 0 ; - switch_memory_pool_t *arg2 = (switch_memory_pool_t *) 0 ; - switch_bool_t arg3 ; + switch_bool_t arg2 ; switch_status_t result; arg1 = (switch_hash_t **)jarg1; - arg2 = (switch_memory_pool_t *)jarg2; - arg3 = (switch_bool_t)jarg3; - result = (switch_status_t)switch_core_hash_init_case(arg1,arg2,arg3); + arg2 = (switch_bool_t)jarg2; + result = (switch_status_t)switch_core_hash_init_case(arg1,arg2); jresult = result; return jresult; } @@ -11550,46 +12134,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_hash_this(void * jarg1, void * ja } -SWIGEXPORT void * SWIGSTDCALL CSharp_switch_hash_first(char * jarg1, void * jarg2) { - void * jresult ; - char *arg1 = (char *) 0 ; - switch_hash_t *arg2 = (switch_hash_t *) 0 ; - switch_hash_index_t *result = 0 ; - - arg1 = (char *)jarg1; - arg2 = (switch_hash_t *)jarg2; - result = (switch_hash_index_t *)switch_hash_first(arg1,arg2); - jresult = (void *)result; - return jresult; -} - - -SWIGEXPORT void * SWIGSTDCALL CSharp_switch_hash_next(void * jarg1) { - void * jresult ; - switch_hash_index_t *arg1 = (switch_hash_index_t *) 0 ; - switch_hash_index_t *result = 0 ; - - arg1 = (switch_hash_index_t *)jarg1; - result = (switch_hash_index_t *)switch_hash_next(arg1); - jresult = (void *)result; - return jresult; -} - - -SWIGEXPORT void SWIGSTDCALL CSharp_switch_hash_this(void * jarg1, void * jarg2, void * jarg3, void * jarg4) { - switch_hash_index_t *arg1 = (switch_hash_index_t *) 0 ; - void **arg2 = (void **) 0 ; - switch_ssize_t *arg3 = (switch_ssize_t *) 0 ; - void **arg4 = (void **) 0 ; - - arg1 = (switch_hash_index_t *)jarg1; - arg2 = (void **)jarg2; - arg3 = (switch_ssize_t *)jarg3; - arg4 = (void **)jarg4; - switch_hash_this(arg1,(void const **)arg2,arg3,arg4); -} - - SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_timer_init(void * jarg1, char * jarg2, int jarg3, int jarg4, void * jarg5) { int jresult ; switch_timer_t *arg1 = (switch_timer_t *) 0 ; @@ -30339,6 +30883,14 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_channel_api_on(void * jarg1, char * jar } +SWIGEXPORT void SWIGSTDCALL CSharp_switch_channel_process_device_hangup(void * jarg1) { + switch_channel_t *arg1 = (switch_channel_t *) 0 ; + + arg1 = (switch_channel_t *)jarg1; + switch_channel_process_device_hangup(arg1); +} + + SWIGEXPORT void * SWIGSTDCALL CSharp_switch_channel_get_queued_extension(void * jarg1) { void * jresult ; switch_channel_t *arg1 = (switch_channel_t *) 0 ; @@ -35772,26 +36324,6 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_RTP_MAX_CRYPTO_LEN_get() { } -SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_RTP_KEY_LEN_get() { - int jresult ; - int result; - - result = (int)(30); - jresult = result; - return jresult; -} - - -SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_RTP_CRYPTO_KEY_32_get() { - char * jresult ; - char *result = 0 ; - - result = (char *)("AES_CM_128_HMAC_SHA1_32"); - jresult = SWIG_csharp_string_callback((const char *)result); - return jresult; -} - - SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_RTP_CRYPTO_KEY_80_get() { char * jresult ; char *result = 0 ; @@ -35802,6 +36334,98 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_RTP_CRYPTO_KEY_80_get() { } +SWIGEXPORT void SWIGSTDCALL CSharp_switch_srtp_crypto_suite_t_name_set(void * jarg1, char * jarg2) { + switch_srtp_crypto_suite_t *arg1 = (switch_srtp_crypto_suite_t *) 0 ; + char *arg2 = (char *) 0 ; + + arg1 = (switch_srtp_crypto_suite_t *)jarg1; + arg2 = (char *)jarg2; + { + if (arg1->name) delete [] arg1->name; + if (arg2) { + arg1->name = (char *) (new char[strlen((const char *)arg2)+1]); + strcpy((char *)arg1->name, (const char *)arg2); + } else { + arg1->name = 0; + } + } +} + + +SWIGEXPORT char * SWIGSTDCALL CSharp_switch_srtp_crypto_suite_t_name_get(void * jarg1) { + char * jresult ; + switch_srtp_crypto_suite_t *arg1 = (switch_srtp_crypto_suite_t *) 0 ; + char *result = 0 ; + + arg1 = (switch_srtp_crypto_suite_t *)jarg1; + result = (char *) ((arg1)->name); + jresult = SWIG_csharp_string_callback((const char *)result); + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_switch_srtp_crypto_suite_t_type_set(void * jarg1, int jarg2) { + switch_srtp_crypto_suite_t *arg1 = (switch_srtp_crypto_suite_t *) 0 ; + switch_rtp_crypto_key_type_t arg2 ; + + arg1 = (switch_srtp_crypto_suite_t *)jarg1; + arg2 = (switch_rtp_crypto_key_type_t)jarg2; + if (arg1) (arg1)->type = arg2; +} + + +SWIGEXPORT int SWIGSTDCALL CSharp_switch_srtp_crypto_suite_t_type_get(void * jarg1) { + int jresult ; + switch_srtp_crypto_suite_t *arg1 = (switch_srtp_crypto_suite_t *) 0 ; + switch_rtp_crypto_key_type_t result; + + arg1 = (switch_srtp_crypto_suite_t *)jarg1; + result = (switch_rtp_crypto_key_type_t) ((arg1)->type); + jresult = result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_switch_srtp_crypto_suite_t_keylen_set(void * jarg1, int jarg2) { + switch_srtp_crypto_suite_t *arg1 = (switch_srtp_crypto_suite_t *) 0 ; + int arg2 ; + + arg1 = (switch_srtp_crypto_suite_t *)jarg1; + arg2 = (int)jarg2; + if (arg1) (arg1)->keylen = arg2; +} + + +SWIGEXPORT int SWIGSTDCALL CSharp_switch_srtp_crypto_suite_t_keylen_get(void * jarg1) { + int jresult ; + switch_srtp_crypto_suite_t *arg1 = (switch_srtp_crypto_suite_t *) 0 ; + int result; + + arg1 = (switch_srtp_crypto_suite_t *)jarg1; + result = (int) ((arg1)->keylen); + jresult = result; + return jresult; +} + + +SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_srtp_crypto_suite_t() { + void * jresult ; + switch_srtp_crypto_suite_t *result = 0 ; + + result = (switch_srtp_crypto_suite_t *)new switch_srtp_crypto_suite_t(); + jresult = (void *)result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_srtp_crypto_suite_t(void * jarg1) { + switch_srtp_crypto_suite_t *arg1 = (switch_srtp_crypto_suite_t *) 0 ; + + arg1 = (switch_srtp_crypto_suite_t *)jarg1; + delete arg1; +} + + SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_crypto_key_index_set(void * jarg1, unsigned long jarg2) { switch_rtp_crypto_key *arg1 = (switch_rtp_crypto_key *) 0 ; uint32_t arg2 ; @@ -36799,7 +37423,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_destroy(void * jarg1) { } -SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_activate_ice(void * jarg1, char * jarg2, char * jarg3, char * jarg4, char * jarg5, int jarg6, void * jarg7, void * jarg8) { +SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_activate_ice(void * jarg1, char * jarg2, char * jarg3, char * jarg4, char * jarg5, int jarg6, int jarg7, void * jarg8) { int jresult ; switch_rtp_t *arg1 = (switch_rtp_t *) 0 ; char *arg2 = (char *) 0 ; @@ -36809,7 +37433,6 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_activate_ice(void * jarg1, char * j ice_proto_t arg6 ; switch_core_media_ice_type_t arg7 ; ice_t *arg8 = (ice_t *) 0 ; - switch_core_media_ice_type_t *argp7 ; switch_status_t result; arg1 = (switch_rtp_t *)jarg1; @@ -36818,12 +37441,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_activate_ice(void * jarg1, char * j arg4 = (char *)jarg4; arg5 = (char *)jarg5; arg6 = (ice_proto_t)jarg6; - argp7 = (switch_core_media_ice_type_t *)jarg7; - if (!argp7) { - SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_core_media_ice_type_t", 0); - return 0; - } - arg7 = *argp7; + arg7 = (switch_core_media_ice_type_t)jarg7; arg8 = (ice_t *)jarg8; result = (switch_status_t)switch_rtp_activate_ice(arg1,arg2,arg3,(char const *)arg4,(char const *)arg5,arg6,arg7,arg8); jresult = result; diff --git a/src/mod/languages/mod_managed/freeswitch_wrap.cxx b/src/mod/languages/mod_managed/freeswitch_wrap.cxx index af537fa7d9..30df93944b 100644 --- a/src/mod/languages/mod_managed/freeswitch_wrap.cxx +++ b/src/mod/languages/mod_managed/freeswitch_wrap.cxx @@ -5644,6 +5644,592 @@ SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_loadable_module_function_table_ } +SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_type_set(void * jarg1, int jarg2) { + payload_map_s *arg1 = (payload_map_s *) 0 ; + switch_media_type_t arg2 ; + + arg1 = (payload_map_s *)jarg1; + arg2 = (switch_media_type_t)jarg2; + if (arg1) (arg1)->type = arg2; +} + + +SWIGEXPORT int SWIGSTDCALL CSharp_payload_map_t_type_get(void * jarg1) { + int jresult ; + payload_map_s *arg1 = (payload_map_s *) 0 ; + switch_media_type_t result; + + arg1 = (payload_map_s *)jarg1; + result = (switch_media_type_t) ((arg1)->type); + jresult = result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_sdp_type_set(void * jarg1, int jarg2) { + payload_map_s *arg1 = (payload_map_s *) 0 ; + switch_sdp_type_t arg2 ; + + arg1 = (payload_map_s *)jarg1; + arg2 = (switch_sdp_type_t)jarg2; + if (arg1) (arg1)->sdp_type = arg2; +} + + +SWIGEXPORT int SWIGSTDCALL CSharp_payload_map_t_sdp_type_get(void * jarg1) { + int jresult ; + payload_map_s *arg1 = (payload_map_s *) 0 ; + switch_sdp_type_t result; + + arg1 = (payload_map_s *)jarg1; + result = (switch_sdp_type_t) ((arg1)->sdp_type); + jresult = result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_ptime_set(void * jarg1, unsigned long jarg2) { + payload_map_s *arg1 = (payload_map_s *) 0 ; + uint32_t arg2 ; + + arg1 = (payload_map_s *)jarg1; + arg2 = (uint32_t)jarg2; + if (arg1) (arg1)->ptime = arg2; +} + + +SWIGEXPORT unsigned long SWIGSTDCALL CSharp_payload_map_t_ptime_get(void * jarg1) { + unsigned long jresult ; + payload_map_s *arg1 = (payload_map_s *) 0 ; + uint32_t result; + + arg1 = (payload_map_s *)jarg1; + result = (uint32_t) ((arg1)->ptime); + jresult = (unsigned long)result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_rate_set(void * jarg1, unsigned long jarg2) { + payload_map_s *arg1 = (payload_map_s *) 0 ; + uint32_t arg2 ; + + arg1 = (payload_map_s *)jarg1; + arg2 = (uint32_t)jarg2; + if (arg1) (arg1)->rate = arg2; +} + + +SWIGEXPORT unsigned long SWIGSTDCALL CSharp_payload_map_t_rate_get(void * jarg1) { + unsigned long jresult ; + payload_map_s *arg1 = (payload_map_s *) 0 ; + uint32_t result; + + arg1 = (payload_map_s *)jarg1; + result = (uint32_t) ((arg1)->rate); + jresult = (unsigned long)result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_allocated_set(void * jarg1, unsigned char jarg2) { + payload_map_s *arg1 = (payload_map_s *) 0 ; + uint8_t arg2 ; + + arg1 = (payload_map_s *)jarg1; + arg2 = (uint8_t)jarg2; + if (arg1) (arg1)->allocated = arg2; +} + + +SWIGEXPORT unsigned char SWIGSTDCALL CSharp_payload_map_t_allocated_get(void * jarg1) { + unsigned char jresult ; + payload_map_s *arg1 = (payload_map_s *) 0 ; + uint8_t result; + + arg1 = (payload_map_s *)jarg1; + result = (uint8_t) ((arg1)->allocated); + jresult = result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_negotiated_set(void * jarg1, unsigned char jarg2) { + payload_map_s *arg1 = (payload_map_s *) 0 ; + uint8_t arg2 ; + + arg1 = (payload_map_s *)jarg1; + arg2 = (uint8_t)jarg2; + if (arg1) (arg1)->negotiated = arg2; +} + + +SWIGEXPORT unsigned char SWIGSTDCALL CSharp_payload_map_t_negotiated_get(void * jarg1) { + unsigned char jresult ; + payload_map_s *arg1 = (payload_map_s *) 0 ; + uint8_t result; + + arg1 = (payload_map_s *)jarg1; + result = (uint8_t) ((arg1)->negotiated); + jresult = result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_current_set(void * jarg1, unsigned char jarg2) { + payload_map_s *arg1 = (payload_map_s *) 0 ; + uint8_t arg2 ; + + arg1 = (payload_map_s *)jarg1; + arg2 = (uint8_t)jarg2; + if (arg1) (arg1)->current = arg2; +} + + +SWIGEXPORT unsigned char SWIGSTDCALL CSharp_payload_map_t_current_get(void * jarg1) { + unsigned char jresult ; + payload_map_s *arg1 = (payload_map_s *) 0 ; + uint8_t result; + + arg1 = (payload_map_s *)jarg1; + result = (uint8_t) ((arg1)->current); + jresult = result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_hash_set(void * jarg1, unsigned long jarg2) { + payload_map_s *arg1 = (payload_map_s *) 0 ; + unsigned long arg2 ; + + arg1 = (payload_map_s *)jarg1; + arg2 = (unsigned long)jarg2; + if (arg1) (arg1)->hash = arg2; +} + + +SWIGEXPORT unsigned long SWIGSTDCALL CSharp_payload_map_t_hash_get(void * jarg1) { + unsigned long jresult ; + payload_map_s *arg1 = (payload_map_s *) 0 ; + unsigned long result; + + arg1 = (payload_map_s *)jarg1; + result = (unsigned long) ((arg1)->hash); + jresult = (unsigned long)result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_rm_encoding_set(void * jarg1, char * jarg2) { + payload_map_s *arg1 = (payload_map_s *) 0 ; + char *arg2 = (char *) 0 ; + + arg1 = (payload_map_s *)jarg1; + arg2 = (char *)jarg2; + { + delete [] arg1->rm_encoding; + if (arg2) { + arg1->rm_encoding = (char *) (new char[strlen((const char *)arg2)+1]); + strcpy((char *)arg1->rm_encoding, (const char *)arg2); + } else { + arg1->rm_encoding = 0; + } + } +} + + +SWIGEXPORT char * SWIGSTDCALL CSharp_payload_map_t_rm_encoding_get(void * jarg1) { + char * jresult ; + payload_map_s *arg1 = (payload_map_s *) 0 ; + char *result = 0 ; + + arg1 = (payload_map_s *)jarg1; + result = (char *) ((arg1)->rm_encoding); + jresult = SWIG_csharp_string_callback((const char *)result); + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_iananame_set(void * jarg1, char * jarg2) { + payload_map_s *arg1 = (payload_map_s *) 0 ; + char *arg2 = (char *) 0 ; + + arg1 = (payload_map_s *)jarg1; + arg2 = (char *)jarg2; + { + delete [] arg1->iananame; + if (arg2) { + arg1->iananame = (char *) (new char[strlen((const char *)arg2)+1]); + strcpy((char *)arg1->iananame, (const char *)arg2); + } else { + arg1->iananame = 0; + } + } +} + + +SWIGEXPORT char * SWIGSTDCALL CSharp_payload_map_t_iananame_get(void * jarg1) { + char * jresult ; + payload_map_s *arg1 = (payload_map_s *) 0 ; + char *result = 0 ; + + arg1 = (payload_map_s *)jarg1; + result = (char *) ((arg1)->iananame); + jresult = SWIG_csharp_string_callback((const char *)result); + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_pt_set(void * jarg1, unsigned char jarg2) { + payload_map_s *arg1 = (payload_map_s *) 0 ; + switch_payload_t arg2 ; + + arg1 = (payload_map_s *)jarg1; + arg2 = (switch_payload_t)jarg2; + if (arg1) (arg1)->pt = arg2; +} + + +SWIGEXPORT unsigned char SWIGSTDCALL CSharp_payload_map_t_pt_get(void * jarg1) { + unsigned char jresult ; + payload_map_s *arg1 = (payload_map_s *) 0 ; + switch_payload_t result; + + arg1 = (payload_map_s *)jarg1; + result = (switch_payload_t) ((arg1)->pt); + jresult = result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_rm_rate_set(void * jarg1, unsigned long jarg2) { + payload_map_s *arg1 = (payload_map_s *) 0 ; + unsigned long arg2 ; + + arg1 = (payload_map_s *)jarg1; + arg2 = (unsigned long)jarg2; + if (arg1) (arg1)->rm_rate = arg2; +} + + +SWIGEXPORT unsigned long SWIGSTDCALL CSharp_payload_map_t_rm_rate_get(void * jarg1) { + unsigned long jresult ; + payload_map_s *arg1 = (payload_map_s *) 0 ; + unsigned long result; + + arg1 = (payload_map_s *)jarg1; + result = (unsigned long) ((arg1)->rm_rate); + jresult = (unsigned long)result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_adv_rm_rate_set(void * jarg1, unsigned long jarg2) { + payload_map_s *arg1 = (payload_map_s *) 0 ; + unsigned long arg2 ; + + arg1 = (payload_map_s *)jarg1; + arg2 = (unsigned long)jarg2; + if (arg1) (arg1)->adv_rm_rate = arg2; +} + + +SWIGEXPORT unsigned long SWIGSTDCALL CSharp_payload_map_t_adv_rm_rate_get(void * jarg1) { + unsigned long jresult ; + payload_map_s *arg1 = (payload_map_s *) 0 ; + unsigned long result; + + arg1 = (payload_map_s *)jarg1; + result = (unsigned long) ((arg1)->adv_rm_rate); + jresult = (unsigned long)result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_codec_ms_set(void * jarg1, unsigned long jarg2) { + payload_map_s *arg1 = (payload_map_s *) 0 ; + uint32_t arg2 ; + + arg1 = (payload_map_s *)jarg1; + arg2 = (uint32_t)jarg2; + if (arg1) (arg1)->codec_ms = arg2; +} + + +SWIGEXPORT unsigned long SWIGSTDCALL CSharp_payload_map_t_codec_ms_get(void * jarg1) { + unsigned long jresult ; + payload_map_s *arg1 = (payload_map_s *) 0 ; + uint32_t result; + + arg1 = (payload_map_s *)jarg1; + result = (uint32_t) ((arg1)->codec_ms); + jresult = (unsigned long)result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_bitrate_set(void * jarg1, unsigned long jarg2) { + payload_map_s *arg1 = (payload_map_s *) 0 ; + uint32_t arg2 ; + + arg1 = (payload_map_s *)jarg1; + arg2 = (uint32_t)jarg2; + if (arg1) (arg1)->bitrate = arg2; +} + + +SWIGEXPORT unsigned long SWIGSTDCALL CSharp_payload_map_t_bitrate_get(void * jarg1) { + unsigned long jresult ; + payload_map_s *arg1 = (payload_map_s *) 0 ; + uint32_t result; + + arg1 = (payload_map_s *)jarg1; + result = (uint32_t) ((arg1)->bitrate); + jresult = (unsigned long)result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_rm_fmtp_set(void * jarg1, char * jarg2) { + payload_map_s *arg1 = (payload_map_s *) 0 ; + char *arg2 = (char *) 0 ; + + arg1 = (payload_map_s *)jarg1; + arg2 = (char *)jarg2; + { + delete [] arg1->rm_fmtp; + if (arg2) { + arg1->rm_fmtp = (char *) (new char[strlen((const char *)arg2)+1]); + strcpy((char *)arg1->rm_fmtp, (const char *)arg2); + } else { + arg1->rm_fmtp = 0; + } + } +} + + +SWIGEXPORT char * SWIGSTDCALL CSharp_payload_map_t_rm_fmtp_get(void * jarg1) { + char * jresult ; + payload_map_s *arg1 = (payload_map_s *) 0 ; + char *result = 0 ; + + arg1 = (payload_map_s *)jarg1; + result = (char *) ((arg1)->rm_fmtp); + jresult = SWIG_csharp_string_callback((const char *)result); + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_agreed_pt_set(void * jarg1, unsigned char jarg2) { + payload_map_s *arg1 = (payload_map_s *) 0 ; + switch_payload_t arg2 ; + + arg1 = (payload_map_s *)jarg1; + arg2 = (switch_payload_t)jarg2; + if (arg1) (arg1)->agreed_pt = arg2; +} + + +SWIGEXPORT unsigned char SWIGSTDCALL CSharp_payload_map_t_agreed_pt_get(void * jarg1) { + unsigned char jresult ; + payload_map_s *arg1 = (payload_map_s *) 0 ; + switch_payload_t result; + + arg1 = (payload_map_s *)jarg1; + result = (switch_payload_t) ((arg1)->agreed_pt); + jresult = result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_recv_pt_set(void * jarg1, unsigned char jarg2) { + payload_map_s *arg1 = (payload_map_s *) 0 ; + switch_payload_t arg2 ; + + arg1 = (payload_map_s *)jarg1; + arg2 = (switch_payload_t)jarg2; + if (arg1) (arg1)->recv_pt = arg2; +} + + +SWIGEXPORT unsigned char SWIGSTDCALL CSharp_payload_map_t_recv_pt_get(void * jarg1) { + unsigned char jresult ; + payload_map_s *arg1 = (payload_map_s *) 0 ; + switch_payload_t result; + + arg1 = (payload_map_s *)jarg1; + result = (switch_payload_t) ((arg1)->recv_pt); + jresult = result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_fmtp_out_set(void * jarg1, char * jarg2) { + payload_map_s *arg1 = (payload_map_s *) 0 ; + char *arg2 = (char *) 0 ; + + arg1 = (payload_map_s *)jarg1; + arg2 = (char *)jarg2; + { + delete [] arg1->fmtp_out; + if (arg2) { + arg1->fmtp_out = (char *) (new char[strlen((const char *)arg2)+1]); + strcpy((char *)arg1->fmtp_out, (const char *)arg2); + } else { + arg1->fmtp_out = 0; + } + } +} + + +SWIGEXPORT char * SWIGSTDCALL CSharp_payload_map_t_fmtp_out_get(void * jarg1) { + char * jresult ; + payload_map_s *arg1 = (payload_map_s *) 0 ; + char *result = 0 ; + + arg1 = (payload_map_s *)jarg1; + result = (char *) ((arg1)->fmtp_out); + jresult = SWIG_csharp_string_callback((const char *)result); + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_remote_sdp_ip_set(void * jarg1, char * jarg2) { + payload_map_s *arg1 = (payload_map_s *) 0 ; + char *arg2 = (char *) 0 ; + + arg1 = (payload_map_s *)jarg1; + arg2 = (char *)jarg2; + { + delete [] arg1->remote_sdp_ip; + if (arg2) { + arg1->remote_sdp_ip = (char *) (new char[strlen((const char *)arg2)+1]); + strcpy((char *)arg1->remote_sdp_ip, (const char *)arg2); + } else { + arg1->remote_sdp_ip = 0; + } + } +} + + +SWIGEXPORT char * SWIGSTDCALL CSharp_payload_map_t_remote_sdp_ip_get(void * jarg1) { + char * jresult ; + payload_map_s *arg1 = (payload_map_s *) 0 ; + char *result = 0 ; + + arg1 = (payload_map_s *)jarg1; + result = (char *) ((arg1)->remote_sdp_ip); + jresult = SWIG_csharp_string_callback((const char *)result); + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_remote_sdp_port_set(void * jarg1, unsigned short jarg2) { + payload_map_s *arg1 = (payload_map_s *) 0 ; + switch_port_t arg2 ; + + arg1 = (payload_map_s *)jarg1; + arg2 = (switch_port_t)jarg2; + if (arg1) (arg1)->remote_sdp_port = arg2; +} + + +SWIGEXPORT unsigned short SWIGSTDCALL CSharp_payload_map_t_remote_sdp_port_get(void * jarg1) { + unsigned short jresult ; + payload_map_s *arg1 = (payload_map_s *) 0 ; + switch_port_t result; + + arg1 = (payload_map_s *)jarg1; + result = (switch_port_t) ((arg1)->remote_sdp_port); + jresult = result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_channels_set(void * jarg1, int jarg2) { + payload_map_s *arg1 = (payload_map_s *) 0 ; + int arg2 ; + + arg1 = (payload_map_s *)jarg1; + arg2 = (int)jarg2; + if (arg1) (arg1)->channels = arg2; +} + + +SWIGEXPORT int SWIGSTDCALL CSharp_payload_map_t_channels_get(void * jarg1) { + int jresult ; + payload_map_s *arg1 = (payload_map_s *) 0 ; + int result; + + arg1 = (payload_map_s *)jarg1; + result = (int) ((arg1)->channels); + jresult = result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_adv_channels_set(void * jarg1, int jarg2) { + payload_map_s *arg1 = (payload_map_s *) 0 ; + int arg2 ; + + arg1 = (payload_map_s *)jarg1; + arg2 = (int)jarg2; + if (arg1) (arg1)->adv_channels = arg2; +} + + +SWIGEXPORT int SWIGSTDCALL CSharp_payload_map_t_adv_channels_get(void * jarg1) { + int jresult ; + payload_map_s *arg1 = (payload_map_s *) 0 ; + int result; + + arg1 = (payload_map_s *)jarg1; + result = (int) ((arg1)->adv_channels); + jresult = result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_payload_map_t_next_set(void * jarg1, void * jarg2) { + payload_map_s *arg1 = (payload_map_s *) 0 ; + payload_map_s *arg2 = (payload_map_s *) 0 ; + + arg1 = (payload_map_s *)jarg1; + arg2 = (payload_map_s *)jarg2; + if (arg1) (arg1)->next = arg2; +} + + +SWIGEXPORT void * SWIGSTDCALL CSharp_payload_map_t_next_get(void * jarg1) { + void * jresult ; + payload_map_s *arg1 = (payload_map_s *) 0 ; + payload_map_s *result = 0 ; + + arg1 = (payload_map_s *)jarg1; + result = (payload_map_s *) ((arg1)->next); + jresult = (void *)result; + return jresult; +} + + +SWIGEXPORT void * SWIGSTDCALL CSharp_new_payload_map_t() { + void * jresult ; + payload_map_s *result = 0 ; + + result = (payload_map_s *)new payload_map_s(); + jresult = (void *)result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_delete_payload_map_t(void * jarg1) { + payload_map_s *arg1 = (payload_map_s *) 0 ; + + arg1 = (payload_map_s *)jarg1; + delete arg1; +} + + SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_db_close(void * jarg1) { int jresult ; switch_core_db_t *arg1 = (switch_core_db_t *) 0 ; @@ -11324,17 +11910,15 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_recv_dtmf(void * jarg1, vo } -SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_hash_init_case(void * jarg1, void * jarg2, int jarg3) { +SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_hash_init_case(void * jarg1, int jarg2) { int jresult ; switch_hash_t **arg1 = (switch_hash_t **) 0 ; - switch_memory_pool_t *arg2 = (switch_memory_pool_t *) 0 ; - switch_bool_t arg3 ; + switch_bool_t arg2 ; switch_status_t result; arg1 = (switch_hash_t **)jarg1; - arg2 = (switch_memory_pool_t *)jarg2; - arg3 = (switch_bool_t)jarg3; - result = (switch_status_t)switch_core_hash_init_case(arg1,arg2,arg3); + arg2 = (switch_bool_t)jarg2; + result = (switch_status_t)switch_core_hash_init_case(arg1,arg2); jresult = result; return jresult; } @@ -11550,46 +12134,6 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_core_hash_this(void * jarg1, void * ja } -SWIGEXPORT void * SWIGSTDCALL CSharp_switch_hash_first(char * jarg1, void * jarg2) { - void * jresult ; - char *arg1 = (char *) 0 ; - switch_hash_t *arg2 = (switch_hash_t *) 0 ; - switch_hash_index_t *result = 0 ; - - arg1 = (char *)jarg1; - arg2 = (switch_hash_t *)jarg2; - result = (switch_hash_index_t *)switch_hash_first(arg1,arg2); - jresult = (void *)result; - return jresult; -} - - -SWIGEXPORT void * SWIGSTDCALL CSharp_switch_hash_next(void * jarg1) { - void * jresult ; - switch_hash_index_t *arg1 = (switch_hash_index_t *) 0 ; - switch_hash_index_t *result = 0 ; - - arg1 = (switch_hash_index_t *)jarg1; - result = (switch_hash_index_t *)switch_hash_next(arg1); - jresult = (void *)result; - return jresult; -} - - -SWIGEXPORT void SWIGSTDCALL CSharp_switch_hash_this(void * jarg1, void * jarg2, void * jarg3, void * jarg4) { - switch_hash_index_t *arg1 = (switch_hash_index_t *) 0 ; - void **arg2 = (void **) 0 ; - switch_ssize_t *arg3 = (switch_ssize_t *) 0 ; - void **arg4 = (void **) 0 ; - - arg1 = (switch_hash_index_t *)jarg1; - arg2 = (void **)jarg2; - arg3 = (switch_ssize_t *)jarg3; - arg4 = (void **)jarg4; - switch_hash_this(arg1,(void const **)arg2,arg3,arg4); -} - - SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_timer_init(void * jarg1, char * jarg2, int jarg3, int jarg4, void * jarg5) { int jresult ; switch_timer_t *arg1 = (switch_timer_t *) 0 ; @@ -35780,26 +36324,6 @@ SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_RTP_MAX_CRYPTO_LEN_get() { } -SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_RTP_KEY_LEN_get() { - int jresult ; - int result; - - result = (int)(30); - jresult = result; - return jresult; -} - - -SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_RTP_CRYPTO_KEY_32_get() { - char * jresult ; - char *result = 0 ; - - result = (char *)("AES_CM_128_HMAC_SHA1_32"); - jresult = SWIG_csharp_string_callback((const char *)result); - return jresult; -} - - SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_RTP_CRYPTO_KEY_80_get() { char * jresult ; char *result = 0 ; @@ -35810,6 +36334,98 @@ SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_RTP_CRYPTO_KEY_80_get() { } +SWIGEXPORT void SWIGSTDCALL CSharp_switch_srtp_crypto_suite_t_name_set(void * jarg1, char * jarg2) { + switch_srtp_crypto_suite_s *arg1 = (switch_srtp_crypto_suite_s *) 0 ; + char *arg2 = (char *) 0 ; + + arg1 = (switch_srtp_crypto_suite_s *)jarg1; + arg2 = (char *)jarg2; + { + delete [] arg1->name; + if (arg2) { + arg1->name = (char *) (new char[strlen((const char *)arg2)+1]); + strcpy((char *)arg1->name, (const char *)arg2); + } else { + arg1->name = 0; + } + } +} + + +SWIGEXPORT char * SWIGSTDCALL CSharp_switch_srtp_crypto_suite_t_name_get(void * jarg1) { + char * jresult ; + switch_srtp_crypto_suite_s *arg1 = (switch_srtp_crypto_suite_s *) 0 ; + char *result = 0 ; + + arg1 = (switch_srtp_crypto_suite_s *)jarg1; + result = (char *) ((arg1)->name); + jresult = SWIG_csharp_string_callback((const char *)result); + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_switch_srtp_crypto_suite_t_type_set(void * jarg1, int jarg2) { + switch_srtp_crypto_suite_s *arg1 = (switch_srtp_crypto_suite_s *) 0 ; + switch_rtp_crypto_key_type_t arg2 ; + + arg1 = (switch_srtp_crypto_suite_s *)jarg1; + arg2 = (switch_rtp_crypto_key_type_t)jarg2; + if (arg1) (arg1)->type = arg2; +} + + +SWIGEXPORT int SWIGSTDCALL CSharp_switch_srtp_crypto_suite_t_type_get(void * jarg1) { + int jresult ; + switch_srtp_crypto_suite_s *arg1 = (switch_srtp_crypto_suite_s *) 0 ; + switch_rtp_crypto_key_type_t result; + + arg1 = (switch_srtp_crypto_suite_s *)jarg1; + result = (switch_rtp_crypto_key_type_t) ((arg1)->type); + jresult = result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_switch_srtp_crypto_suite_t_keylen_set(void * jarg1, int jarg2) { + switch_srtp_crypto_suite_s *arg1 = (switch_srtp_crypto_suite_s *) 0 ; + int arg2 ; + + arg1 = (switch_srtp_crypto_suite_s *)jarg1; + arg2 = (int)jarg2; + if (arg1) (arg1)->keylen = arg2; +} + + +SWIGEXPORT int SWIGSTDCALL CSharp_switch_srtp_crypto_suite_t_keylen_get(void * jarg1) { + int jresult ; + switch_srtp_crypto_suite_s *arg1 = (switch_srtp_crypto_suite_s *) 0 ; + int result; + + arg1 = (switch_srtp_crypto_suite_s *)jarg1; + result = (int) ((arg1)->keylen); + jresult = result; + return jresult; +} + + +SWIGEXPORT void * SWIGSTDCALL CSharp_new_switch_srtp_crypto_suite_t() { + void * jresult ; + switch_srtp_crypto_suite_s *result = 0 ; + + result = (switch_srtp_crypto_suite_s *)new switch_srtp_crypto_suite_s(); + jresult = (void *)result; + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_delete_switch_srtp_crypto_suite_t(void * jarg1) { + switch_srtp_crypto_suite_s *arg1 = (switch_srtp_crypto_suite_s *) 0 ; + + arg1 = (switch_srtp_crypto_suite_s *)jarg1; + delete arg1; +} + + SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_crypto_key_index_set(void * jarg1, unsigned long jarg2) { switch_rtp_crypto_key *arg1 = (switch_rtp_crypto_key *) 0 ; uint32_t arg2 ; @@ -36807,7 +37423,7 @@ SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_destroy(void * jarg1) { } -SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_activate_ice(void * jarg1, char * jarg2, char * jarg3, char * jarg4, char * jarg5, int jarg6, void * jarg7, void * jarg8) { +SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_activate_ice(void * jarg1, char * jarg2, char * jarg3, char * jarg4, char * jarg5, int jarg6, int jarg7, void * jarg8) { int jresult ; switch_rtp_t *arg1 = (switch_rtp_t *) 0 ; char *arg2 = (char *) 0 ; @@ -36817,7 +37433,6 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_activate_ice(void * jarg1, char * j ice_proto_t arg6 ; switch_core_media_ice_type_t arg7 ; ice_t *arg8 = (ice_t *) 0 ; - switch_core_media_ice_type_t *argp7 ; switch_status_t result; arg1 = (switch_rtp_t *)jarg1; @@ -36826,12 +37441,7 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_activate_ice(void * jarg1, char * j arg4 = (char *)jarg4; arg5 = (char *)jarg5; arg6 = (ice_proto_t)jarg6; - argp7 = (switch_core_media_ice_type_t *)jarg7; - if (!argp7) { - SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_core_media_ice_type_t", 0); - return 0; - } - arg7 = *argp7; + arg7 = (switch_core_media_ice_type_t)jarg7; arg8 = (ice_t *)jarg8; result = (switch_status_t)switch_rtp_activate_ice(arg1,arg2,arg3,(char const *)arg4,(char const *)arg5,arg6,arg7,arg8); jresult = result; diff --git a/src/mod/languages/mod_managed/managed/swig.2010.cs b/src/mod/languages/mod_managed/managed/swig.2010.cs index 04ccdce448..8a8a562451 100644 --- a/src/mod/languages/mod_managed/managed/swig.2010.cs +++ b/src/mod/languages/mod_managed/managed/swig.2010.cs @@ -2068,99 +2068,83 @@ public class freeswitch { return ret; } - public static switch_status_t switch_core_hash_init_case(SWIGTYPE_p_p_switch_hash hash, SWIGTYPE_p_apr_pool_t pool, switch_bool_t case_sensitive) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_hash_init_case(SWIGTYPE_p_p_switch_hash.getCPtr(hash), SWIGTYPE_p_apr_pool_t.getCPtr(pool), (int)case_sensitive); + public static switch_status_t switch_core_hash_init_case(SWIGTYPE_p_p_switch_hashtable hash, switch_bool_t case_sensitive) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_hash_init_case(SWIGTYPE_p_p_switch_hashtable.getCPtr(hash), (int)case_sensitive); return ret; } - public static switch_status_t switch_core_hash_destroy(SWIGTYPE_p_p_switch_hash hash) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_hash_destroy(SWIGTYPE_p_p_switch_hash.getCPtr(hash)); + public static switch_status_t switch_core_hash_destroy(SWIGTYPE_p_p_switch_hashtable hash) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_hash_destroy(SWIGTYPE_p_p_switch_hashtable.getCPtr(hash)); return ret; } - public static switch_status_t switch_core_hash_insert(SWIGTYPE_p_switch_hash hash, string key, SWIGTYPE_p_void data) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_hash_insert(SWIGTYPE_p_switch_hash.getCPtr(hash), key, SWIGTYPE_p_void.getCPtr(data)); + public static switch_status_t switch_core_hash_insert(SWIGTYPE_p_switch_hashtable hash, string key, SWIGTYPE_p_void data) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_hash_insert(SWIGTYPE_p_switch_hashtable.getCPtr(hash), key, SWIGTYPE_p_void.getCPtr(data)); return ret; } - public static switch_status_t switch_core_hash_insert_locked(SWIGTYPE_p_switch_hash hash, string key, SWIGTYPE_p_void data, SWIGTYPE_p_switch_mutex_t mutex) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_hash_insert_locked(SWIGTYPE_p_switch_hash.getCPtr(hash), key, SWIGTYPE_p_void.getCPtr(data), SWIGTYPE_p_switch_mutex_t.getCPtr(mutex)); + public static switch_status_t switch_core_hash_insert_locked(SWIGTYPE_p_switch_hashtable hash, string key, SWIGTYPE_p_void data, SWIGTYPE_p_switch_mutex_t mutex) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_hash_insert_locked(SWIGTYPE_p_switch_hashtable.getCPtr(hash), key, SWIGTYPE_p_void.getCPtr(data), SWIGTYPE_p_switch_mutex_t.getCPtr(mutex)); return ret; } - public static switch_status_t switch_core_hash_insert_wrlock(SWIGTYPE_p_switch_hash hash, string key, SWIGTYPE_p_void data, SWIGTYPE_p_switch_thread_rwlock_t rwlock) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_hash_insert_wrlock(SWIGTYPE_p_switch_hash.getCPtr(hash), key, SWIGTYPE_p_void.getCPtr(data), SWIGTYPE_p_switch_thread_rwlock_t.getCPtr(rwlock)); + public static switch_status_t switch_core_hash_insert_wrlock(SWIGTYPE_p_switch_hashtable hash, string key, SWIGTYPE_p_void data, SWIGTYPE_p_switch_thread_rwlock_t rwlock) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_hash_insert_wrlock(SWIGTYPE_p_switch_hashtable.getCPtr(hash), key, SWIGTYPE_p_void.getCPtr(data), SWIGTYPE_p_switch_thread_rwlock_t.getCPtr(rwlock)); return ret; } - public static switch_status_t switch_core_hash_delete(SWIGTYPE_p_switch_hash hash, string key) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_hash_delete(SWIGTYPE_p_switch_hash.getCPtr(hash), key); + public static switch_status_t switch_core_hash_delete(SWIGTYPE_p_switch_hashtable hash, string key) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_hash_delete(SWIGTYPE_p_switch_hashtable.getCPtr(hash), key); return ret; } - public static switch_status_t switch_core_hash_delete_locked(SWIGTYPE_p_switch_hash hash, string key, SWIGTYPE_p_switch_mutex_t mutex) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_hash_delete_locked(SWIGTYPE_p_switch_hash.getCPtr(hash), key, SWIGTYPE_p_switch_mutex_t.getCPtr(mutex)); + public static switch_status_t switch_core_hash_delete_locked(SWIGTYPE_p_switch_hashtable hash, string key, SWIGTYPE_p_switch_mutex_t mutex) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_hash_delete_locked(SWIGTYPE_p_switch_hashtable.getCPtr(hash), key, SWIGTYPE_p_switch_mutex_t.getCPtr(mutex)); return ret; } - public static switch_status_t switch_core_hash_delete_wrlock(SWIGTYPE_p_switch_hash hash, string key, SWIGTYPE_p_switch_thread_rwlock_t rwlock) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_hash_delete_wrlock(SWIGTYPE_p_switch_hash.getCPtr(hash), key, SWIGTYPE_p_switch_thread_rwlock_t.getCPtr(rwlock)); + public static switch_status_t switch_core_hash_delete_wrlock(SWIGTYPE_p_switch_hashtable hash, string key, SWIGTYPE_p_switch_thread_rwlock_t rwlock) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_hash_delete_wrlock(SWIGTYPE_p_switch_hashtable.getCPtr(hash), key, SWIGTYPE_p_switch_thread_rwlock_t.getCPtr(rwlock)); return ret; } - public static switch_status_t switch_core_hash_delete_multi(SWIGTYPE_p_switch_hash hash, SWIGTYPE_p_f_p_q_const__void_p_q_const__void_p_void__switch_bool_t callback, SWIGTYPE_p_void pData) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_hash_delete_multi(SWIGTYPE_p_switch_hash.getCPtr(hash), SWIGTYPE_p_f_p_q_const__void_p_q_const__void_p_void__switch_bool_t.getCPtr(callback), SWIGTYPE_p_void.getCPtr(pData)); + public static switch_status_t switch_core_hash_delete_multi(SWIGTYPE_p_switch_hashtable hash, SWIGTYPE_p_f_p_q_const__void_p_q_const__void_p_void__switch_bool_t callback, SWIGTYPE_p_void pData) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_hash_delete_multi(SWIGTYPE_p_switch_hashtable.getCPtr(hash), SWIGTYPE_p_f_p_q_const__void_p_q_const__void_p_void__switch_bool_t.getCPtr(callback), SWIGTYPE_p_void.getCPtr(pData)); return ret; } - public static SWIGTYPE_p_void switch_core_hash_find(SWIGTYPE_p_switch_hash hash, string key) { - IntPtr cPtr = freeswitchPINVOKE.switch_core_hash_find(SWIGTYPE_p_switch_hash.getCPtr(hash), key); + public static SWIGTYPE_p_void switch_core_hash_find(SWIGTYPE_p_switch_hashtable hash, string key) { + IntPtr cPtr = freeswitchPINVOKE.switch_core_hash_find(SWIGTYPE_p_switch_hashtable.getCPtr(hash), key); SWIGTYPE_p_void ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_void(cPtr, false); return ret; } - public static SWIGTYPE_p_void switch_core_hash_find_locked(SWIGTYPE_p_switch_hash hash, string key, SWIGTYPE_p_switch_mutex_t mutex) { - IntPtr cPtr = freeswitchPINVOKE.switch_core_hash_find_locked(SWIGTYPE_p_switch_hash.getCPtr(hash), key, SWIGTYPE_p_switch_mutex_t.getCPtr(mutex)); + public static SWIGTYPE_p_void switch_core_hash_find_locked(SWIGTYPE_p_switch_hashtable hash, string key, SWIGTYPE_p_switch_mutex_t mutex) { + IntPtr cPtr = freeswitchPINVOKE.switch_core_hash_find_locked(SWIGTYPE_p_switch_hashtable.getCPtr(hash), key, SWIGTYPE_p_switch_mutex_t.getCPtr(mutex)); SWIGTYPE_p_void ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_void(cPtr, false); return ret; } - public static SWIGTYPE_p_void switch_core_hash_find_rdlock(SWIGTYPE_p_switch_hash hash, string key, SWIGTYPE_p_switch_thread_rwlock_t rwlock) { - IntPtr cPtr = freeswitchPINVOKE.switch_core_hash_find_rdlock(SWIGTYPE_p_switch_hash.getCPtr(hash), key, SWIGTYPE_p_switch_thread_rwlock_t.getCPtr(rwlock)); + public static SWIGTYPE_p_void switch_core_hash_find_rdlock(SWIGTYPE_p_switch_hashtable hash, string key, SWIGTYPE_p_switch_thread_rwlock_t rwlock) { + IntPtr cPtr = freeswitchPINVOKE.switch_core_hash_find_rdlock(SWIGTYPE_p_switch_hashtable.getCPtr(hash), key, SWIGTYPE_p_switch_thread_rwlock_t.getCPtr(rwlock)); SWIGTYPE_p_void ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_void(cPtr, false); return ret; } - public static SWIGTYPE_p_HashElem switch_core_hash_first(SWIGTYPE_p_switch_hash hash) { - IntPtr cPtr = freeswitchPINVOKE.switch_core_hash_first(SWIGTYPE_p_switch_hash.getCPtr(hash)); - SWIGTYPE_p_HashElem ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_HashElem(cPtr, false); + public static SWIGTYPE_p_switch_hashtable_iterator switch_core_hash_first(SWIGTYPE_p_switch_hashtable hash) { + IntPtr cPtr = freeswitchPINVOKE.switch_core_hash_first(SWIGTYPE_p_switch_hashtable.getCPtr(hash)); + SWIGTYPE_p_switch_hashtable_iterator ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_switch_hashtable_iterator(cPtr, false); return ret; } - public static SWIGTYPE_p_HashElem switch_core_hash_next(SWIGTYPE_p_HashElem hi) { - IntPtr cPtr = freeswitchPINVOKE.switch_core_hash_next(SWIGTYPE_p_HashElem.getCPtr(hi)); - SWIGTYPE_p_HashElem ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_HashElem(cPtr, false); + public static SWIGTYPE_p_switch_hashtable_iterator switch_core_hash_next(SWIGTYPE_p_switch_hashtable_iterator hi) { + IntPtr cPtr = freeswitchPINVOKE.switch_core_hash_next(SWIGTYPE_p_switch_hashtable_iterator.getCPtr(hi)); + SWIGTYPE_p_switch_hashtable_iterator ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_switch_hashtable_iterator(cPtr, false); return ret; } - public static void switch_core_hash_this(SWIGTYPE_p_HashElem hi, SWIGTYPE_p_p_void key, SWIGTYPE_p_switch_ssize_t klen, SWIGTYPE_p_p_void val) { - freeswitchPINVOKE.switch_core_hash_this(SWIGTYPE_p_HashElem.getCPtr(hi), SWIGTYPE_p_p_void.getCPtr(key), SWIGTYPE_p_switch_ssize_t.getCPtr(klen), SWIGTYPE_p_p_void.getCPtr(val)); - } - - public static SWIGTYPE_p_HashElem switch_hash_first(string deprecate_me, SWIGTYPE_p_switch_hash hash) { - IntPtr cPtr = freeswitchPINVOKE.switch_hash_first(deprecate_me, SWIGTYPE_p_switch_hash.getCPtr(hash)); - SWIGTYPE_p_HashElem ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_HashElem(cPtr, false); - return ret; - } - - public static SWIGTYPE_p_HashElem switch_hash_next(SWIGTYPE_p_HashElem hi) { - IntPtr cPtr = freeswitchPINVOKE.switch_hash_next(SWIGTYPE_p_HashElem.getCPtr(hi)); - SWIGTYPE_p_HashElem ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_HashElem(cPtr, false); - return ret; - } - - public static void switch_hash_this(SWIGTYPE_p_HashElem hi, SWIGTYPE_p_p_void key, SWIGTYPE_p_switch_ssize_t klen, SWIGTYPE_p_p_void val) { - freeswitchPINVOKE.switch_hash_this(SWIGTYPE_p_HashElem.getCPtr(hi), SWIGTYPE_p_p_void.getCPtr(key), SWIGTYPE_p_switch_ssize_t.getCPtr(klen), SWIGTYPE_p_p_void.getCPtr(val)); + public static void switch_core_hash_this(SWIGTYPE_p_switch_hashtable_iterator hi, SWIGTYPE_p_p_void key, SWIGTYPE_p_switch_ssize_t klen, SWIGTYPE_p_p_void val) { + freeswitchPINVOKE.switch_core_hash_this(SWIGTYPE_p_switch_hashtable_iterator.getCPtr(hi), SWIGTYPE_p_p_void.getCPtr(key), SWIGTYPE_p_switch_ssize_t.getCPtr(klen), SWIGTYPE_p_p_void.getCPtr(val)); } public static switch_status_t switch_core_timer_init(switch_timer timer, string timer_name, int interval, int samples, SWIGTYPE_p_apr_pool_t pool) { @@ -2661,9 +2645,9 @@ public class freeswitch { return ret; } - public static SWIGTYPE_p_HashElem switch_core_mime_index() { + public static SWIGTYPE_p_switch_hashtable_iterator switch_core_mime_index() { IntPtr cPtr = freeswitchPINVOKE.switch_core_mime_index(); - SWIGTYPE_p_HashElem ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_HashElem(cPtr, false); + SWIGTYPE_p_switch_hashtable_iterator ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_switch_hashtable_iterator(cPtr, false); return ret; } @@ -4702,6 +4686,10 @@ public class freeswitch { return ret; } + public static void switch_channel_process_device_hangup(SWIGTYPE_p_switch_channel channel) { + freeswitchPINVOKE.switch_channel_process_device_hangup(SWIGTYPE_p_switch_channel.getCPtr(channel)); + } + public static switch_caller_extension switch_channel_get_queued_extension(SWIGTYPE_p_switch_channel channel) { IntPtr cPtr = freeswitchPINVOKE.switch_channel_get_queued_extension(SWIGTYPE_p_switch_channel.getCPtr(channel)); switch_caller_extension ret = (cPtr == IntPtr.Zero) ? null : new switch_caller_extension(cPtr, false); @@ -5083,8 +5071,8 @@ public class freeswitch { freeswitchPINVOKE.switch_event_deliver(SWIGTYPE_p_p_switch_event.getCPtr(arg0)); } - public static string switch_event_build_param_string(switch_event arg0, string prefix, SWIGTYPE_p_switch_hash vars_map) { - string ret = freeswitchPINVOKE.switch_event_build_param_string(switch_event.getCPtr(arg0), prefix, SWIGTYPE_p_switch_hash.getCPtr(vars_map)); + public static string switch_event_build_param_string(switch_event arg0, string prefix, SWIGTYPE_p_switch_hashtable vars_map) { + string ret = freeswitchPINVOKE.switch_event_build_param_string(switch_event.getCPtr(arg0), prefix, SWIGTYPE_p_switch_hashtable.getCPtr(vars_map)); return ret; } @@ -6116,9 +6104,8 @@ public class freeswitch { freeswitchPINVOKE.switch_rtp_destroy(SWIGTYPE_p_p_switch_rtp.getCPtr(rtp_session)); } - public static switch_status_t switch_rtp_activate_ice(SWIGTYPE_p_switch_rtp rtp_session, string login, string rlogin, string password, string rpassword, ice_proto_t proto, SWIGTYPE_p_switch_core_media_ice_type_t type, ice_t ice_params) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_rtp_activate_ice(SWIGTYPE_p_switch_rtp.getCPtr(rtp_session), login, rlogin, password, rpassword, (int)proto, SWIGTYPE_p_switch_core_media_ice_type_t.getCPtr(type), ice_t.getCPtr(ice_params)); - if (freeswitchPINVOKE.SWIGPendingException.Pending) throw freeswitchPINVOKE.SWIGPendingException.Retrieve(); + public static switch_status_t switch_rtp_activate_ice(SWIGTYPE_p_switch_rtp rtp_session, string login, string rlogin, string password, string rpassword, ice_proto_t proto, switch_core_media_ice_type_t type, ice_t ice_params) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_rtp_activate_ice(SWIGTYPE_p_switch_rtp.getCPtr(rtp_session), login, rlogin, password, rpassword, (int)proto, (int)type, ice_t.getCPtr(ice_params)); return ret; } @@ -6293,8 +6280,8 @@ public class freeswitch { return ret; } - public static switch_status_t switch_rtp_set_payload_map(SWIGTYPE_p_switch_rtp rtp_session, SWIGTYPE_p_p_payload_map_t pmap) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_rtp_set_payload_map(SWIGTYPE_p_switch_rtp.getCPtr(rtp_session), SWIGTYPE_p_p_payload_map_t.getCPtr(pmap)); + public static switch_status_t switch_rtp_set_payload_map(SWIGTYPE_p_switch_rtp rtp_session, SWIGTYPE_p_p_payload_map_s pmap) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_rtp_set_payload_map(SWIGTYPE_p_switch_rtp.getCPtr(rtp_session), SWIGTYPE_p_p_payload_map_s.getCPtr(pmap)); return ret; } @@ -7109,8 +7096,6 @@ public class freeswitch { public static readonly int SWITCH_RTCP_MAX_BUF_LEN = freeswitchPINVOKE.SWITCH_RTCP_MAX_BUF_LEN_get(); public static readonly int SWITCH_RTP_MAX_BUF_LEN_WORDS = freeswitchPINVOKE.SWITCH_RTP_MAX_BUF_LEN_WORDS_get(); public static readonly int SWITCH_RTP_MAX_CRYPTO_LEN = freeswitchPINVOKE.SWITCH_RTP_MAX_CRYPTO_LEN_get(); - public static readonly int SWITCH_RTP_KEY_LEN = freeswitchPINVOKE.SWITCH_RTP_KEY_LEN_get(); - public static readonly string SWITCH_RTP_CRYPTO_KEY_32 = freeswitchPINVOKE.SWITCH_RTP_CRYPTO_KEY_32_get(); public static readonly string SWITCH_RTP_CRYPTO_KEY_80 = freeswitchPINVOKE.SWITCH_RTP_CRYPTO_KEY_80_get(); public static readonly int MAX_CAND = freeswitchPINVOKE.MAX_CAND_get(); public static readonly int SWITCH_XML_BUFSIZE = freeswitchPINVOKE.SWITCH_XML_BUFSIZE_get(); @@ -8761,6 +8746,156 @@ class freeswitchPINVOKE { [DllImport("mod_managed", EntryPoint="CSharp_delete_switch_loadable_module_function_table_t")] public static extern void delete_switch_loadable_module_function_table_t(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_type_set")] + public static extern void payload_map_t_type_set(HandleRef jarg1, int jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_type_get")] + public static extern int payload_map_t_type_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_sdp_type_set")] + public static extern void payload_map_t_sdp_type_set(HandleRef jarg1, int jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_sdp_type_get")] + public static extern int payload_map_t_sdp_type_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_ptime_set")] + public static extern void payload_map_t_ptime_set(HandleRef jarg1, uint jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_ptime_get")] + public static extern uint payload_map_t_ptime_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_rate_set")] + public static extern void payload_map_t_rate_set(HandleRef jarg1, uint jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_rate_get")] + public static extern uint payload_map_t_rate_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_allocated_set")] + public static extern void payload_map_t_allocated_set(HandleRef jarg1, byte jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_allocated_get")] + public static extern byte payload_map_t_allocated_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_negotiated_set")] + public static extern void payload_map_t_negotiated_set(HandleRef jarg1, byte jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_negotiated_get")] + public static extern byte payload_map_t_negotiated_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_current_set")] + public static extern void payload_map_t_current_set(HandleRef jarg1, byte jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_current_get")] + public static extern byte payload_map_t_current_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_hash_set")] + public static extern void payload_map_t_hash_set(HandleRef jarg1, uint jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_hash_get")] + public static extern uint payload_map_t_hash_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_rm_encoding_set")] + public static extern void payload_map_t_rm_encoding_set(HandleRef jarg1, string jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_rm_encoding_get")] + public static extern string payload_map_t_rm_encoding_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_iananame_set")] + public static extern void payload_map_t_iananame_set(HandleRef jarg1, string jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_iananame_get")] + public static extern string payload_map_t_iananame_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_pt_set")] + public static extern void payload_map_t_pt_set(HandleRef jarg1, byte jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_pt_get")] + public static extern byte payload_map_t_pt_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_rm_rate_set")] + public static extern void payload_map_t_rm_rate_set(HandleRef jarg1, uint jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_rm_rate_get")] + public static extern uint payload_map_t_rm_rate_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_adv_rm_rate_set")] + public static extern void payload_map_t_adv_rm_rate_set(HandleRef jarg1, uint jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_adv_rm_rate_get")] + public static extern uint payload_map_t_adv_rm_rate_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_codec_ms_set")] + public static extern void payload_map_t_codec_ms_set(HandleRef jarg1, uint jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_codec_ms_get")] + public static extern uint payload_map_t_codec_ms_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_bitrate_set")] + public static extern void payload_map_t_bitrate_set(HandleRef jarg1, uint jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_bitrate_get")] + public static extern uint payload_map_t_bitrate_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_rm_fmtp_set")] + public static extern void payload_map_t_rm_fmtp_set(HandleRef jarg1, string jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_rm_fmtp_get")] + public static extern string payload_map_t_rm_fmtp_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_agreed_pt_set")] + public static extern void payload_map_t_agreed_pt_set(HandleRef jarg1, byte jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_agreed_pt_get")] + public static extern byte payload_map_t_agreed_pt_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_recv_pt_set")] + public static extern void payload_map_t_recv_pt_set(HandleRef jarg1, byte jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_recv_pt_get")] + public static extern byte payload_map_t_recv_pt_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_fmtp_out_set")] + public static extern void payload_map_t_fmtp_out_set(HandleRef jarg1, string jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_fmtp_out_get")] + public static extern string payload_map_t_fmtp_out_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_remote_sdp_ip_set")] + public static extern void payload_map_t_remote_sdp_ip_set(HandleRef jarg1, string jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_remote_sdp_ip_get")] + public static extern string payload_map_t_remote_sdp_ip_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_remote_sdp_port_set")] + public static extern void payload_map_t_remote_sdp_port_set(HandleRef jarg1, ushort jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_remote_sdp_port_get")] + public static extern ushort payload_map_t_remote_sdp_port_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_channels_set")] + public static extern void payload_map_t_channels_set(HandleRef jarg1, int jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_channels_get")] + public static extern int payload_map_t_channels_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_adv_channels_set")] + public static extern void payload_map_t_adv_channels_set(HandleRef jarg1, int jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_adv_channels_get")] + public static extern int payload_map_t_adv_channels_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_next_set")] + public static extern void payload_map_t_next_set(HandleRef jarg1, HandleRef jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_next_get")] + public static extern IntPtr payload_map_t_next_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_new_payload_map_t")] + public static extern IntPtr new_payload_map_t(); + + [DllImport("mod_managed", EntryPoint="CSharp_delete_payload_map_t")] + public static extern void delete_payload_map_t(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_core_db_close")] public static extern int switch_core_db_close(HandleRef jarg1); @@ -10127,7 +10262,7 @@ class freeswitchPINVOKE { public static extern int switch_core_session_recv_dtmf(HandleRef jarg1, HandleRef jarg2); [DllImport("mod_managed", EntryPoint="CSharp_switch_core_hash_init_case")] - public static extern int switch_core_hash_init_case(HandleRef jarg1, HandleRef jarg2, int jarg3); + public static extern int switch_core_hash_init_case(HandleRef jarg1, int jarg2); [DllImport("mod_managed", EntryPoint="CSharp_switch_core_hash_destroy")] public static extern int switch_core_hash_destroy(HandleRef jarg1); @@ -10171,15 +10306,6 @@ class freeswitchPINVOKE { [DllImport("mod_managed", EntryPoint="CSharp_switch_core_hash_this")] public static extern void switch_core_hash_this(HandleRef jarg1, HandleRef jarg2, HandleRef jarg3, HandleRef jarg4); - [DllImport("mod_managed", EntryPoint="CSharp_switch_hash_first")] - public static extern IntPtr switch_hash_first(string jarg1, HandleRef jarg2); - - [DllImport("mod_managed", EntryPoint="CSharp_switch_hash_next")] - public static extern IntPtr switch_hash_next(HandleRef jarg1); - - [DllImport("mod_managed", EntryPoint="CSharp_switch_hash_this")] - public static extern void switch_hash_this(HandleRef jarg1, HandleRef jarg2, HandleRef jarg3, HandleRef jarg4); - [DllImport("mod_managed", EntryPoint="CSharp_switch_core_timer_init")] public static extern int switch_core_timer_init(HandleRef jarg1, string jarg2, int jarg3, int jarg4, HandleRef jarg5); @@ -14764,6 +14890,9 @@ class freeswitchPINVOKE { [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_api_on")] public static extern int switch_channel_api_on(HandleRef jarg1, string jarg2); + [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_process_device_hangup")] + public static extern void switch_channel_process_device_hangup(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_channel_get_queued_extension")] public static extern IntPtr switch_channel_get_queued_extension(HandleRef jarg1); @@ -15907,15 +16036,33 @@ class freeswitchPINVOKE { [DllImport("mod_managed", EntryPoint="CSharp_SWITCH_RTP_MAX_CRYPTO_LEN_get")] public static extern int SWITCH_RTP_MAX_CRYPTO_LEN_get(); - [DllImport("mod_managed", EntryPoint="CSharp_SWITCH_RTP_KEY_LEN_get")] - public static extern int SWITCH_RTP_KEY_LEN_get(); - - [DllImport("mod_managed", EntryPoint="CSharp_SWITCH_RTP_CRYPTO_KEY_32_get")] - public static extern string SWITCH_RTP_CRYPTO_KEY_32_get(); - [DllImport("mod_managed", EntryPoint="CSharp_SWITCH_RTP_CRYPTO_KEY_80_get")] public static extern string SWITCH_RTP_CRYPTO_KEY_80_get(); + [DllImport("mod_managed", EntryPoint="CSharp_switch_srtp_crypto_suite_t_name_set")] + public static extern void switch_srtp_crypto_suite_t_name_set(HandleRef jarg1, string jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_srtp_crypto_suite_t_name_get")] + public static extern string switch_srtp_crypto_suite_t_name_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_srtp_crypto_suite_t_type_set")] + public static extern void switch_srtp_crypto_suite_t_type_set(HandleRef jarg1, int jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_srtp_crypto_suite_t_type_get")] + public static extern int switch_srtp_crypto_suite_t_type_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_srtp_crypto_suite_t_keylen_set")] + public static extern void switch_srtp_crypto_suite_t_keylen_set(HandleRef jarg1, int jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_srtp_crypto_suite_t_keylen_get")] + public static extern int switch_srtp_crypto_suite_t_keylen_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_new_switch_srtp_crypto_suite_t")] + public static extern IntPtr new_switch_srtp_crypto_suite_t(); + + [DllImport("mod_managed", EntryPoint="CSharp_delete_switch_srtp_crypto_suite_t")] + public static extern void delete_switch_srtp_crypto_suite_t(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_rtp_crypto_key_index_set")] public static extern void switch_rtp_crypto_key_index_set(HandleRef jarg1, uint jarg2); @@ -16148,7 +16295,7 @@ class freeswitchPINVOKE { public static extern void switch_rtp_destroy(HandleRef jarg1); [DllImport("mod_managed", EntryPoint="CSharp_switch_rtp_activate_ice")] - public static extern int switch_rtp_activate_ice(HandleRef jarg1, string jarg2, string jarg3, string jarg4, string jarg5, int jarg6, HandleRef jarg7, HandleRef jarg8); + public static extern int switch_rtp_activate_ice(HandleRef jarg1, string jarg2, string jarg3, string jarg4, string jarg5, int jarg6, int jarg7, HandleRef jarg8); [DllImport("mod_managed", EntryPoint="CSharp_switch_rtp_activate_rtcp")] public static extern int switch_rtp_activate_rtcp(HandleRef jarg1, int jarg2, ushort jarg3, int jarg4); @@ -18162,6 +18309,296 @@ namespace FreeSWITCH.Native { using System; using System.Runtime.InteropServices; +public class payload_map_t : IDisposable { + private HandleRef swigCPtr; + protected bool swigCMemOwn; + + internal payload_map_t(IntPtr cPtr, bool cMemoryOwn) { + swigCMemOwn = cMemoryOwn; + swigCPtr = new HandleRef(this, cPtr); + } + + internal static HandleRef getCPtr(payload_map_t obj) { + return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr; + } + + ~payload_map_t() { + Dispose(); + } + + public virtual void Dispose() { + lock(this) { + if (swigCPtr.Handle != IntPtr.Zero) { + if (swigCMemOwn) { + swigCMemOwn = false; + freeswitchPINVOKE.delete_payload_map_t(swigCPtr); + } + swigCPtr = new HandleRef(null, IntPtr.Zero); + } + GC.SuppressFinalize(this); + } + } + + public switch_media_type_t type { + set { + freeswitchPINVOKE.payload_map_t_type_set(swigCPtr, (int)value); + } + get { + switch_media_type_t ret = (switch_media_type_t)freeswitchPINVOKE.payload_map_t_type_get(swigCPtr); + return ret; + } + } + + public switch_sdp_type_t sdp_type { + set { + freeswitchPINVOKE.payload_map_t_sdp_type_set(swigCPtr, (int)value); + } + get { + switch_sdp_type_t ret = (switch_sdp_type_t)freeswitchPINVOKE.payload_map_t_sdp_type_get(swigCPtr); + return ret; + } + } + + public uint ptime { + set { + freeswitchPINVOKE.payload_map_t_ptime_set(swigCPtr, value); + } + get { + uint ret = freeswitchPINVOKE.payload_map_t_ptime_get(swigCPtr); + return ret; + } + } + + public uint rate { + set { + freeswitchPINVOKE.payload_map_t_rate_set(swigCPtr, value); + } + get { + uint ret = freeswitchPINVOKE.payload_map_t_rate_get(swigCPtr); + return ret; + } + } + + public byte allocated { + set { + freeswitchPINVOKE.payload_map_t_allocated_set(swigCPtr, value); + } + get { + byte ret = freeswitchPINVOKE.payload_map_t_allocated_get(swigCPtr); + return ret; + } + } + + public byte negotiated { + set { + freeswitchPINVOKE.payload_map_t_negotiated_set(swigCPtr, value); + } + get { + byte ret = freeswitchPINVOKE.payload_map_t_negotiated_get(swigCPtr); + return ret; + } + } + + public byte current { + set { + freeswitchPINVOKE.payload_map_t_current_set(swigCPtr, value); + } + get { + byte ret = freeswitchPINVOKE.payload_map_t_current_get(swigCPtr); + return ret; + } + } + + public uint hash { + set { + freeswitchPINVOKE.payload_map_t_hash_set(swigCPtr, value); + } + get { + uint ret = freeswitchPINVOKE.payload_map_t_hash_get(swigCPtr); + return ret; + } + } + + public string rm_encoding { + set { + freeswitchPINVOKE.payload_map_t_rm_encoding_set(swigCPtr, value); + } + get { + string ret = freeswitchPINVOKE.payload_map_t_rm_encoding_get(swigCPtr); + return ret; + } + } + + public string iananame { + set { + freeswitchPINVOKE.payload_map_t_iananame_set(swigCPtr, value); + } + get { + string ret = freeswitchPINVOKE.payload_map_t_iananame_get(swigCPtr); + return ret; + } + } + + public byte pt { + set { + freeswitchPINVOKE.payload_map_t_pt_set(swigCPtr, value); + } + get { + byte ret = freeswitchPINVOKE.payload_map_t_pt_get(swigCPtr); + return ret; + } + } + + public uint rm_rate { + set { + freeswitchPINVOKE.payload_map_t_rm_rate_set(swigCPtr, value); + } + get { + uint ret = freeswitchPINVOKE.payload_map_t_rm_rate_get(swigCPtr); + return ret; + } + } + + public uint adv_rm_rate { + set { + freeswitchPINVOKE.payload_map_t_adv_rm_rate_set(swigCPtr, value); + } + get { + uint ret = freeswitchPINVOKE.payload_map_t_adv_rm_rate_get(swigCPtr); + return ret; + } + } + + public uint codec_ms { + set { + freeswitchPINVOKE.payload_map_t_codec_ms_set(swigCPtr, value); + } + get { + uint ret = freeswitchPINVOKE.payload_map_t_codec_ms_get(swigCPtr); + return ret; + } + } + + public uint bitrate { + set { + freeswitchPINVOKE.payload_map_t_bitrate_set(swigCPtr, value); + } + get { + uint ret = freeswitchPINVOKE.payload_map_t_bitrate_get(swigCPtr); + return ret; + } + } + + public string rm_fmtp { + set { + freeswitchPINVOKE.payload_map_t_rm_fmtp_set(swigCPtr, value); + } + get { + string ret = freeswitchPINVOKE.payload_map_t_rm_fmtp_get(swigCPtr); + return ret; + } + } + + public byte agreed_pt { + set { + freeswitchPINVOKE.payload_map_t_agreed_pt_set(swigCPtr, value); + } + get { + byte ret = freeswitchPINVOKE.payload_map_t_agreed_pt_get(swigCPtr); + return ret; + } + } + + public byte recv_pt { + set { + freeswitchPINVOKE.payload_map_t_recv_pt_set(swigCPtr, value); + } + get { + byte ret = freeswitchPINVOKE.payload_map_t_recv_pt_get(swigCPtr); + return ret; + } + } + + public string fmtp_out { + set { + freeswitchPINVOKE.payload_map_t_fmtp_out_set(swigCPtr, value); + } + get { + string ret = freeswitchPINVOKE.payload_map_t_fmtp_out_get(swigCPtr); + return ret; + } + } + + public string remote_sdp_ip { + set { + freeswitchPINVOKE.payload_map_t_remote_sdp_ip_set(swigCPtr, value); + } + get { + string ret = freeswitchPINVOKE.payload_map_t_remote_sdp_ip_get(swigCPtr); + return ret; + } + } + + public ushort remote_sdp_port { + set { + freeswitchPINVOKE.payload_map_t_remote_sdp_port_set(swigCPtr, value); + } + get { + ushort ret = freeswitchPINVOKE.payload_map_t_remote_sdp_port_get(swigCPtr); + return ret; + } + } + + public int channels { + set { + freeswitchPINVOKE.payload_map_t_channels_set(swigCPtr, value); + } + get { + int ret = freeswitchPINVOKE.payload_map_t_channels_get(swigCPtr); + return ret; + } + } + + public int adv_channels { + set { + freeswitchPINVOKE.payload_map_t_adv_channels_set(swigCPtr, value); + } + get { + int ret = freeswitchPINVOKE.payload_map_t_adv_channels_get(swigCPtr); + return ret; + } + } + + public payload_map_t next { + set { + freeswitchPINVOKE.payload_map_t_next_set(swigCPtr, payload_map_t.getCPtr(value)); + } + get { + IntPtr cPtr = freeswitchPINVOKE.payload_map_t_next_get(swigCPtr); + payload_map_t ret = (cPtr == IntPtr.Zero) ? null : new payload_map_t(cPtr, false); + return ret; + } + } + + public payload_map_t() : this(freeswitchPINVOKE.new_payload_map_t(), true) { + } + +} + +} +/* ---------------------------------------------------------------------------- + * This file was automatically generated by SWIG (http://www.swig.org). + * Version 2.0.1 + * + * Do not make changes to this file unless you know what you are doing--modify + * the SWIG interface file instead. + * ----------------------------------------------------------------------------- */ + +namespace FreeSWITCH.Native { + +using System; +using System.Runtime.InteropServices; + public class profile_node_t : IDisposable { private HandleRef swigCPtr; protected bool swigCMemOwn; @@ -21230,36 +21667,6 @@ namespace FreeSWITCH.Native { using System; using System.Runtime.InteropServices; -public class SWIGTYPE_p_HashElem { - private HandleRef swigCPtr; - - internal SWIGTYPE_p_HashElem(IntPtr cPtr, bool futureUse) { - swigCPtr = new HandleRef(this, cPtr); - } - - protected SWIGTYPE_p_HashElem() { - swigCPtr = new HandleRef(null, IntPtr.Zero); - } - - internal static HandleRef getCPtr(SWIGTYPE_p_HashElem obj) { - return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr; - } -} - -} -/* ---------------------------------------------------------------------------- - * This file was automatically generated by SWIG (http://www.swig.org). - * Version 2.0.1 - * - * Do not make changes to this file unless you know what you are doing--modify - * the SWIG interface file instead. - * ----------------------------------------------------------------------------- */ - -namespace FreeSWITCH.Native { - -using System; -using System.Runtime.InteropServices; - public class SWIGTYPE_p_in6_addr { private HandleRef swigCPtr; @@ -21320,36 +21727,6 @@ namespace FreeSWITCH.Native { using System; using System.Runtime.InteropServices; -public class SWIGTYPE_p_payload_map_t { - private HandleRef swigCPtr; - - internal SWIGTYPE_p_payload_map_t(IntPtr cPtr, bool futureUse) { - swigCPtr = new HandleRef(this, cPtr); - } - - protected SWIGTYPE_p_payload_map_t() { - swigCPtr = new HandleRef(null, IntPtr.Zero); - } - - internal static HandleRef getCPtr(SWIGTYPE_p_payload_map_t obj) { - return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr; - } -} - -} -/* ---------------------------------------------------------------------------- - * This file was automatically generated by SWIG (http://www.swig.org). - * Version 2.0.1 - * - * Do not make changes to this file unless you know what you are doing--modify - * the SWIG interface file instead. - * ----------------------------------------------------------------------------- */ - -namespace FreeSWITCH.Native { - -using System; -using System.Runtime.InteropServices; - public class SWIGTYPE_p_pid_t { private HandleRef swigCPtr; @@ -21470,18 +21847,18 @@ namespace FreeSWITCH.Native { using System; using System.Runtime.InteropServices; -public class SWIGTYPE_p_p_payload_map_t { +public class SWIGTYPE_p_p_payload_map_s { private HandleRef swigCPtr; - internal SWIGTYPE_p_p_payload_map_t(IntPtr cPtr, bool futureUse) { + internal SWIGTYPE_p_p_payload_map_s(IntPtr cPtr, bool futureUse) { swigCPtr = new HandleRef(this, cPtr); } - protected SWIGTYPE_p_p_payload_map_t() { + protected SWIGTYPE_p_p_payload_map_s() { swigCPtr = new HandleRef(null, IntPtr.Zero); } - internal static HandleRef getCPtr(SWIGTYPE_p_p_payload_map_t obj) { + internal static HandleRef getCPtr(SWIGTYPE_p_p_payload_map_s obj) { return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr; } } @@ -22070,18 +22447,18 @@ namespace FreeSWITCH.Native { using System; using System.Runtime.InteropServices; -public class SWIGTYPE_p_p_switch_hash { +public class SWIGTYPE_p_p_switch_hashtable { private HandleRef swigCPtr; - internal SWIGTYPE_p_p_switch_hash(IntPtr cPtr, bool futureUse) { + internal SWIGTYPE_p_p_switch_hashtable(IntPtr cPtr, bool futureUse) { swigCPtr = new HandleRef(this, cPtr); } - protected SWIGTYPE_p_p_switch_hash() { + protected SWIGTYPE_p_p_switch_hashtable() { swigCPtr = new HandleRef(null, IntPtr.Zero); } - internal static HandleRef getCPtr(SWIGTYPE_p_p_switch_hash obj) { + internal static HandleRef getCPtr(SWIGTYPE_p_p_switch_hashtable obj) { return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr; } } @@ -22970,36 +23347,6 @@ namespace FreeSWITCH.Native { using System; using System.Runtime.InteropServices; -public class SWIGTYPE_p_switch_core_media_ice_type_t { - private HandleRef swigCPtr; - - internal SWIGTYPE_p_switch_core_media_ice_type_t(IntPtr cPtr, bool futureUse) { - swigCPtr = new HandleRef(this, cPtr); - } - - protected SWIGTYPE_p_switch_core_media_ice_type_t() { - swigCPtr = new HandleRef(null, IntPtr.Zero); - } - - internal static HandleRef getCPtr(SWIGTYPE_p_switch_core_media_ice_type_t obj) { - return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr; - } -} - -} -/* ---------------------------------------------------------------------------- - * This file was automatically generated by SWIG (http://www.swig.org). - * Version 2.0.1 - * - * Do not make changes to this file unless you know what you are doing--modify - * the SWIG interface file instead. - * ----------------------------------------------------------------------------- */ - -namespace FreeSWITCH.Native { - -using System; -using System.Runtime.InteropServices; - public class SWIGTYPE_p_switch_core_port_allocator { private HandleRef swigCPtr; @@ -23120,18 +23467,48 @@ namespace FreeSWITCH.Native { using System; using System.Runtime.InteropServices; -public class SWIGTYPE_p_switch_hash { +public class SWIGTYPE_p_switch_hashtable { private HandleRef swigCPtr; - internal SWIGTYPE_p_switch_hash(IntPtr cPtr, bool futureUse) { + internal SWIGTYPE_p_switch_hashtable(IntPtr cPtr, bool futureUse) { swigCPtr = new HandleRef(this, cPtr); } - protected SWIGTYPE_p_switch_hash() { + protected SWIGTYPE_p_switch_hashtable() { swigCPtr = new HandleRef(null, IntPtr.Zero); } - internal static HandleRef getCPtr(SWIGTYPE_p_switch_hash obj) { + internal static HandleRef getCPtr(SWIGTYPE_p_switch_hashtable obj) { + return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr; + } +} + +} +/* ---------------------------------------------------------------------------- + * This file was automatically generated by SWIG (http://www.swig.org). + * Version 2.0.1 + * + * Do not make changes to this file unless you know what you are doing--modify + * the SWIG interface file instead. + * ----------------------------------------------------------------------------- */ + +namespace FreeSWITCH.Native { + +using System; +using System.Runtime.InteropServices; + +public class SWIGTYPE_p_switch_hashtable_iterator { + private HandleRef swigCPtr; + + internal SWIGTYPE_p_switch_hashtable_iterator(IntPtr cPtr, bool futureUse) { + swigCPtr = new HandleRef(this, cPtr); + } + + protected SWIGTYPE_p_switch_hashtable_iterator() { + swigCPtr = new HandleRef(null, IntPtr.Zero); + } + + internal static HandleRef getCPtr(SWIGTYPE_p_switch_hashtable_iterator obj) { return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr; } } @@ -26936,6 +27313,8 @@ public enum switch_channel_flag_t { CF_AUDIO_PAUSE, CF_VIDEO_PAUSE, CF_BYPASS_MEDIA_AFTER_HOLD, + CF_HANGUP_HELD, + CF_CONFERENCE_RESET_MEDIA, CF_FLAG_MAX } @@ -28580,6 +28959,23 @@ namespace FreeSWITCH.Native { namespace FreeSWITCH.Native { +public enum switch_core_media_ice_type_t { + ICE_GOOGLE_JINGLE = (1 << 0), + ICE_VANILLA = (1 << 1), + ICE_CONTROLLED = (1 << 2) +} + +} +/* ---------------------------------------------------------------------------- + * This file was automatically generated by SWIG (http://www.swig.org). + * Version 2.0.1 + * + * Do not make changes to this file unless you know what you are doing--modify + * the SWIG interface file instead. + * ----------------------------------------------------------------------------- */ + +namespace FreeSWITCH.Native { + using System; using System.Runtime.InteropServices; @@ -28885,6 +29281,7 @@ public enum switch_core_session_message_types_t { SWITCH_MESSAGE_ANSWER_EVENT, SWITCH_MESSAGE_PROGRESS_EVENT, SWITCH_MESSAGE_RING_EVENT, + SWITCH_MESSAGE_RESAMPLE_EVENT, SWITCH_MESSAGE_INVALID } @@ -32181,13 +32578,13 @@ public class switch_frame : IDisposable { } } - public SWIGTYPE_p_payload_map_t pmap { + public payload_map_t pmap { set { - freeswitchPINVOKE.switch_frame_pmap_set(swigCPtr, SWIGTYPE_p_payload_map_t.getCPtr(value)); + freeswitchPINVOKE.switch_frame_pmap_set(swigCPtr, payload_map_t.getCPtr(value)); } get { IntPtr cPtr = freeswitchPINVOKE.switch_frame_pmap_get(swigCPtr); - SWIGTYPE_p_payload_map_t ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_payload_map_t(cPtr, false); + payload_map_t ret = (cPtr == IntPtr.Zero) ? null : new payload_map_t(cPtr, false); return ret; } } @@ -35463,11 +35860,16 @@ public class switch_rtp_crypto_key : IDisposable { namespace FreeSWITCH.Native { public enum switch_rtp_crypto_key_type_t { - NO_CRYPTO, - AES_CM_128_HMAC_SHA1_80, - AES_CM_128_HMAC_SHA1_32, + AEAD_AES_256_GCM_8, + AEAD_AES_128_GCM_8, AES_CM_256_HMAC_SHA1_80, - AES_CM_128_NULL_AUTH + AES_CM_192_HMAC_SHA1_80, + AES_CM_128_HMAC_SHA1_80, + AES_CM_256_HMAC_SHA1_32, + AES_CM_192_HMAC_SHA1_32, + AES_CM_128_HMAC_SHA1_32, + AES_CM_128_NULL_AUTH, + CRYPTO_INVALID } } @@ -35520,6 +35922,7 @@ public enum switch_rtp_flag_t { SWITCH_RTP_FLAG_PAUSE, SWITCH_RTP_FLAG_FIR, SWITCH_RTP_FLAG_PLI, + SWITCH_RTP_FLAG_RESET, SWITCH_RTP_FLAG_INVALID } @@ -36669,6 +37072,22 @@ public class switch_scheduler_task : IDisposable { namespace FreeSWITCH.Native { +public enum switch_sdp_type_t { + SDP_TYPE_REQUEST, + SDP_TYPE_RESPONSE +} + +} +/* ---------------------------------------------------------------------------- + * This file was automatically generated by SWIG (http://www.swig.org). + * Version 2.0.1 + * + * Do not make changes to this file unless you know what you are doing--modify + * the SWIG interface file instead. + * ----------------------------------------------------------------------------- */ + +namespace FreeSWITCH.Native { + using System; using System.Runtime.InteropServices; @@ -37463,6 +37882,85 @@ public class switch_speech_interface : IDisposable { namespace FreeSWITCH.Native { +using System; +using System.Runtime.InteropServices; + +public class switch_srtp_crypto_suite_t : IDisposable { + private HandleRef swigCPtr; + protected bool swigCMemOwn; + + internal switch_srtp_crypto_suite_t(IntPtr cPtr, bool cMemoryOwn) { + swigCMemOwn = cMemoryOwn; + swigCPtr = new HandleRef(this, cPtr); + } + + internal static HandleRef getCPtr(switch_srtp_crypto_suite_t obj) { + return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr; + } + + ~switch_srtp_crypto_suite_t() { + Dispose(); + } + + public virtual void Dispose() { + lock(this) { + if (swigCPtr.Handle != IntPtr.Zero) { + if (swigCMemOwn) { + swigCMemOwn = false; + freeswitchPINVOKE.delete_switch_srtp_crypto_suite_t(swigCPtr); + } + swigCPtr = new HandleRef(null, IntPtr.Zero); + } + GC.SuppressFinalize(this); + } + } + + public string name { + set { + freeswitchPINVOKE.switch_srtp_crypto_suite_t_name_set(swigCPtr, value); + } + get { + string ret = freeswitchPINVOKE.switch_srtp_crypto_suite_t_name_get(swigCPtr); + return ret; + } + } + + public switch_rtp_crypto_key_type_t type { + set { + freeswitchPINVOKE.switch_srtp_crypto_suite_t_type_set(swigCPtr, (int)value); + } + get { + switch_rtp_crypto_key_type_t ret = (switch_rtp_crypto_key_type_t)freeswitchPINVOKE.switch_srtp_crypto_suite_t_type_get(swigCPtr); + return ret; + } + } + + public int keylen { + set { + freeswitchPINVOKE.switch_srtp_crypto_suite_t_keylen_set(swigCPtr, value); + } + get { + int ret = freeswitchPINVOKE.switch_srtp_crypto_suite_t_keylen_get(swigCPtr); + return ret; + } + } + + public switch_srtp_crypto_suite_t() : this(freeswitchPINVOKE.new_switch_srtp_crypto_suite_t(), true) { + } + +} + +} +/* ---------------------------------------------------------------------------- + * This file was automatically generated by SWIG (http://www.swig.org). + * Version 2.0.1 + * + * Do not make changes to this file unless you know what you are doing--modify + * the SWIG interface file instead. + * ----------------------------------------------------------------------------- */ + +namespace FreeSWITCH.Native { + public enum switch_stack_t { SWITCH_STACK_BOTTOM = (1 << 0), SWITCH_STACK_TOP = (1 << 1), diff --git a/src/mod/languages/mod_managed/managed/swig.cs b/src/mod/languages/mod_managed/managed/swig.cs index f164570914..fd76c84342 100644 --- a/src/mod/languages/mod_managed/managed/swig.cs +++ b/src/mod/languages/mod_managed/managed/swig.cs @@ -2068,99 +2068,83 @@ public class freeswitch { return ret; } - public static switch_status_t switch_core_hash_init_case(SWIGTYPE_p_p_switch_hash hash, SWIGTYPE_p_apr_pool_t pool, switch_bool_t case_sensitive) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_hash_init_case(SWIGTYPE_p_p_switch_hash.getCPtr(hash), SWIGTYPE_p_apr_pool_t.getCPtr(pool), (int)case_sensitive); + public static switch_status_t switch_core_hash_init_case(SWIGTYPE_p_p_switch_hashtable hash, switch_bool_t case_sensitive) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_hash_init_case(SWIGTYPE_p_p_switch_hashtable.getCPtr(hash), (int)case_sensitive); return ret; } - public static switch_status_t switch_core_hash_destroy(SWIGTYPE_p_p_switch_hash hash) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_hash_destroy(SWIGTYPE_p_p_switch_hash.getCPtr(hash)); + public static switch_status_t switch_core_hash_destroy(SWIGTYPE_p_p_switch_hashtable hash) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_hash_destroy(SWIGTYPE_p_p_switch_hashtable.getCPtr(hash)); return ret; } - public static switch_status_t switch_core_hash_insert(SWIGTYPE_p_switch_hash hash, string key, SWIGTYPE_p_void data) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_hash_insert(SWIGTYPE_p_switch_hash.getCPtr(hash), key, SWIGTYPE_p_void.getCPtr(data)); + public static switch_status_t switch_core_hash_insert(SWIGTYPE_p_switch_hashtable hash, string key, SWIGTYPE_p_void data) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_hash_insert(SWIGTYPE_p_switch_hashtable.getCPtr(hash), key, SWIGTYPE_p_void.getCPtr(data)); return ret; } - public static switch_status_t switch_core_hash_insert_locked(SWIGTYPE_p_switch_hash hash, string key, SWIGTYPE_p_void data, SWIGTYPE_p_switch_mutex_t mutex) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_hash_insert_locked(SWIGTYPE_p_switch_hash.getCPtr(hash), key, SWIGTYPE_p_void.getCPtr(data), SWIGTYPE_p_switch_mutex_t.getCPtr(mutex)); + public static switch_status_t switch_core_hash_insert_locked(SWIGTYPE_p_switch_hashtable hash, string key, SWIGTYPE_p_void data, SWIGTYPE_p_switch_mutex_t mutex) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_hash_insert_locked(SWIGTYPE_p_switch_hashtable.getCPtr(hash), key, SWIGTYPE_p_void.getCPtr(data), SWIGTYPE_p_switch_mutex_t.getCPtr(mutex)); return ret; } - public static switch_status_t switch_core_hash_insert_wrlock(SWIGTYPE_p_switch_hash hash, string key, SWIGTYPE_p_void data, SWIGTYPE_p_switch_thread_rwlock_t rwlock) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_hash_insert_wrlock(SWIGTYPE_p_switch_hash.getCPtr(hash), key, SWIGTYPE_p_void.getCPtr(data), SWIGTYPE_p_switch_thread_rwlock_t.getCPtr(rwlock)); + public static switch_status_t switch_core_hash_insert_wrlock(SWIGTYPE_p_switch_hashtable hash, string key, SWIGTYPE_p_void data, SWIGTYPE_p_switch_thread_rwlock_t rwlock) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_hash_insert_wrlock(SWIGTYPE_p_switch_hashtable.getCPtr(hash), key, SWIGTYPE_p_void.getCPtr(data), SWIGTYPE_p_switch_thread_rwlock_t.getCPtr(rwlock)); return ret; } - public static switch_status_t switch_core_hash_delete(SWIGTYPE_p_switch_hash hash, string key) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_hash_delete(SWIGTYPE_p_switch_hash.getCPtr(hash), key); + public static switch_status_t switch_core_hash_delete(SWIGTYPE_p_switch_hashtable hash, string key) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_hash_delete(SWIGTYPE_p_switch_hashtable.getCPtr(hash), key); return ret; } - public static switch_status_t switch_core_hash_delete_locked(SWIGTYPE_p_switch_hash hash, string key, SWIGTYPE_p_switch_mutex_t mutex) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_hash_delete_locked(SWIGTYPE_p_switch_hash.getCPtr(hash), key, SWIGTYPE_p_switch_mutex_t.getCPtr(mutex)); + public static switch_status_t switch_core_hash_delete_locked(SWIGTYPE_p_switch_hashtable hash, string key, SWIGTYPE_p_switch_mutex_t mutex) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_hash_delete_locked(SWIGTYPE_p_switch_hashtable.getCPtr(hash), key, SWIGTYPE_p_switch_mutex_t.getCPtr(mutex)); return ret; } - public static switch_status_t switch_core_hash_delete_wrlock(SWIGTYPE_p_switch_hash hash, string key, SWIGTYPE_p_switch_thread_rwlock_t rwlock) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_hash_delete_wrlock(SWIGTYPE_p_switch_hash.getCPtr(hash), key, SWIGTYPE_p_switch_thread_rwlock_t.getCPtr(rwlock)); + public static switch_status_t switch_core_hash_delete_wrlock(SWIGTYPE_p_switch_hashtable hash, string key, SWIGTYPE_p_switch_thread_rwlock_t rwlock) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_hash_delete_wrlock(SWIGTYPE_p_switch_hashtable.getCPtr(hash), key, SWIGTYPE_p_switch_thread_rwlock_t.getCPtr(rwlock)); return ret; } - public static switch_status_t switch_core_hash_delete_multi(SWIGTYPE_p_switch_hash hash, SWIGTYPE_p_f_p_q_const__void_p_q_const__void_p_void__switch_bool_t callback, SWIGTYPE_p_void pData) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_hash_delete_multi(SWIGTYPE_p_switch_hash.getCPtr(hash), SWIGTYPE_p_f_p_q_const__void_p_q_const__void_p_void__switch_bool_t.getCPtr(callback), SWIGTYPE_p_void.getCPtr(pData)); + public static switch_status_t switch_core_hash_delete_multi(SWIGTYPE_p_switch_hashtable hash, SWIGTYPE_p_f_p_q_const__void_p_q_const__void_p_void__switch_bool_t callback, SWIGTYPE_p_void pData) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_hash_delete_multi(SWIGTYPE_p_switch_hashtable.getCPtr(hash), SWIGTYPE_p_f_p_q_const__void_p_q_const__void_p_void__switch_bool_t.getCPtr(callback), SWIGTYPE_p_void.getCPtr(pData)); return ret; } - public static SWIGTYPE_p_void switch_core_hash_find(SWIGTYPE_p_switch_hash hash, string key) { - IntPtr cPtr = freeswitchPINVOKE.switch_core_hash_find(SWIGTYPE_p_switch_hash.getCPtr(hash), key); + public static SWIGTYPE_p_void switch_core_hash_find(SWIGTYPE_p_switch_hashtable hash, string key) { + IntPtr cPtr = freeswitchPINVOKE.switch_core_hash_find(SWIGTYPE_p_switch_hashtable.getCPtr(hash), key); SWIGTYPE_p_void ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_void(cPtr, false); return ret; } - public static SWIGTYPE_p_void switch_core_hash_find_locked(SWIGTYPE_p_switch_hash hash, string key, SWIGTYPE_p_switch_mutex_t mutex) { - IntPtr cPtr = freeswitchPINVOKE.switch_core_hash_find_locked(SWIGTYPE_p_switch_hash.getCPtr(hash), key, SWIGTYPE_p_switch_mutex_t.getCPtr(mutex)); + public static SWIGTYPE_p_void switch_core_hash_find_locked(SWIGTYPE_p_switch_hashtable hash, string key, SWIGTYPE_p_switch_mutex_t mutex) { + IntPtr cPtr = freeswitchPINVOKE.switch_core_hash_find_locked(SWIGTYPE_p_switch_hashtable.getCPtr(hash), key, SWIGTYPE_p_switch_mutex_t.getCPtr(mutex)); SWIGTYPE_p_void ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_void(cPtr, false); return ret; } - public static SWIGTYPE_p_void switch_core_hash_find_rdlock(SWIGTYPE_p_switch_hash hash, string key, SWIGTYPE_p_switch_thread_rwlock_t rwlock) { - IntPtr cPtr = freeswitchPINVOKE.switch_core_hash_find_rdlock(SWIGTYPE_p_switch_hash.getCPtr(hash), key, SWIGTYPE_p_switch_thread_rwlock_t.getCPtr(rwlock)); + public static SWIGTYPE_p_void switch_core_hash_find_rdlock(SWIGTYPE_p_switch_hashtable hash, string key, SWIGTYPE_p_switch_thread_rwlock_t rwlock) { + IntPtr cPtr = freeswitchPINVOKE.switch_core_hash_find_rdlock(SWIGTYPE_p_switch_hashtable.getCPtr(hash), key, SWIGTYPE_p_switch_thread_rwlock_t.getCPtr(rwlock)); SWIGTYPE_p_void ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_void(cPtr, false); return ret; } - public static SWIGTYPE_p_HashElem switch_core_hash_first(SWIGTYPE_p_switch_hash hash) { - IntPtr cPtr = freeswitchPINVOKE.switch_core_hash_first(SWIGTYPE_p_switch_hash.getCPtr(hash)); - SWIGTYPE_p_HashElem ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_HashElem(cPtr, false); + public static SWIGTYPE_p_switch_hashtable_iterator switch_core_hash_first(SWIGTYPE_p_switch_hashtable hash) { + IntPtr cPtr = freeswitchPINVOKE.switch_core_hash_first(SWIGTYPE_p_switch_hashtable.getCPtr(hash)); + SWIGTYPE_p_switch_hashtable_iterator ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_switch_hashtable_iterator(cPtr, false); return ret; } - public static SWIGTYPE_p_HashElem switch_core_hash_next(SWIGTYPE_p_HashElem hi) { - IntPtr cPtr = freeswitchPINVOKE.switch_core_hash_next(SWIGTYPE_p_HashElem.getCPtr(hi)); - SWIGTYPE_p_HashElem ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_HashElem(cPtr, false); + public static SWIGTYPE_p_switch_hashtable_iterator switch_core_hash_next(SWIGTYPE_p_switch_hashtable_iterator hi) { + IntPtr cPtr = freeswitchPINVOKE.switch_core_hash_next(SWIGTYPE_p_switch_hashtable_iterator.getCPtr(hi)); + SWIGTYPE_p_switch_hashtable_iterator ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_switch_hashtable_iterator(cPtr, false); return ret; } - public static void switch_core_hash_this(SWIGTYPE_p_HashElem hi, SWIGTYPE_p_p_void key, SWIGTYPE_p_switch_ssize_t klen, SWIGTYPE_p_p_void val) { - freeswitchPINVOKE.switch_core_hash_this(SWIGTYPE_p_HashElem.getCPtr(hi), SWIGTYPE_p_p_void.getCPtr(key), SWIGTYPE_p_switch_ssize_t.getCPtr(klen), SWIGTYPE_p_p_void.getCPtr(val)); - } - - public static SWIGTYPE_p_HashElem switch_hash_first(string deprecate_me, SWIGTYPE_p_switch_hash hash) { - IntPtr cPtr = freeswitchPINVOKE.switch_hash_first(deprecate_me, SWIGTYPE_p_switch_hash.getCPtr(hash)); - SWIGTYPE_p_HashElem ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_HashElem(cPtr, false); - return ret; - } - - public static SWIGTYPE_p_HashElem switch_hash_next(SWIGTYPE_p_HashElem hi) { - IntPtr cPtr = freeswitchPINVOKE.switch_hash_next(SWIGTYPE_p_HashElem.getCPtr(hi)); - SWIGTYPE_p_HashElem ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_HashElem(cPtr, false); - return ret; - } - - public static void switch_hash_this(SWIGTYPE_p_HashElem hi, SWIGTYPE_p_p_void key, SWIGTYPE_p_switch_ssize_t klen, SWIGTYPE_p_p_void val) { - freeswitchPINVOKE.switch_hash_this(SWIGTYPE_p_HashElem.getCPtr(hi), SWIGTYPE_p_p_void.getCPtr(key), SWIGTYPE_p_switch_ssize_t.getCPtr(klen), SWIGTYPE_p_p_void.getCPtr(val)); + public static void switch_core_hash_this(SWIGTYPE_p_switch_hashtable_iterator hi, SWIGTYPE_p_p_void key, SWIGTYPE_p_switch_ssize_t klen, SWIGTYPE_p_p_void val) { + freeswitchPINVOKE.switch_core_hash_this(SWIGTYPE_p_switch_hashtable_iterator.getCPtr(hi), SWIGTYPE_p_p_void.getCPtr(key), SWIGTYPE_p_switch_ssize_t.getCPtr(klen), SWIGTYPE_p_p_void.getCPtr(val)); } public static switch_status_t switch_core_timer_init(switch_timer timer, string timer_name, int interval, int samples, SWIGTYPE_p_apr_pool_t pool) { @@ -2661,9 +2645,9 @@ public class freeswitch { return ret; } - public static SWIGTYPE_p_HashElem switch_core_mime_index() { + public static SWIGTYPE_p_switch_hashtable_iterator switch_core_mime_index() { IntPtr cPtr = freeswitchPINVOKE.switch_core_mime_index(); - SWIGTYPE_p_HashElem ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_HashElem(cPtr, false); + SWIGTYPE_p_switch_hashtable_iterator ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_switch_hashtable_iterator(cPtr, false); return ret; } @@ -5087,8 +5071,8 @@ public class freeswitch { freeswitchPINVOKE.switch_event_deliver(SWIGTYPE_p_p_switch_event.getCPtr(arg0)); } - public static string switch_event_build_param_string(switch_event arg0, string prefix, SWIGTYPE_p_switch_hash vars_map) { - string ret = freeswitchPINVOKE.switch_event_build_param_string(switch_event.getCPtr(arg0), prefix, SWIGTYPE_p_switch_hash.getCPtr(vars_map)); + public static string switch_event_build_param_string(switch_event arg0, string prefix, SWIGTYPE_p_switch_hashtable vars_map) { + string ret = freeswitchPINVOKE.switch_event_build_param_string(switch_event.getCPtr(arg0), prefix, SWIGTYPE_p_switch_hashtable.getCPtr(vars_map)); return ret; } @@ -6120,9 +6104,8 @@ public class freeswitch { freeswitchPINVOKE.switch_rtp_destroy(SWIGTYPE_p_p_switch_rtp.getCPtr(rtp_session)); } - public static switch_status_t switch_rtp_activate_ice(SWIGTYPE_p_switch_rtp rtp_session, string login, string rlogin, string password, string rpassword, ice_proto_t proto, SWIGTYPE_p_switch_core_media_ice_type_t type, ice_t ice_params) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_rtp_activate_ice(SWIGTYPE_p_switch_rtp.getCPtr(rtp_session), login, rlogin, password, rpassword, (int)proto, SWIGTYPE_p_switch_core_media_ice_type_t.getCPtr(type), ice_t.getCPtr(ice_params)); - if (freeswitchPINVOKE.SWIGPendingException.Pending) throw freeswitchPINVOKE.SWIGPendingException.Retrieve(); + public static switch_status_t switch_rtp_activate_ice(SWIGTYPE_p_switch_rtp rtp_session, string login, string rlogin, string password, string rpassword, ice_proto_t proto, switch_core_media_ice_type_t type, ice_t ice_params) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_rtp_activate_ice(SWIGTYPE_p_switch_rtp.getCPtr(rtp_session), login, rlogin, password, rpassword, (int)proto, (int)type, ice_t.getCPtr(ice_params)); return ret; } @@ -6297,8 +6280,8 @@ public class freeswitch { return ret; } - public static switch_status_t switch_rtp_set_payload_map(SWIGTYPE_p_switch_rtp rtp_session, SWIGTYPE_p_p_payload_map_t pmap) { - switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_rtp_set_payload_map(SWIGTYPE_p_switch_rtp.getCPtr(rtp_session), SWIGTYPE_p_p_payload_map_t.getCPtr(pmap)); + public static switch_status_t switch_rtp_set_payload_map(SWIGTYPE_p_switch_rtp rtp_session, SWIGTYPE_p_p_payload_map_s pmap) { + switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_rtp_set_payload_map(SWIGTYPE_p_switch_rtp.getCPtr(rtp_session), SWIGTYPE_p_p_payload_map_s.getCPtr(pmap)); return ret; } @@ -7113,8 +7096,6 @@ public class freeswitch { public static readonly int SWITCH_RTCP_MAX_BUF_LEN = freeswitchPINVOKE.SWITCH_RTCP_MAX_BUF_LEN_get(); public static readonly int SWITCH_RTP_MAX_BUF_LEN_WORDS = freeswitchPINVOKE.SWITCH_RTP_MAX_BUF_LEN_WORDS_get(); public static readonly int SWITCH_RTP_MAX_CRYPTO_LEN = freeswitchPINVOKE.SWITCH_RTP_MAX_CRYPTO_LEN_get(); - public static readonly int SWITCH_RTP_KEY_LEN = freeswitchPINVOKE.SWITCH_RTP_KEY_LEN_get(); - public static readonly string SWITCH_RTP_CRYPTO_KEY_32 = freeswitchPINVOKE.SWITCH_RTP_CRYPTO_KEY_32_get(); public static readonly string SWITCH_RTP_CRYPTO_KEY_80 = freeswitchPINVOKE.SWITCH_RTP_CRYPTO_KEY_80_get(); public static readonly int MAX_CAND = freeswitchPINVOKE.MAX_CAND_get(); public static readonly int SWITCH_XML_BUFSIZE = freeswitchPINVOKE.SWITCH_XML_BUFSIZE_get(); @@ -8765,6 +8746,156 @@ class freeswitchPINVOKE { [DllImport("mod_managed", EntryPoint="CSharp_delete_switch_loadable_module_function_table_t")] public static extern void delete_switch_loadable_module_function_table_t(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_type_set")] + public static extern void payload_map_t_type_set(HandleRef jarg1, int jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_type_get")] + public static extern int payload_map_t_type_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_sdp_type_set")] + public static extern void payload_map_t_sdp_type_set(HandleRef jarg1, int jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_sdp_type_get")] + public static extern int payload_map_t_sdp_type_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_ptime_set")] + public static extern void payload_map_t_ptime_set(HandleRef jarg1, uint jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_ptime_get")] + public static extern uint payload_map_t_ptime_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_rate_set")] + public static extern void payload_map_t_rate_set(HandleRef jarg1, uint jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_rate_get")] + public static extern uint payload_map_t_rate_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_allocated_set")] + public static extern void payload_map_t_allocated_set(HandleRef jarg1, byte jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_allocated_get")] + public static extern byte payload_map_t_allocated_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_negotiated_set")] + public static extern void payload_map_t_negotiated_set(HandleRef jarg1, byte jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_negotiated_get")] + public static extern byte payload_map_t_negotiated_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_current_set")] + public static extern void payload_map_t_current_set(HandleRef jarg1, byte jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_current_get")] + public static extern byte payload_map_t_current_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_hash_set")] + public static extern void payload_map_t_hash_set(HandleRef jarg1, uint jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_hash_get")] + public static extern uint payload_map_t_hash_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_rm_encoding_set")] + public static extern void payload_map_t_rm_encoding_set(HandleRef jarg1, string jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_rm_encoding_get")] + public static extern string payload_map_t_rm_encoding_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_iananame_set")] + public static extern void payload_map_t_iananame_set(HandleRef jarg1, string jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_iananame_get")] + public static extern string payload_map_t_iananame_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_pt_set")] + public static extern void payload_map_t_pt_set(HandleRef jarg1, byte jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_pt_get")] + public static extern byte payload_map_t_pt_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_rm_rate_set")] + public static extern void payload_map_t_rm_rate_set(HandleRef jarg1, uint jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_rm_rate_get")] + public static extern uint payload_map_t_rm_rate_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_adv_rm_rate_set")] + public static extern void payload_map_t_adv_rm_rate_set(HandleRef jarg1, uint jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_adv_rm_rate_get")] + public static extern uint payload_map_t_adv_rm_rate_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_codec_ms_set")] + public static extern void payload_map_t_codec_ms_set(HandleRef jarg1, uint jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_codec_ms_get")] + public static extern uint payload_map_t_codec_ms_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_bitrate_set")] + public static extern void payload_map_t_bitrate_set(HandleRef jarg1, uint jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_bitrate_get")] + public static extern uint payload_map_t_bitrate_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_rm_fmtp_set")] + public static extern void payload_map_t_rm_fmtp_set(HandleRef jarg1, string jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_rm_fmtp_get")] + public static extern string payload_map_t_rm_fmtp_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_agreed_pt_set")] + public static extern void payload_map_t_agreed_pt_set(HandleRef jarg1, byte jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_agreed_pt_get")] + public static extern byte payload_map_t_agreed_pt_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_recv_pt_set")] + public static extern void payload_map_t_recv_pt_set(HandleRef jarg1, byte jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_recv_pt_get")] + public static extern byte payload_map_t_recv_pt_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_fmtp_out_set")] + public static extern void payload_map_t_fmtp_out_set(HandleRef jarg1, string jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_fmtp_out_get")] + public static extern string payload_map_t_fmtp_out_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_remote_sdp_ip_set")] + public static extern void payload_map_t_remote_sdp_ip_set(HandleRef jarg1, string jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_remote_sdp_ip_get")] + public static extern string payload_map_t_remote_sdp_ip_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_remote_sdp_port_set")] + public static extern void payload_map_t_remote_sdp_port_set(HandleRef jarg1, ushort jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_remote_sdp_port_get")] + public static extern ushort payload_map_t_remote_sdp_port_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_channels_set")] + public static extern void payload_map_t_channels_set(HandleRef jarg1, int jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_channels_get")] + public static extern int payload_map_t_channels_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_adv_channels_set")] + public static extern void payload_map_t_adv_channels_set(HandleRef jarg1, int jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_adv_channels_get")] + public static extern int payload_map_t_adv_channels_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_next_set")] + public static extern void payload_map_t_next_set(HandleRef jarg1, HandleRef jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_payload_map_t_next_get")] + public static extern IntPtr payload_map_t_next_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_new_payload_map_t")] + public static extern IntPtr new_payload_map_t(); + + [DllImport("mod_managed", EntryPoint="CSharp_delete_payload_map_t")] + public static extern void delete_payload_map_t(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_core_db_close")] public static extern int switch_core_db_close(HandleRef jarg1); @@ -10131,7 +10262,7 @@ class freeswitchPINVOKE { public static extern int switch_core_session_recv_dtmf(HandleRef jarg1, HandleRef jarg2); [DllImport("mod_managed", EntryPoint="CSharp_switch_core_hash_init_case")] - public static extern int switch_core_hash_init_case(HandleRef jarg1, HandleRef jarg2, int jarg3); + public static extern int switch_core_hash_init_case(HandleRef jarg1, int jarg2); [DllImport("mod_managed", EntryPoint="CSharp_switch_core_hash_destroy")] public static extern int switch_core_hash_destroy(HandleRef jarg1); @@ -10175,15 +10306,6 @@ class freeswitchPINVOKE { [DllImport("mod_managed", EntryPoint="CSharp_switch_core_hash_this")] public static extern void switch_core_hash_this(HandleRef jarg1, HandleRef jarg2, HandleRef jarg3, HandleRef jarg4); - [DllImport("mod_managed", EntryPoint="CSharp_switch_hash_first")] - public static extern IntPtr switch_hash_first(string jarg1, HandleRef jarg2); - - [DllImport("mod_managed", EntryPoint="CSharp_switch_hash_next")] - public static extern IntPtr switch_hash_next(HandleRef jarg1); - - [DllImport("mod_managed", EntryPoint="CSharp_switch_hash_this")] - public static extern void switch_hash_this(HandleRef jarg1, HandleRef jarg2, HandleRef jarg3, HandleRef jarg4); - [DllImport("mod_managed", EntryPoint="CSharp_switch_core_timer_init")] public static extern int switch_core_timer_init(HandleRef jarg1, string jarg2, int jarg3, int jarg4, HandleRef jarg5); @@ -15914,15 +16036,33 @@ class freeswitchPINVOKE { [DllImport("mod_managed", EntryPoint="CSharp_SWITCH_RTP_MAX_CRYPTO_LEN_get")] public static extern int SWITCH_RTP_MAX_CRYPTO_LEN_get(); - [DllImport("mod_managed", EntryPoint="CSharp_SWITCH_RTP_KEY_LEN_get")] - public static extern int SWITCH_RTP_KEY_LEN_get(); - - [DllImport("mod_managed", EntryPoint="CSharp_SWITCH_RTP_CRYPTO_KEY_32_get")] - public static extern string SWITCH_RTP_CRYPTO_KEY_32_get(); - [DllImport("mod_managed", EntryPoint="CSharp_SWITCH_RTP_CRYPTO_KEY_80_get")] public static extern string SWITCH_RTP_CRYPTO_KEY_80_get(); + [DllImport("mod_managed", EntryPoint="CSharp_switch_srtp_crypto_suite_t_name_set")] + public static extern void switch_srtp_crypto_suite_t_name_set(HandleRef jarg1, string jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_srtp_crypto_suite_t_name_get")] + public static extern string switch_srtp_crypto_suite_t_name_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_srtp_crypto_suite_t_type_set")] + public static extern void switch_srtp_crypto_suite_t_type_set(HandleRef jarg1, int jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_srtp_crypto_suite_t_type_get")] + public static extern int switch_srtp_crypto_suite_t_type_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_srtp_crypto_suite_t_keylen_set")] + public static extern void switch_srtp_crypto_suite_t_keylen_set(HandleRef jarg1, int jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_srtp_crypto_suite_t_keylen_get")] + public static extern int switch_srtp_crypto_suite_t_keylen_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_new_switch_srtp_crypto_suite_t")] + public static extern IntPtr new_switch_srtp_crypto_suite_t(); + + [DllImport("mod_managed", EntryPoint="CSharp_delete_switch_srtp_crypto_suite_t")] + public static extern void delete_switch_srtp_crypto_suite_t(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_rtp_crypto_key_index_set")] public static extern void switch_rtp_crypto_key_index_set(HandleRef jarg1, uint jarg2); @@ -16155,7 +16295,7 @@ class freeswitchPINVOKE { public static extern void switch_rtp_destroy(HandleRef jarg1); [DllImport("mod_managed", EntryPoint="CSharp_switch_rtp_activate_ice")] - public static extern int switch_rtp_activate_ice(HandleRef jarg1, string jarg2, string jarg3, string jarg4, string jarg5, int jarg6, HandleRef jarg7, HandleRef jarg8); + public static extern int switch_rtp_activate_ice(HandleRef jarg1, string jarg2, string jarg3, string jarg4, string jarg5, int jarg6, int jarg7, HandleRef jarg8); [DllImport("mod_managed", EntryPoint="CSharp_switch_rtp_activate_rtcp")] public static extern int switch_rtp_activate_rtcp(HandleRef jarg1, int jarg2, ushort jarg3, int jarg4); @@ -18169,6 +18309,296 @@ namespace FreeSWITCH.Native { using System; using System.Runtime.InteropServices; +public class payload_map_t : IDisposable { + private HandleRef swigCPtr; + protected bool swigCMemOwn; + + internal payload_map_t(IntPtr cPtr, bool cMemoryOwn) { + swigCMemOwn = cMemoryOwn; + swigCPtr = new HandleRef(this, cPtr); + } + + internal static HandleRef getCPtr(payload_map_t obj) { + return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr; + } + + ~payload_map_t() { + Dispose(); + } + + public virtual void Dispose() { + lock(this) { + if (swigCPtr.Handle != IntPtr.Zero) { + if (swigCMemOwn) { + swigCMemOwn = false; + freeswitchPINVOKE.delete_payload_map_t(swigCPtr); + } + swigCPtr = new HandleRef(null, IntPtr.Zero); + } + GC.SuppressFinalize(this); + } + } + + public switch_media_type_t type { + set { + freeswitchPINVOKE.payload_map_t_type_set(swigCPtr, (int)value); + } + get { + switch_media_type_t ret = (switch_media_type_t)freeswitchPINVOKE.payload_map_t_type_get(swigCPtr); + return ret; + } + } + + public switch_sdp_type_t sdp_type { + set { + freeswitchPINVOKE.payload_map_t_sdp_type_set(swigCPtr, (int)value); + } + get { + switch_sdp_type_t ret = (switch_sdp_type_t)freeswitchPINVOKE.payload_map_t_sdp_type_get(swigCPtr); + return ret; + } + } + + public uint ptime { + set { + freeswitchPINVOKE.payload_map_t_ptime_set(swigCPtr, value); + } + get { + uint ret = freeswitchPINVOKE.payload_map_t_ptime_get(swigCPtr); + return ret; + } + } + + public uint rate { + set { + freeswitchPINVOKE.payload_map_t_rate_set(swigCPtr, value); + } + get { + uint ret = freeswitchPINVOKE.payload_map_t_rate_get(swigCPtr); + return ret; + } + } + + public byte allocated { + set { + freeswitchPINVOKE.payload_map_t_allocated_set(swigCPtr, value); + } + get { + byte ret = freeswitchPINVOKE.payload_map_t_allocated_get(swigCPtr); + return ret; + } + } + + public byte negotiated { + set { + freeswitchPINVOKE.payload_map_t_negotiated_set(swigCPtr, value); + } + get { + byte ret = freeswitchPINVOKE.payload_map_t_negotiated_get(swigCPtr); + return ret; + } + } + + public byte current { + set { + freeswitchPINVOKE.payload_map_t_current_set(swigCPtr, value); + } + get { + byte ret = freeswitchPINVOKE.payload_map_t_current_get(swigCPtr); + return ret; + } + } + + public uint hash { + set { + freeswitchPINVOKE.payload_map_t_hash_set(swigCPtr, value); + } + get { + uint ret = freeswitchPINVOKE.payload_map_t_hash_get(swigCPtr); + return ret; + } + } + + public string rm_encoding { + set { + freeswitchPINVOKE.payload_map_t_rm_encoding_set(swigCPtr, value); + } + get { + string ret = freeswitchPINVOKE.payload_map_t_rm_encoding_get(swigCPtr); + return ret; + } + } + + public string iananame { + set { + freeswitchPINVOKE.payload_map_t_iananame_set(swigCPtr, value); + } + get { + string ret = freeswitchPINVOKE.payload_map_t_iananame_get(swigCPtr); + return ret; + } + } + + public byte pt { + set { + freeswitchPINVOKE.payload_map_t_pt_set(swigCPtr, value); + } + get { + byte ret = freeswitchPINVOKE.payload_map_t_pt_get(swigCPtr); + return ret; + } + } + + public uint rm_rate { + set { + freeswitchPINVOKE.payload_map_t_rm_rate_set(swigCPtr, value); + } + get { + uint ret = freeswitchPINVOKE.payload_map_t_rm_rate_get(swigCPtr); + return ret; + } + } + + public uint adv_rm_rate { + set { + freeswitchPINVOKE.payload_map_t_adv_rm_rate_set(swigCPtr, value); + } + get { + uint ret = freeswitchPINVOKE.payload_map_t_adv_rm_rate_get(swigCPtr); + return ret; + } + } + + public uint codec_ms { + set { + freeswitchPINVOKE.payload_map_t_codec_ms_set(swigCPtr, value); + } + get { + uint ret = freeswitchPINVOKE.payload_map_t_codec_ms_get(swigCPtr); + return ret; + } + } + + public uint bitrate { + set { + freeswitchPINVOKE.payload_map_t_bitrate_set(swigCPtr, value); + } + get { + uint ret = freeswitchPINVOKE.payload_map_t_bitrate_get(swigCPtr); + return ret; + } + } + + public string rm_fmtp { + set { + freeswitchPINVOKE.payload_map_t_rm_fmtp_set(swigCPtr, value); + } + get { + string ret = freeswitchPINVOKE.payload_map_t_rm_fmtp_get(swigCPtr); + return ret; + } + } + + public byte agreed_pt { + set { + freeswitchPINVOKE.payload_map_t_agreed_pt_set(swigCPtr, value); + } + get { + byte ret = freeswitchPINVOKE.payload_map_t_agreed_pt_get(swigCPtr); + return ret; + } + } + + public byte recv_pt { + set { + freeswitchPINVOKE.payload_map_t_recv_pt_set(swigCPtr, value); + } + get { + byte ret = freeswitchPINVOKE.payload_map_t_recv_pt_get(swigCPtr); + return ret; + } + } + + public string fmtp_out { + set { + freeswitchPINVOKE.payload_map_t_fmtp_out_set(swigCPtr, value); + } + get { + string ret = freeswitchPINVOKE.payload_map_t_fmtp_out_get(swigCPtr); + return ret; + } + } + + public string remote_sdp_ip { + set { + freeswitchPINVOKE.payload_map_t_remote_sdp_ip_set(swigCPtr, value); + } + get { + string ret = freeswitchPINVOKE.payload_map_t_remote_sdp_ip_get(swigCPtr); + return ret; + } + } + + public ushort remote_sdp_port { + set { + freeswitchPINVOKE.payload_map_t_remote_sdp_port_set(swigCPtr, value); + } + get { + ushort ret = freeswitchPINVOKE.payload_map_t_remote_sdp_port_get(swigCPtr); + return ret; + } + } + + public int channels { + set { + freeswitchPINVOKE.payload_map_t_channels_set(swigCPtr, value); + } + get { + int ret = freeswitchPINVOKE.payload_map_t_channels_get(swigCPtr); + return ret; + } + } + + public int adv_channels { + set { + freeswitchPINVOKE.payload_map_t_adv_channels_set(swigCPtr, value); + } + get { + int ret = freeswitchPINVOKE.payload_map_t_adv_channels_get(swigCPtr); + return ret; + } + } + + public payload_map_t next { + set { + freeswitchPINVOKE.payload_map_t_next_set(swigCPtr, payload_map_t.getCPtr(value)); + } + get { + IntPtr cPtr = freeswitchPINVOKE.payload_map_t_next_get(swigCPtr); + payload_map_t ret = (cPtr == IntPtr.Zero) ? null : new payload_map_t(cPtr, false); + return ret; + } + } + + public payload_map_t() : this(freeswitchPINVOKE.new_payload_map_t(), true) { + } + +} + +} +/* ---------------------------------------------------------------------------- + * This file was automatically generated by SWIG (http://www.swig.org). + * Version 2.0.7 + * + * Do not make changes to this file unless you know what you are doing--modify + * the SWIG interface file instead. + * ----------------------------------------------------------------------------- */ + +namespace FreeSWITCH.Native { + +using System; +using System.Runtime.InteropServices; + public class profile_node_t : IDisposable { private HandleRef swigCPtr; protected bool swigCMemOwn; @@ -21237,36 +21667,6 @@ namespace FreeSWITCH.Native { using System; using System.Runtime.InteropServices; -public class SWIGTYPE_p_HashElem { - private HandleRef swigCPtr; - - internal SWIGTYPE_p_HashElem(IntPtr cPtr, bool futureUse) { - swigCPtr = new HandleRef(this, cPtr); - } - - protected SWIGTYPE_p_HashElem() { - swigCPtr = new HandleRef(null, IntPtr.Zero); - } - - internal static HandleRef getCPtr(SWIGTYPE_p_HashElem obj) { - return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr; - } -} - -} -/* ---------------------------------------------------------------------------- - * This file was automatically generated by SWIG (http://www.swig.org). - * Version 2.0.7 - * - * Do not make changes to this file unless you know what you are doing--modify - * the SWIG interface file instead. - * ----------------------------------------------------------------------------- */ - -namespace FreeSWITCH.Native { - -using System; -using System.Runtime.InteropServices; - public class SWIGTYPE_p_in6_addr { private HandleRef swigCPtr; @@ -21357,36 +21757,6 @@ namespace FreeSWITCH.Native { using System; using System.Runtime.InteropServices; -public class SWIGTYPE_p_payload_map_t { - private HandleRef swigCPtr; - - internal SWIGTYPE_p_payload_map_t(IntPtr cPtr, bool futureUse) { - swigCPtr = new HandleRef(this, cPtr); - } - - protected SWIGTYPE_p_payload_map_t() { - swigCPtr = new HandleRef(null, IntPtr.Zero); - } - - internal static HandleRef getCPtr(SWIGTYPE_p_payload_map_t obj) { - return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr; - } -} - -} -/* ---------------------------------------------------------------------------- - * This file was automatically generated by SWIG (http://www.swig.org). - * Version 2.0.7 - * - * Do not make changes to this file unless you know what you are doing--modify - * the SWIG interface file instead. - * ----------------------------------------------------------------------------- */ - -namespace FreeSWITCH.Native { - -using System; -using System.Runtime.InteropServices; - public class SWIGTYPE_p_p_char { private HandleRef swigCPtr; @@ -21477,18 +21847,18 @@ namespace FreeSWITCH.Native { using System; using System.Runtime.InteropServices; -public class SWIGTYPE_p_p_payload_map_t { +public class SWIGTYPE_p_p_payload_map_s { private HandleRef swigCPtr; - internal SWIGTYPE_p_p_payload_map_t(IntPtr cPtr, bool futureUse) { + internal SWIGTYPE_p_p_payload_map_s(IntPtr cPtr, bool futureUse) { swigCPtr = new HandleRef(this, cPtr); } - protected SWIGTYPE_p_p_payload_map_t() { + protected SWIGTYPE_p_p_payload_map_s() { swigCPtr = new HandleRef(null, IntPtr.Zero); } - internal static HandleRef getCPtr(SWIGTYPE_p_p_payload_map_t obj) { + internal static HandleRef getCPtr(SWIGTYPE_p_p_payload_map_s obj) { return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr; } } @@ -22077,18 +22447,18 @@ namespace FreeSWITCH.Native { using System; using System.Runtime.InteropServices; -public class SWIGTYPE_p_p_switch_hash { +public class SWIGTYPE_p_p_switch_hashtable { private HandleRef swigCPtr; - internal SWIGTYPE_p_p_switch_hash(IntPtr cPtr, bool futureUse) { + internal SWIGTYPE_p_p_switch_hashtable(IntPtr cPtr, bool futureUse) { swigCPtr = new HandleRef(this, cPtr); } - protected SWIGTYPE_p_p_switch_hash() { + protected SWIGTYPE_p_p_switch_hashtable() { swigCPtr = new HandleRef(null, IntPtr.Zero); } - internal static HandleRef getCPtr(SWIGTYPE_p_p_switch_hash obj) { + internal static HandleRef getCPtr(SWIGTYPE_p_p_switch_hashtable obj) { return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr; } } @@ -22977,36 +23347,6 @@ namespace FreeSWITCH.Native { using System; using System.Runtime.InteropServices; -public class SWIGTYPE_p_switch_core_media_ice_type_t { - private HandleRef swigCPtr; - - internal SWIGTYPE_p_switch_core_media_ice_type_t(IntPtr cPtr, bool futureUse) { - swigCPtr = new HandleRef(this, cPtr); - } - - protected SWIGTYPE_p_switch_core_media_ice_type_t() { - swigCPtr = new HandleRef(null, IntPtr.Zero); - } - - internal static HandleRef getCPtr(SWIGTYPE_p_switch_core_media_ice_type_t obj) { - return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr; - } -} - -} -/* ---------------------------------------------------------------------------- - * This file was automatically generated by SWIG (http://www.swig.org). - * Version 2.0.7 - * - * Do not make changes to this file unless you know what you are doing--modify - * the SWIG interface file instead. - * ----------------------------------------------------------------------------- */ - -namespace FreeSWITCH.Native { - -using System; -using System.Runtime.InteropServices; - public class SWIGTYPE_p_switch_core_port_allocator { private HandleRef swigCPtr; @@ -23127,18 +23467,48 @@ namespace FreeSWITCH.Native { using System; using System.Runtime.InteropServices; -public class SWIGTYPE_p_switch_hash { +public class SWIGTYPE_p_switch_hashtable { private HandleRef swigCPtr; - internal SWIGTYPE_p_switch_hash(IntPtr cPtr, bool futureUse) { + internal SWIGTYPE_p_switch_hashtable(IntPtr cPtr, bool futureUse) { swigCPtr = new HandleRef(this, cPtr); } - protected SWIGTYPE_p_switch_hash() { + protected SWIGTYPE_p_switch_hashtable() { swigCPtr = new HandleRef(null, IntPtr.Zero); } - internal static HandleRef getCPtr(SWIGTYPE_p_switch_hash obj) { + internal static HandleRef getCPtr(SWIGTYPE_p_switch_hashtable obj) { + return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr; + } +} + +} +/* ---------------------------------------------------------------------------- + * This file was automatically generated by SWIG (http://www.swig.org). + * Version 2.0.7 + * + * Do not make changes to this file unless you know what you are doing--modify + * the SWIG interface file instead. + * ----------------------------------------------------------------------------- */ + +namespace FreeSWITCH.Native { + +using System; +using System.Runtime.InteropServices; + +public class SWIGTYPE_p_switch_hashtable_iterator { + private HandleRef swigCPtr; + + internal SWIGTYPE_p_switch_hashtable_iterator(IntPtr cPtr, bool futureUse) { + swigCPtr = new HandleRef(this, cPtr); + } + + protected SWIGTYPE_p_switch_hashtable_iterator() { + swigCPtr = new HandleRef(null, IntPtr.Zero); + } + + internal static HandleRef getCPtr(SWIGTYPE_p_switch_hashtable_iterator obj) { return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr; } } @@ -26943,6 +27313,8 @@ public enum switch_channel_flag_t { CF_AUDIO_PAUSE, CF_VIDEO_PAUSE, CF_BYPASS_MEDIA_AFTER_HOLD, + CF_HANGUP_HELD, + CF_CONFERENCE_RESET_MEDIA, CF_FLAG_MAX } @@ -28587,6 +28959,23 @@ namespace FreeSWITCH.Native { namespace FreeSWITCH.Native { +public enum switch_core_media_ice_type_t { + ICE_GOOGLE_JINGLE = (1 << 0), + ICE_VANILLA = (1 << 1), + ICE_CONTROLLED = (1 << 2) +} + +} +/* ---------------------------------------------------------------------------- + * This file was automatically generated by SWIG (http://www.swig.org). + * Version 2.0.7 + * + * Do not make changes to this file unless you know what you are doing--modify + * the SWIG interface file instead. + * ----------------------------------------------------------------------------- */ + +namespace FreeSWITCH.Native { + using System; using System.Runtime.InteropServices; @@ -28892,6 +29281,7 @@ public enum switch_core_session_message_types_t { SWITCH_MESSAGE_ANSWER_EVENT, SWITCH_MESSAGE_PROGRESS_EVENT, SWITCH_MESSAGE_RING_EVENT, + SWITCH_MESSAGE_RESAMPLE_EVENT, SWITCH_MESSAGE_INVALID } @@ -32188,13 +32578,13 @@ public class switch_frame : IDisposable { } } - public SWIGTYPE_p_payload_map_t pmap { + public payload_map_t pmap { set { - freeswitchPINVOKE.switch_frame_pmap_set(swigCPtr, SWIGTYPE_p_payload_map_t.getCPtr(value)); + freeswitchPINVOKE.switch_frame_pmap_set(swigCPtr, payload_map_t.getCPtr(value)); } get { IntPtr cPtr = freeswitchPINVOKE.switch_frame_pmap_get(swigCPtr); - SWIGTYPE_p_payload_map_t ret = (cPtr == IntPtr.Zero) ? null : new SWIGTYPE_p_payload_map_t(cPtr, false); + payload_map_t ret = (cPtr == IntPtr.Zero) ? null : new payload_map_t(cPtr, false); return ret; } } @@ -35470,11 +35860,16 @@ public class switch_rtp_crypto_key : IDisposable { namespace FreeSWITCH.Native { public enum switch_rtp_crypto_key_type_t { - NO_CRYPTO, - AES_CM_128_HMAC_SHA1_80, - AES_CM_128_HMAC_SHA1_32, + AEAD_AES_256_GCM_8, + AEAD_AES_128_GCM_8, AES_CM_256_HMAC_SHA1_80, - AES_CM_128_NULL_AUTH + AES_CM_192_HMAC_SHA1_80, + AES_CM_128_HMAC_SHA1_80, + AES_CM_256_HMAC_SHA1_32, + AES_CM_192_HMAC_SHA1_32, + AES_CM_128_HMAC_SHA1_32, + AES_CM_128_NULL_AUTH, + CRYPTO_INVALID } } @@ -35527,6 +35922,7 @@ public enum switch_rtp_flag_t { SWITCH_RTP_FLAG_PAUSE, SWITCH_RTP_FLAG_FIR, SWITCH_RTP_FLAG_PLI, + SWITCH_RTP_FLAG_RESET, SWITCH_RTP_FLAG_INVALID } @@ -36676,6 +37072,22 @@ public class switch_scheduler_task : IDisposable { namespace FreeSWITCH.Native { +public enum switch_sdp_type_t { + SDP_TYPE_REQUEST, + SDP_TYPE_RESPONSE +} + +} +/* ---------------------------------------------------------------------------- + * This file was automatically generated by SWIG (http://www.swig.org). + * Version 2.0.7 + * + * Do not make changes to this file unless you know what you are doing--modify + * the SWIG interface file instead. + * ----------------------------------------------------------------------------- */ + +namespace FreeSWITCH.Native { + using System; using System.Runtime.InteropServices; @@ -37470,6 +37882,85 @@ public class switch_speech_interface : IDisposable { namespace FreeSWITCH.Native { +using System; +using System.Runtime.InteropServices; + +public class switch_srtp_crypto_suite_t : IDisposable { + private HandleRef swigCPtr; + protected bool swigCMemOwn; + + internal switch_srtp_crypto_suite_t(IntPtr cPtr, bool cMemoryOwn) { + swigCMemOwn = cMemoryOwn; + swigCPtr = new HandleRef(this, cPtr); + } + + internal static HandleRef getCPtr(switch_srtp_crypto_suite_t obj) { + return (obj == null) ? new HandleRef(null, IntPtr.Zero) : obj.swigCPtr; + } + + ~switch_srtp_crypto_suite_t() { + Dispose(); + } + + public virtual void Dispose() { + lock(this) { + if (swigCPtr.Handle != IntPtr.Zero) { + if (swigCMemOwn) { + swigCMemOwn = false; + freeswitchPINVOKE.delete_switch_srtp_crypto_suite_t(swigCPtr); + } + swigCPtr = new HandleRef(null, IntPtr.Zero); + } + GC.SuppressFinalize(this); + } + } + + public string name { + set { + freeswitchPINVOKE.switch_srtp_crypto_suite_t_name_set(swigCPtr, value); + } + get { + string ret = freeswitchPINVOKE.switch_srtp_crypto_suite_t_name_get(swigCPtr); + return ret; + } + } + + public switch_rtp_crypto_key_type_t type { + set { + freeswitchPINVOKE.switch_srtp_crypto_suite_t_type_set(swigCPtr, (int)value); + } + get { + switch_rtp_crypto_key_type_t ret = (switch_rtp_crypto_key_type_t)freeswitchPINVOKE.switch_srtp_crypto_suite_t_type_get(swigCPtr); + return ret; + } + } + + public int keylen { + set { + freeswitchPINVOKE.switch_srtp_crypto_suite_t_keylen_set(swigCPtr, value); + } + get { + int ret = freeswitchPINVOKE.switch_srtp_crypto_suite_t_keylen_get(swigCPtr); + return ret; + } + } + + public switch_srtp_crypto_suite_t() : this(freeswitchPINVOKE.new_switch_srtp_crypto_suite_t(), true) { + } + +} + +} +/* ---------------------------------------------------------------------------- + * This file was automatically generated by SWIG (http://www.swig.org). + * Version 2.0.7 + * + * Do not make changes to this file unless you know what you are doing--modify + * the SWIG interface file instead. + * ----------------------------------------------------------------------------- */ + +namespace FreeSWITCH.Native { + public enum switch_stack_t { SWITCH_STACK_BOTTOM = (1 << 0), SWITCH_STACK_TOP = (1 << 1), diff --git a/src/mod/languages/mod_perl/Makefile b/src/mod/languages/mod_perl/Makefile.am similarity index 57% rename from src/mod/languages/mod_perl/Makefile rename to src/mod/languages/mod_perl/Makefile.am index 9aa4629ade..97db131d85 100644 --- a/src/mod/languages/mod_perl/Makefile +++ b/src/mod/languages/mod_perl/Makefile.am @@ -1,14 +1,15 @@ -BASE=../../../.. -PERL = `which perl` -PERL_LIBDIR =-L$(shell perl -MConfig -e 'print $$Config{archlib}')/CORE -PERL_LIBS =$(shell perl -MConfig -e 'print $$Config{libs}') -LOCAL_CFLAGS= -w -DMULTIPLICITY $(shell $(PERL) -MExtUtils::Embed -e ccopts) -DEMBED_PERL -LOCAL_LDFLAGS=$(shell $(PERL) -MExtUtils::Embed -e ldopts) $(shell $(PERL) -MConfig -e 'print $$Config{libs}') -LOCAL_OBJS=freeswitch_perl.o mod_perl_wrap.o perlxsi.o -VERBOSE=1 - -include $(BASE)/build/modmake.rules +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_perl +PERL = perl +PERL_LIBDIR =-L`perl -MConfig -e 'print $$Config{archlib}'`/CORE +PERL_LIBS =`perl -MConfig -e 'print $$Config{libs}'` +mod_LTLIBRARIES = mod_perl.la +mod_perl_la_SOURCES = mod_perl.c freeswitch_perl.cpp mod_perl_wrap.cpp perlxsi.c +mod_perl_la_CFLAGS = $(AM_CFLAGS) -w +mod_perl_la_CPPFLAGS = -DMULTIPLICITY `$(PERL) -MExtUtils::Embed -e ccopts` -DEMBED_PERL -I$(switch_srcdir)/libs/stfu/ -I$(switch_srcdir)/libs/libteletone/src/ +mod_perl_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_perl_la_LDFLAGS = -avoid-version -module -no-undefined -shared `$(PERL) -MExtUtils::Embed -e ldopts` `$(PERL) -MConfig -e 'print $$Config{libs}'` reswig: swigclean mod_perl_wrap.cpp @@ -26,17 +27,17 @@ orig: mod_perl_wrap.cpp freeswitch.$(LIBTOOL_LIB_EXTEN): $(LOCAL_OBJS) $(LOCAL_LIBADD) $(CXXLINK) $(SOLINK) -o freeswitch.$(LIBTOOL_LIB_EXTEN) $(LOCAL_OBJS) $(LOCAL_LIBADD) $(LDFLAGS) -local_all: freeswitch.$(LIBTOOL_LIB_EXTEN) +BUILT_SOURCE=freeswitch.$(LIBTOOL_LIB_EXTEN) .perlok: @(${PERL} -V | grep -i usemultiplicity=define >/dev/null && echo Phew, You have the right perl.) \ || ((echo Sorry, you need to compile perl with threads and multiplicity.&& exit 1)) @touch .perlok -local_clean: +clean: rm -fr *~ .perlok .libs freeswitch.$(LIBTOOL_LIB_EXTEN) 2>/dev/null -depend_install: +install: mkdir -p $(DESTDIR)$(prefix)/perl $(LTINSTALL) freeswitch.$(LIBTOOL_LIB_EXTEN) freeswitch.pm $(DESTDIR)$(prefix)/perl if [ ! -f $(DESTDIR)$(prefix)/perl/freeswitch.pm ] ; then $(LTINSTALL) freeswitch.pm $(DESTDIR)$(prefix)/perl ; fi diff --git a/src/mod/languages/mod_python/Makefile.in b/src/mod/languages/mod_python/Makefile.am similarity index 57% rename from src/mod/languages/mod_python/Makefile.in rename to src/mod/languages/mod_python/Makefile.am index 559af05cfd..42ee2d9121 100644 --- a/src/mod/languages/mod_python/Makefile.in +++ b/src/mod/languages/mod_python/Makefile.am @@ -1,14 +1,5 @@ -# define these targets in your makefile if you wish -# local_all local_depend local_clean depend_install local_install local_distclean local_extraclean: - -# and define these variables to impact your build - -LOCAL_CFLAGS = @PYTHON_CFLAGS@ -LOCAL_LDFLAGS= @PYTHON_LDFLAGS@ -LOCAL_OBJS=freeswitch_python.o mod_python_wrap.o -include ../../../../build/modmake.rules - -LINK=$(CXXLINK) +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_python PYMOD=freeswitch PYTHON_SITE_DIR=@PYTHON_SITE_DIR@ @@ -16,6 +7,13 @@ PYTHON_SITE_DIR=@PYTHON_SITE_DIR@ SWIGCFILE=../../../switch_swig.c SWIGIFILE=../../../switch_swig.i +mod_LTLIBRARIES = mod_python.la +mod_python_la_SOURCES = mod_python.c freeswitch_python.cpp mod_python_wrap.cpp +mod_python_la_CFLAGS = $(AM_CFLAGS) +mod_python_la_CPPFLAGS = @PYTHON_CFLAGS@ -I$(switch_srcdir)/libs/stfu/ -I$(switch_srcdir)/libs/libteletone/src/ +mod_python_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_python_la_LDFLAGS = -avoid-version -module -no-undefined -shared @PYTHON_LDFLAGS@ + reswig: swigclean mod_python_wrap.cpp swigclean: clean @@ -26,7 +24,7 @@ mod_python_wrap.cpp: mod_python_extra.c hack.diff which swig 2>&1 >>/dev/null && echo "#include \"mod_python_extra.c\"" >> mod_python_wrap.cpp which swig 2>&1 >>/dev/null && patch -s -p0 -i hack.diff -local_install: +install: mkdir -m755 -p $(DESTDIR)$(PYTHON_SITE_DIR) cp -f freeswitch.py $(DESTDIR)$(PYTHON_SITE_DIR) diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c index 47baa2df79..20fc464420 100644 --- a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c +++ b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c @@ -1040,8 +1040,8 @@ static switch_status_t load_modules(void) memset(&module_manager, 0, sizeof(module_manager)); switch_core_new_memory_pool(&module_manager.pool); - switch_core_hash_init(&module_manager.mod_hash, module_manager.pool); - switch_core_hash_init(&module_manager.load_hash, module_manager.pool); + switch_core_hash_init(&module_manager.mod_hash); + switch_core_hash_init(&module_manager.load_hash); if ((xml = switch_xml_open_cfg(cf, &cfg, NULL))) { switch_xml_t mods, ld; diff --git a/src/mod/languages/mod_v8/Makefile.am b/src/mod/languages/mod_v8/Makefile.am index 7355a47251..59181650a3 100644 --- a/src/mod/languages/mod_v8/Makefile.am +++ b/src/mod/languages/mod_v8/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/build/modmake.rulesam -AUTOMAKE_OPTIONS = foreign +AUTOMAKE_OPTIONS += foreign # V8 version to use V8=v8-3.24.14 diff --git a/src/mod/languages/mod_v8/mod_v8.cpp b/src/mod/languages/mod_v8/mod_v8.cpp index c59a1746fb..822957825b 100644 --- a/src/mod/languages/mod_v8/mod_v8.cpp +++ b/src/mod/languages/mod_v8/mod_v8.cpp @@ -269,7 +269,7 @@ static switch_status_t load_modules(void) switch_core_new_memory_pool(&module_manager.pool); - switch_core_hash_init(&module_manager.load_hash, module_manager.pool); + switch_core_hash_init(&module_manager.load_hash); if ((xml = switch_xml_open_cfg(cf, &cfg, NULL))) { switch_xml_t mods, ld; diff --git a/src/mod/languages/mod_v8/src/fseventhandler.cpp b/src/mod/languages/mod_v8/src/fseventhandler.cpp index a60d583d7d..f72cf2bb97 100644 --- a/src/mod/languages/mod_v8/src/fseventhandler.cpp +++ b/src/mod/languages/mod_v8/src/fseventhandler.cpp @@ -77,7 +77,7 @@ void FSEventHandler::Init() } switch_mutex_init(&_mutex, SWITCH_MUTEX_NESTED, _pool); - switch_core_hash_init(&_event_hash, _pool); + switch_core_hash_init(&_event_hash); switch_queue_create(&_event_queue, MAX_QUEUE_LEN, _pool); _filters = NULL; diff --git a/src/mod/languages/mod_v8/src/fsxml.cpp b/src/mod/languages/mod_v8/src/fsxml.cpp index e9f09ca1f1..2d96f80eb7 100644 --- a/src/mod/languages/mod_v8/src/fsxml.cpp +++ b/src/mod/languages/mod_v8/src/fsxml.cpp @@ -77,7 +77,7 @@ void FSXML::InitRootObject() { /* Create hash and pool - for the root object only */ if (switch_core_new_memory_pool(&_pool) == SWITCH_STATUS_SUCCESS && _pool) { - if (switch_core_hash_init(&_obj_hash, _pool) != SWITCH_STATUS_SUCCESS) { + if (switch_core_hash_init(&_obj_hash) != SWITCH_STATUS_SUCCESS) { switch_core_destroy_memory_pool(&_pool); _obj_hash = NULL; _pool = NULL; @@ -198,12 +198,12 @@ void FSXML::DestroyHash() } /* First destroy all objects in the hash */ - for (hi = switch_hash_first(NULL, tmp); hi; hi = switch_hash_next(hi)) { + for (hi = switch_core_hash_first( tmp); hi; hi = switch_core_hash_next(hi)) { const void *var = NULL; void *val = NULL; FSXML *obj; - switch_hash_this(hi, &var, NULL, &val); + switch_core_hash_this(hi, &var, NULL, &val); if (val) { obj = static_cast(val); diff --git a/src/mod/languages/mod_yaml/Makefile b/src/mod/languages/mod_yaml/Makefile deleted file mode 100644 index 57a594a030..0000000000 --- a/src/mod/languages/mod_yaml/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -BASE=../../../.. - -YAMLLIB=$(switch_srcdir)/libs/yaml -YAMLBUILDLIB=$(switch_builddir)/libs/yaml -LIBYAML_A=$(YAMLBUILDLIB)/src/.libs/libyaml.a -LOCAL_CFLAGS=-I$(YAMLLIB)/include -LOCAL_LIBADD=$(LIBYAML_A) -VERBOSE=1 - -include $(BASE)/build/modmake.rules - -local_depend: $(LIBYAML_A) - -$(LIBYAML_A): - mkdir -p $(YAMLBUILDLIB) - cd $(YAMLBUILDLIB) && $(DEFAULT_VARS) $(YAMLLIB)/configure $(DEFAULT_ARGS) --srcdir=$(YAMLLIB) - cd $(YAMLBUILDLIB) && $(MAKE) - -yamlclean: - cd $(YAMLBUILDLIB) && $(MAKE) clean - diff --git a/src/mod/languages/mod_yaml/Makefile.am b/src/mod/languages/mod_yaml/Makefile.am new file mode 100644 index 0000000000..8081dbceb4 --- /dev/null +++ b/src/mod/languages/mod_yaml/Makefile.am @@ -0,0 +1,23 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_yaml + +YAMLLIB=$(switch_srcdir)/libs/yaml +YAMLBUILDLIB=$(switch_builddir)/libs/yaml +LIBYAML_A=$(YAMLBUILDLIB)/src/.libs/libyaml.a + +mod_LTLIBRARIES = mod_yaml.la +mod_yaml_la_SOURCES = mod_yaml.c +mod_yaml_la_CFLAGS = $(AM_CFLAGS) -I$(YAMLLIB)/include +mod_yaml_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(LIBYAML_A) +mod_yaml_la_LDFLAGS = -avoid-version -module -no-undefined -shared + +BUILT_SOURCES=$(LIBYAML_A) + +$(LIBYAML_A): + mkdir -p $(YAMLBUILDLIB) + cd $(YAMLBUILDLIB) && $(DEFAULT_VARS) $(YAMLLIB)/configure $(DEFAULT_ARGS) --srcdir=$(YAMLLIB) --with-pic + cd $(YAMLBUILDLIB) && $(MAKE) + +yamlclean: + cd $(YAMLBUILDLIB) && $(MAKE) clean + diff --git a/src/mod/loggers/mod_console/Makefile.am b/src/mod/loggers/mod_console/Makefile.am new file mode 100644 index 0000000000..2e8929831c --- /dev/null +++ b/src/mod/loggers/mod_console/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_console + +mod_LTLIBRARIES = mod_console.la +mod_console_la_SOURCES = mod_console.c +mod_console_la_CFLAGS = $(AM_CFLAGS) +mod_console_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_console_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/loggers/mod_console/mod_console.c b/src/mod/loggers/mod_console/mod_console.c index a44fc47f0b..a01d1c9b7d 100644 --- a/src/mod/loggers/mod_console/mod_console.c +++ b/src/mod/loggers/mod_console/mod_console.c @@ -107,7 +107,7 @@ static switch_status_t config_logger(void) switch_core_hash_destroy(&log_hash); } - switch_core_hash_init(&log_hash, module_pool); + switch_core_hash_init(&log_hash); if ((settings = switch_xml_child(cfg, "mappings"))) { for (param = switch_xml_child(settings, "param"); param; param = param->next) { diff --git a/src/mod/loggers/mod_logfile/Makefile.am b/src/mod/loggers/mod_logfile/Makefile.am new file mode 100644 index 0000000000..d1acc68079 --- /dev/null +++ b/src/mod/loggers/mod_logfile/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_logfile + +mod_LTLIBRARIES = mod_logfile.la +mod_logfile_la_SOURCES = mod_logfile.c +mod_logfile_la_CFLAGS = $(AM_CFLAGS) +mod_logfile_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_logfile_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/loggers/mod_logfile/mod_logfile.c b/src/mod/loggers/mod_logfile/mod_logfile.c index ab85dc5f16..da5850c9cc 100644 --- a/src/mod/loggers/mod_logfile/mod_logfile.c +++ b/src/mod/loggers/mod_logfile/mod_logfile.c @@ -264,11 +264,11 @@ static switch_status_t process_node(const switch_log_node_t *node, switch_log_le const void *var; logfile_profile_t *profile; - for (hi = switch_hash_first(NULL, profile_hash); hi; hi = switch_hash_next(hi)) { + for (hi = switch_core_hash_first( profile_hash); hi; hi = switch_core_hash_next(hi)) { size_t mask = 0; size_t ok = 0; - switch_hash_this(hi, &var, NULL, &val); + switch_core_hash_this(hi, &var, NULL, &val); profile = val; ok = switch_log_check_mask(profile->all_level, level); @@ -321,7 +321,7 @@ static switch_status_t load_profile(switch_xml_t xml) new_profile = switch_core_alloc(module_pool, sizeof(*new_profile)); memset(new_profile, 0, sizeof(*new_profile)); - switch_core_hash_init(&(new_profile->log_hash), module_pool); + switch_core_hash_init(&(new_profile->log_hash)); new_profile->name = switch_core_strdup(module_pool, switch_str_nil(name)); new_profile->suffix = 1; @@ -380,15 +380,15 @@ static void event_handler(switch_event_t *event) if (sig && !strcmp(sig, "HUP")) { if (globals.rotate) { - for (hi = switch_hash_first(NULL, profile_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, &var, NULL, &val); + for (hi = switch_core_hash_first( profile_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, &var, NULL, &val); profile = val; mod_logfile_rotate(profile); } } else { switch_mutex_lock(globals.mutex); - for (hi = switch_hash_first(NULL, profile_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, &var, NULL, &val); + for (hi = switch_core_hash_first( profile_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, &var, NULL, &val); profile = val; switch_file_close(profile->log_afd); if (mod_logfile_openlogfile(profile, SWITCH_TRUE) != SWITCH_STATUS_SUCCESS) { @@ -413,7 +413,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_logfile_load) if (profile_hash) { switch_core_hash_destroy(&profile_hash); } - switch_core_hash_init(&profile_hash, module_pool); + switch_core_hash_init(&profile_hash); if (switch_event_bind_removable(modname, SWITCH_EVENT_TRAP, SWITCH_EVENT_SUBCLASS_ANY, event_handler, NULL, &globals.node) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n"); @@ -461,9 +461,9 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_logfile_shutdown) switch_log_unbind_logger(mod_logfile_logger); switch_event_unbind(&globals.node); - for (hi = switch_hash_first(NULL, profile_hash); hi; hi = switch_hash_next(hi)) { + for (hi = switch_core_hash_first( profile_hash); hi; hi = switch_core_hash_next(hi)) { logfile_profile_t *profile; - switch_hash_this(hi, &var, NULL, &val); + switch_core_hash_this(hi, &var, NULL, &val); if ((profile = (logfile_profile_t *) val)) { switch_file_close(profile->log_afd); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Closing %s\n", profile->logfile); diff --git a/src/mod/loggers/mod_syslog/Makefile.am b/src/mod/loggers/mod_syslog/Makefile.am new file mode 100644 index 0000000000..20f8dbcf16 --- /dev/null +++ b/src/mod/loggers/mod_syslog/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_syslog + +mod_LTLIBRARIES = mod_syslog.la +mod_syslog_la_SOURCES = mod_syslog.c +mod_syslog_la_CFLAGS = $(AM_CFLAGS) +mod_syslog_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_syslog_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/say/mod_say_de/Makefile.am b/src/mod/say/mod_say_de/Makefile.am new file mode 100644 index 0000000000..93d9a9fadc --- /dev/null +++ b/src/mod/say/mod_say_de/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_say_de + +mod_LTLIBRARIES = mod_say_de.la +mod_say_de_la_SOURCES = mod_say_de.c +mod_say_de_la_CFLAGS = $(AM_CFLAGS) +mod_say_de_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_say_de_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/say/mod_say_en/Makefile.am b/src/mod/say/mod_say_en/Makefile.am new file mode 100644 index 0000000000..d82bc970c1 --- /dev/null +++ b/src/mod/say/mod_say_en/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_say_en + +mod_LTLIBRARIES = mod_say_en.la +mod_say_en_la_SOURCES = mod_say_en.c +mod_say_en_la_CFLAGS = $(AM_CFLAGS) +mod_say_en_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_say_en_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/say/mod_say_es/Makefile.am b/src/mod/say/mod_say_es/Makefile.am new file mode 100644 index 0000000000..343f8d0e03 --- /dev/null +++ b/src/mod/say/mod_say_es/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_say_es + +mod_LTLIBRARIES = mod_say_es.la +mod_say_es_la_SOURCES = mod_say_es.c +mod_say_es_la_CFLAGS = $(AM_CFLAGS) +mod_say_es_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_say_es_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/say/mod_say_fa/Makefile.am b/src/mod/say/mod_say_fa/Makefile.am new file mode 100644 index 0000000000..5ecc970fb2 --- /dev/null +++ b/src/mod/say/mod_say_fa/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_say_fa + +mod_LTLIBRARIES = mod_say_fa.la +mod_say_fa_la_SOURCES = mod_say_fa.c +mod_say_fa_la_CFLAGS = $(AM_CFLAGS) +mod_say_fa_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_say_fa_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/say/mod_say_fr/Makefile.am b/src/mod/say/mod_say_fr/Makefile.am new file mode 100644 index 0000000000..dcc1738f71 --- /dev/null +++ b/src/mod/say/mod_say_fr/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_say_fr + +mod_LTLIBRARIES = mod_say_fr.la +mod_say_fr_la_SOURCES = mod_say_fr.c +mod_say_fr_la_CFLAGS = $(AM_CFLAGS) +mod_say_fr_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_say_fr_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/say/mod_say_he/Makefile b/src/mod/say/mod_say_he/Makefile deleted file mode 100644 index 2c35e6e98f..0000000000 --- a/src/mod/say/mod_say_he/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -BASE=../../../.. -include $(BASE)/build/modmake.rules diff --git a/src/mod/say/mod_say_he/Makefile.am b/src/mod/say/mod_say_he/Makefile.am new file mode 100644 index 0000000000..585c8ed473 --- /dev/null +++ b/src/mod/say/mod_say_he/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_say_he + +mod_LTLIBRARIES = mod_say_he.la +mod_say_he_la_SOURCES = mod_say_he.c +mod_say_he_la_CFLAGS = $(AM_CFLAGS) +mod_say_he_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_say_he_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/say/mod_say_hr/Makefile b/src/mod/say/mod_say_hr/Makefile deleted file mode 100644 index 2c35e6e98f..0000000000 --- a/src/mod/say/mod_say_hr/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -BASE=../../../.. -include $(BASE)/build/modmake.rules diff --git a/src/mod/say/mod_say_hr/Makefile.am b/src/mod/say/mod_say_hr/Makefile.am new file mode 100644 index 0000000000..e22da4eb76 --- /dev/null +++ b/src/mod/say/mod_say_hr/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_say_hr + +mod_LTLIBRARIES = mod_say_hr.la +mod_say_hr_la_SOURCES = mod_say_hr.c +mod_say_hr_la_CFLAGS = $(AM_CFLAGS) +mod_say_hr_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_say_hr_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/say/mod_say_hu/Makefile b/src/mod/say/mod_say_hu/Makefile deleted file mode 100644 index 2c35e6e98f..0000000000 --- a/src/mod/say/mod_say_hu/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -BASE=../../../.. -include $(BASE)/build/modmake.rules diff --git a/src/mod/say/mod_say_hu/Makefile.am b/src/mod/say/mod_say_hu/Makefile.am new file mode 100644 index 0000000000..bae6c18126 --- /dev/null +++ b/src/mod/say/mod_say_hu/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_say_hu + +mod_LTLIBRARIES = mod_say_hu.la +mod_say_hu_la_SOURCES = mod_say_hu.c +mod_say_hu_la_CFLAGS = $(AM_CFLAGS) +mod_say_hu_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_say_hu_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/say/mod_say_it/Makefile.am b/src/mod/say/mod_say_it/Makefile.am new file mode 100644 index 0000000000..08227c79a7 --- /dev/null +++ b/src/mod/say/mod_say_it/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_say_it + +mod_LTLIBRARIES = mod_say_it.la +mod_say_it_la_SOURCES = mod_say_it.c +mod_say_it_la_CFLAGS = $(AM_CFLAGS) +mod_say_it_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_say_it_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/say/mod_say_ja/Makefile.am b/src/mod/say/mod_say_ja/Makefile.am new file mode 100644 index 0000000000..098c789ebc --- /dev/null +++ b/src/mod/say/mod_say_ja/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_say_ja + +mod_LTLIBRARIES = mod_say_ja.la +mod_say_ja_la_SOURCES = mod_say_ja.c +mod_say_ja_la_CFLAGS = $(AM_CFLAGS) +mod_say_ja_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_say_ja_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/say/mod_say_nl/Makefile.am b/src/mod/say/mod_say_nl/Makefile.am new file mode 100644 index 0000000000..50271e0ebb --- /dev/null +++ b/src/mod/say/mod_say_nl/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_say_nl + +mod_LTLIBRARIES = mod_say_nl.la +mod_say_nl_la_SOURCES = mod_say_nl.c +mod_say_nl_la_CFLAGS = $(AM_CFLAGS) +mod_say_nl_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_say_nl_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/say/mod_say_pl/Makefile b/src/mod/say/mod_say_pl/Makefile deleted file mode 100644 index 2c35e6e98f..0000000000 --- a/src/mod/say/mod_say_pl/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -BASE=../../../.. -include $(BASE)/build/modmake.rules diff --git a/src/mod/say/mod_say_pl/Makefile.am b/src/mod/say/mod_say_pl/Makefile.am new file mode 100644 index 0000000000..9ba9a38ad0 --- /dev/null +++ b/src/mod/say/mod_say_pl/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_say_pl + +mod_LTLIBRARIES = mod_say_pl.la +mod_say_pl_la_SOURCES = mod_say_pl.c +mod_say_pl_la_CFLAGS = $(AM_CFLAGS) +mod_say_pl_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_say_pl_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/say/mod_say_pt/Makefile b/src/mod/say/mod_say_pt/Makefile deleted file mode 100644 index 2c35e6e98f..0000000000 --- a/src/mod/say/mod_say_pt/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -BASE=../../../.. -include $(BASE)/build/modmake.rules diff --git a/src/mod/say/mod_say_pt/Makefile.am b/src/mod/say/mod_say_pt/Makefile.am new file mode 100644 index 0000000000..7cc7821a9a --- /dev/null +++ b/src/mod/say/mod_say_pt/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_say_pt + +mod_LTLIBRARIES = mod_say_pt.la +mod_say_pt_la_SOURCES = mod_say_pt.c +mod_say_pt_la_CFLAGS = $(AM_CFLAGS) +mod_say_pt_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_say_pt_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/say/mod_say_ru/Makefile.am b/src/mod/say/mod_say_ru/Makefile.am new file mode 100644 index 0000000000..d10896d817 --- /dev/null +++ b/src/mod/say/mod_say_ru/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_say_ru + +mod_LTLIBRARIES = mod_say_ru.la +mod_say_ru_la_SOURCES = mod_say_ru.c +mod_say_ru_la_CFLAGS = $(AM_CFLAGS) +mod_say_ru_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_say_ru_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/say/mod_say_sv/Makefile b/src/mod/say/mod_say_sv/Makefile deleted file mode 100644 index 2c35e6e98f..0000000000 --- a/src/mod/say/mod_say_sv/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -BASE=../../../.. -include $(BASE)/build/modmake.rules diff --git a/src/mod/say/mod_say_sv/Makefile.am b/src/mod/say/mod_say_sv/Makefile.am new file mode 100644 index 0000000000..b96978554a --- /dev/null +++ b/src/mod/say/mod_say_sv/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_say_sv + +mod_LTLIBRARIES = mod_say_sv.la +mod_say_sv_la_SOURCES = mod_say_sv.c +mod_say_sv_la_CFLAGS = $(AM_CFLAGS) +mod_say_sv_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_say_sv_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/say/mod_say_th/Makefile.am b/src/mod/say/mod_say_th/Makefile.am new file mode 100644 index 0000000000..7bba01737d --- /dev/null +++ b/src/mod/say/mod_say_th/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_say_th + +mod_LTLIBRARIES = mod_say_th.la +mod_say_th_la_SOURCES = mod_say_th.c +mod_say_th_la_CFLAGS = $(AM_CFLAGS) +mod_say_th_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_say_th_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/say/mod_say_zh/Makefile.am b/src/mod/say/mod_say_zh/Makefile.am new file mode 100644 index 0000000000..d64ef62418 --- /dev/null +++ b/src/mod/say/mod_say_zh/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_say_zh + +mod_LTLIBRARIES = mod_say_zh.la +mod_say_zh_la_SOURCES = mod_say_zh.c +mod_say_zh_la_CFLAGS = $(AM_CFLAGS) +mod_say_zh_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_say_zh_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/timers/mod_posix_timer/Makefile.am b/src/mod/timers/mod_posix_timer/Makefile.am new file mode 100644 index 0000000000..80c828f4bc --- /dev/null +++ b/src/mod/timers/mod_posix_timer/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_posix_timer + +mod_LTLIBRARIES = mod_posix_timer.la +mod_posix_timer_la_SOURCES = mod_posix_timer.c +mod_posix_timer_la_CFLAGS = $(AM_CFLAGS) +mod_posix_timer_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_posix_timer_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/timers/mod_timerfd/Makefile.am b/src/mod/timers/mod_timerfd/Makefile.am new file mode 100644 index 0000000000..09c57fb884 --- /dev/null +++ b/src/mod/timers/mod_timerfd/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_timerfd + +mod_LTLIBRARIES = mod_timerfd.la +mod_timerfd_la_SOURCES = mod_timerfd.c +mod_timerfd_la_CFLAGS = $(AM_CFLAGS) +mod_timerfd_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_timerfd_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/xml_int/mod_xml_cdr/Makefile b/src/mod/xml_int/mod_xml_cdr/Makefile deleted file mode 100644 index c2baec83cd..0000000000 --- a/src/mod/xml_int/mod_xml_cdr/Makefile +++ /dev/null @@ -1 +0,0 @@ -include ../../../../build/modmake.rules diff --git a/src/mod/xml_int/mod_xml_cdr/Makefile.am b/src/mod/xml_int/mod_xml_cdr/Makefile.am new file mode 100644 index 0000000000..cd8cf88f53 --- /dev/null +++ b/src/mod/xml_int/mod_xml_cdr/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_xml_cdr + +mod_LTLIBRARIES = mod_xml_cdr.la +mod_xml_cdr_la_SOURCES = mod_xml_cdr.c +mod_xml_cdr_la_CFLAGS = $(AM_CFLAGS) +mod_xml_cdr_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_xml_cdr_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c b/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c index e00b5ff7c0..d2bc69cde0 100644 --- a/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c +++ b/src/mod/xml_int/mod_xml_cdr/mod_xml_cdr.c @@ -30,8 +30,8 @@ * mod_xml_cdr.c -- XML CDR Module to files or curl * */ -#include #include +#include #include #define MAX_URLS 20 diff --git a/src/mod/xml_int/mod_xml_curl/Makefile b/src/mod/xml_int/mod_xml_curl/Makefile deleted file mode 100644 index c2baec83cd..0000000000 --- a/src/mod/xml_int/mod_xml_curl/Makefile +++ /dev/null @@ -1 +0,0 @@ -include ../../../../build/modmake.rules diff --git a/src/mod/xml_int/mod_xml_curl/Makefile.am b/src/mod/xml_int/mod_xml_curl/Makefile.am new file mode 100644 index 0000000000..2e7ccff8a4 --- /dev/null +++ b/src/mod/xml_int/mod_xml_curl/Makefile.am @@ -0,0 +1,8 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_xml_curl + +mod_LTLIBRARIES = mod_xml_curl.la +mod_xml_curl_la_SOURCES = mod_xml_curl.c +mod_xml_curl_la_CFLAGS = $(AM_CFLAGS) +mod_xml_curl_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_xml_curl_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c b/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c index 7202d0d83a..d55ae9989e 100644 --- a/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c +++ b/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c @@ -432,7 +432,7 @@ static switch_status_t do_config(void) use_dynamic_url = 1; } else if (!strcasecmp(var, "enable-post-var")) { if (!vars_map && need_vars_map == 0) { - if (switch_core_hash_init(&vars_map, globals.pool) != SWITCH_STATUS_SUCCESS) { + if (switch_core_hash_init(&vars_map) != SWITCH_STATUS_SUCCESS) { need_vars_map = -1; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Can't init params hash!\n"); continue; diff --git a/src/mod/xml_int/mod_xml_ldap/Makefile b/src/mod/xml_int/mod_xml_ldap/Makefile.am similarity index 52% rename from src/mod/xml_int/mod_xml_ldap/Makefile rename to src/mod/xml_int/mod_xml_ldap/Makefile.am index 7978fb5cf3..329d0f3a95 100644 --- a/src/mod/xml_int/mod_xml_ldap/Makefile +++ b/src/mod/xml_int/mod_xml_ldap/Makefile.am @@ -1,4 +1,5 @@ -BASE=../../../.. +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_xml_ldap LDAP=openldap-2.4.19 LDAP_DIR=$(switch_srcdir)/libs/$(LDAP) @@ -8,13 +9,15 @@ LDAPLA=$(LDAP_BUILDDIR)/libraries/libldap_r/libldap_r.la LIBLBERLA=$(LDAP_BUILDDIR)/libraries/liblber/liblber.la LIBLUTILA=$(LDAP_BUILDDIR)/libraries/liblutil/liblutil.a -LOCAL_CFLAGS=-DWITH_OPENLDAP -DLDAP_DEPRECATED -I$(LDAP_DIR)/include +mod_LTLIBRARIES = mod_xml_ldap.la +mod_xml_ldap_la_SOURCES = mod_xml_ldap.c +mod_xml_ldap_la_CFLAGS = $(AM_CFLAGS) -DWITH_OPENLDAP -DLDAP_DEPRECATED -I$(LDAP_DIR)/include +mod_xml_ldap_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(LDAPLA) $(LIBLBERLA) $(LIBLUTILA) +mod_xml_ldap_la_LDFLAGS = -avoid-version -module -no-undefined -shared -LOCAL_LIBADD=$(LDAPLA) $(LIBLBERLA) $(LIBLUTILA) +BUILT_SOURCES=$(LDAPLA) $(LIBLBERLA) $(LIBLUTILA) -include $(BASE)/build/modmake.rules - -DEFAULT_ARGS+= --disable-slapd --disable-slurpd --disable-relay --disable-bdb --disable-hdb +DEFAULT_ARGS= --disable-slapd --disable-slurpd --disable-relay --disable-bdb --disable-hdb $(LDAP_DIR): $(GETLIB) $(LDAP).tar.gz diff --git a/src/mod/applications/mod_rad_auth/Makefile b/src/mod/xml_int/mod_xml_radius/Makefile.am similarity index 62% rename from src/mod/applications/mod_rad_auth/Makefile rename to src/mod/xml_int/mod_xml_radius/Makefile.am index 63542dff47..a5004ea882 100644 --- a/src/mod/applications/mod_rad_auth/Makefile +++ b/src/mod/xml_int/mod_xml_radius/Makefile.am @@ -1,3 +1,6 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_xml_radius + RADCLIENT_VERSION=1.1.6 RADCLIENT=freeradius-client-$(RADCLIENT_VERSION) RADCLIENT_DIR=$(switch_srcdir)/libs/$(RADCLIENT) @@ -5,11 +8,13 @@ RADCLIENT_BUILDDIR=$(switch_builddir)/libs/$(RADCLIENT) RADCLIENT_LIBDIR=$(RADCLIENT_BUILDDIR)/lib RADCLIENT_LA=${RADCLIENT_LIBDIR}/libfreeradius-client.la -LOCAL_CFLAGS=-I$(RADCLIENT_DIR)/include -LOCAL_LIBADD=$(RADCLIENT_LA) +mod_LTLIBRARIES = mod_xml_radius.la +mod_xml_radius_la_SOURCES = mod_xml_radius.c +mod_xml_radius_la_CFLAGS = $(AM_CFLAGS) -I$(RADCLIENT_DIR)/include +mod_xml_radius_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(RADCLIENT_LA) +mod_xml_radius_la_LDFLAGS = -avoid-version -module -no-undefined -shared -BASE=../../../.. -include $(BASE)/build/modmake.rules +BUILT_SOURCES=$(RADCLIENT_LA) $(RADCLIENT_DIR): $(GETLIB) $(RADCLIENT).tar.gz diff --git a/src/mod/xml_int/mod_xml_rpc/Makefile b/src/mod/xml_int/mod_xml_rpc/Makefile deleted file mode 100644 index 7531ae5dea..0000000000 --- a/src/mod/xml_int/mod_xml_rpc/Makefile +++ /dev/null @@ -1,93 +0,0 @@ -MAKEFLAGS=-j1 -BASE=../../../.. -XMLRPC_DIR=$(BASE)/libs/xmlrpc-c - -LOCAL_OBJS = $(XMLRPC_DIR)/src/version.o\ -$(XMLRPC_DIR)/lib/libutil/asprintf.o\ -$(XMLRPC_DIR)/lib/util/casprintf.o\ -$(XMLRPC_DIR)/lib/abyss/src/channel.o\ -$(XMLRPC_DIR)/lib/abyss/src/chanswitch.o\ -$(XMLRPC_DIR)/lib/util/cmdline_parser.o\ -$(XMLRPC_DIR)/lib/abyss/src/conf.o\ -$(XMLRPC_DIR)/lib/abyss/src/conn.o\ -$(XMLRPC_DIR)/lib/abyss/src/data.o\ -$(XMLRPC_DIR)/lib/abyss/src/date.o\ -$(XMLRPC_DIR)/src/double.o\ -$(XMLRPC_DIR)/lib/libutil/error.o\ -$(XMLRPC_DIR)/lib/abyss/src/file.o\ -$(XMLRPC_DIR)/lib/expat/gennmtab/gennmtab.o\ -$(XMLRPC_DIR)/lib/util/getoptx.o\ -$(XMLRPC_DIR)/lib/abyss/src/handler.o\ -$(XMLRPC_DIR)/lib/abyss/src/http.o\ -$(XMLRPC_DIR)/lib/abyss/src/init.o\ -$(XMLRPC_DIR)/lib/libutil/make_printable.o\ -$(XMLRPC_DIR)/lib/libutil/memblock.o\ -$(XMLRPC_DIR)/src/method.o\ -$(XMLRPC_DIR)/src/parse_value.o\ -$(XMLRPC_DIR)/src/parse_datetime.o\ -$(XMLRPC_DIR)/src/registry.o\ -$(XMLRPC_DIR)/src/resource.o\ -$(XMLRPC_DIR)/lib/abyss/src/response.o\ -$(XMLRPC_DIR)/lib/libutil/select.o\ -$(XMLRPC_DIR)/lib/abyss/src/server.o\ -$(XMLRPC_DIR)/lib/abyss/src/session.o\ -$(XMLRPC_DIR)/lib/libutil/sleep.o\ -$(XMLRPC_DIR)/lib/abyss/src/socket.o\ -$(XMLRPC_DIR)/lib/abyss/src/socket_unix.o\ -$(XMLRPC_DIR)/lib/util/string_parser.o\ -$(XMLRPC_DIR)/lib/util/stripcaseeq.o\ -$(XMLRPC_DIR)/src/system_method.o\ -$(XMLRPC_DIR)/lib/abyss/src/thread_pthread.o\ -$(XMLRPC_DIR)/lib/libutil/time.o\ -$(XMLRPC_DIR)/lib/abyss/src/token.o\ -$(XMLRPC_DIR)/src/trace.o\ -$(XMLRPC_DIR)/lib/abyss/src/trace.o\ -$(XMLRPC_DIR)/lib/libutil/utf8.o\ -$(XMLRPC_DIR)/lib/libutil/string_number.o\ -$(XMLRPC_DIR)/lib/libutil/base64.o\ -$(XMLRPC_DIR)/lib/expat/xmlparse/xmlparse.o\ -$(XMLRPC_DIR)/lib/expat/xmltok/xmlrole.o\ -$(XMLRPC_DIR)/src/xmlrpc_array.o\ -$(XMLRPC_DIR)/src/xmlrpc_authcookie.o\ -$(XMLRPC_DIR)/src/xmlrpc_base64.o\ -$(XMLRPC_DIR)/src/xmlrpc_build.o\ -$(XMLRPC_DIR)/src/xmlrpc_data.o\ -$(XMLRPC_DIR)/src/xmlrpc_datetime.o\ -$(XMLRPC_DIR)/src/xmlrpc_decompose.o\ -$(XMLRPC_DIR)/src/xmlrpc_expat.o\ -$(XMLRPC_DIR)/src/xmlrpc_parse.o\ -$(XMLRPC_DIR)/src/xmlrpc_serialize.o\ -$(XMLRPC_DIR)/src/xmlrpc_server_abyss.o\ -$(XMLRPC_DIR)/src/xmlrpc_server_cgi.o\ -$(XMLRPC_DIR)/src/xmlrpc_string.o\ -$(XMLRPC_DIR)/src/xmlrpc_struct.o\ -$(XMLRPC_DIR)/lib/expat/xmltok/xmltok.o\ -ws.o - -LOCAL_CFLAGS = -w -I$(XMLRPC_DIR)/lib/expat/xmlparse -I$(XMLRPC_DIR)/lib/expat/xmltok -I$(XMLRPC_DIR) -I$(XMLRPC_DIR)/include -LOCAL_CFLAGS+= -I$(XMLRPC_DIR)/lib/abyss/src -I$(XMLRPC_DIR)/lib/util/include -D_THREAD -D__EXTENSIONS__ -LOCAL_CFLAGS+= -I. - -include $(BASE)/build/modmake.rules - -$(XMLRPCLAS): $(XMLRPC_DIR) $(XMLRPC_DIR)/.update - cd $(XMLRPC_DIR) && $(MAKE) - $(TOUCH_TARGET) - -$(XMLRPC_DIR)/lib/expat/xmltok/xmltok.o: $(XMLRPC_DIR)/lib/expat/xmltok/nametab.h - -$(XMLRPC_DIR)/lib/expat/xmltok/nametab.h: - cd $(XMLRPC_DIR)/lib/expat/gennmtab && $(MAKE) - cd $(XMLRPC_DIR)/lib/expat/xmltok && ../gennmtab/gennmtab > nametab.h - -$(XMLRPC_DIR)/src/version.o: $(XMLRPC_DIR)/version.h - -$(XMLRPC_DIR)/version.h: - cd $(XMLRPC_DIR) && $(MAKE) version.h - cd $(XMLRPC_DIR)/include && $(MAKE) xmlrpc-c/config.h - -local_clean: - cd $(XMLRPC_DIR) && $(MAKE) clean - - - diff --git a/src/mod/xml_int/mod_xml_rpc/Makefile.am b/src/mod/xml_int/mod_xml_rpc/Makefile.am new file mode 100644 index 0000000000..58ecf6d21c --- /dev/null +++ b/src/mod/xml_int/mod_xml_rpc/Makefile.am @@ -0,0 +1,96 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_xml_rpc + +MAKEFLAGS=-j1 +XMLRPC_DIR=$(switch_srcdir)/libs/xmlrpc-c + +mod_LTLIBRARIES = mod_xml_rpc.la +mod_xml_rpc_la_SOURCES = mod_xml_rpc.c +mod_xml_rpc_la_CFLAGS = $(AM_CFLAGS) -I. -w -I$(XMLRPC_DIR)/lib/expat/xmlparse +mod_xml_rpc_la_CFLAGS += -I$(XMLRPC_DIR)/lib/expat/xmltok -I$(XMLRPC_DIR) -I$(XMLRPC_DIR)/include +mod_xml_rpc_la_CFLAGS += -I$(XMLRPC_DIR)/lib/abyss/src -I$(XMLRPC_DIR)/lib/util/include -D_THREAD -D__EXTENSIONS__ -D_GNU_SOURCE +mod_xml_rpc_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_xml_rpc_la_LDFLAGS = -avoid-version -module -no-undefined -shared + +mod_xml_rpc_la_SOURCES += ../../../../libs/xmlrpc-c/src/version.c\ +../../../../libs/xmlrpc-c/lib/libutil/asprintf.c\ +../../../../libs/xmlrpc-c/lib/util/casprintf.c\ +../../../../libs/xmlrpc-c/lib/abyss/src/channel.c\ +../../../../libs/xmlrpc-c/lib/abyss/src/chanswitch.c\ +../../../../libs/xmlrpc-c/lib/util/cmdline_parser.c\ +../../../../libs/xmlrpc-c/lib/abyss/src/conf.c\ +../../../../libs/xmlrpc-c/lib/abyss/src/conn.c\ +../../../../libs/xmlrpc-c/lib/abyss/src/data.c\ +../../../../libs/xmlrpc-c/lib/abyss/src/date.c\ +../../../../libs/xmlrpc-c/src/double.c\ +../../../../libs/xmlrpc-c/lib/libutil/error.c\ +../../../../libs/xmlrpc-c/lib/abyss/src/file.c\ +../../../../libs/xmlrpc-c/lib/expat/gennmtab/gennmtab.c\ +../../../../libs/xmlrpc-c/lib/util/getoptx.c\ +../../../../libs/xmlrpc-c/lib/abyss/src/handler.c\ +../../../../libs/xmlrpc-c/lib/abyss/src/http.c\ +../../../../libs/xmlrpc-c/lib/abyss/src/init.c\ +../../../../libs/xmlrpc-c/lib/libutil/make_printable.c\ +../../../../libs/xmlrpc-c/lib/libutil/memblock.c\ +../../../../libs/xmlrpc-c/src/method.c\ +../../../../libs/xmlrpc-c/src/parse_value.c\ +../../../../libs/xmlrpc-c/src/parse_datetime.c\ +../../../../libs/xmlrpc-c/src/registry.c\ +../../../../libs/xmlrpc-c/src/resource.c\ +../../../../libs/xmlrpc-c/lib/abyss/src/response.c\ +../../../../libs/xmlrpc-c/lib/libutil/select.c\ +../../../../libs/xmlrpc-c/lib/abyss/src/server.c\ +../../../../libs/xmlrpc-c/lib/abyss/src/session.c\ +../../../../libs/xmlrpc-c/lib/libutil/sleep.c\ +../../../../libs/xmlrpc-c/lib/abyss/src/socket.c\ +../../../../libs/xmlrpc-c/lib/abyss/src/socket_unix.c\ +../../../../libs/xmlrpc-c/lib/util/string_parser.c\ +../../../../libs/xmlrpc-c/lib/util/stripcaseeq.c\ +../../../../libs/xmlrpc-c/src/system_method.c\ +../../../../libs/xmlrpc-c/lib/abyss/src/thread_pthread.c\ +../../../../libs/xmlrpc-c/lib/libutil/time.c\ +../../../../libs/xmlrpc-c/lib/abyss/src/token.c\ +../../../../libs/xmlrpc-c/src/xml_trace.c\ +../../../../libs/xmlrpc-c/lib/abyss/src/trace.c\ +../../../../libs/xmlrpc-c/lib/libutil/utf8.c\ +../../../../libs/xmlrpc-c/lib/libutil/string_number.c\ +../../../../libs/xmlrpc-c/lib/libutil/base64.c\ +../../../../libs/xmlrpc-c/lib/expat/xmlparse/xmlparse.c\ +../../../../libs/xmlrpc-c/lib/expat/xmltok/xmlrole.c\ +../../../../libs/xmlrpc-c/src/xmlrpc_array.c\ +../../../../libs/xmlrpc-c/src/xmlrpc_authcookie.c\ +../../../../libs/xmlrpc-c/src/xmlrpc_base64.c\ +../../../../libs/xmlrpc-c/src/xmlrpc_build.c\ +../../../../libs/xmlrpc-c/src/xmlrpc_data.c\ +../../../../libs/xmlrpc-c/src/xmlrpc_datetime.c\ +../../../../libs/xmlrpc-c/src/xmlrpc_decompose.c\ +../../../../libs/xmlrpc-c/src/xmlrpc_expat.c\ +../../../../libs/xmlrpc-c/src/xmlrpc_parse.c\ +../../../../libs/xmlrpc-c/src/xmlrpc_serialize.c\ +../../../../libs/xmlrpc-c/src/xmlrpc_server_abyss.c\ +../../../../libs/xmlrpc-c/src/xmlrpc_server_cgi.c\ +../../../../libs/xmlrpc-c/src/xmlrpc_string.c\ +../../../../libs/xmlrpc-c/src/xmlrpc_struct.c\ +../../../../libs/xmlrpc-c/lib/expat/xmltok/xmltok.c\ +ws.c + +BUILT_SOURCES=$(XMLRPC_DIR)/version.h $(XMLRPC_DIR)/lib/expat/xmltok/nametab.h +$(XMLRPC_DIR)/lib/expat/xmltok/xmltok.o: $(XMLRPC_DIR)/lib/expat/xmltok/nametab.h + +$(XMLRPC_DIR)/lib/expat/xmltok/nametab.h: + cd $(XMLRPC_DIR)/lib/expat/gennmtab && $(MAKE) dep + cd $(XMLRPC_DIR)/lib/expat/gennmtab && $(MAKE) + cd $(XMLRPC_DIR)/lib/expat/xmltok && ../gennmtab/gennmtab > nametab.h + +$(XMLRPC_DIR)/src/version.o: $(XMLRPC_DIR)/version.h + +$(XMLRPC_DIR)/version.h: + cd $(XMLRPC_DIR) && $(MAKE) version.h + cd $(XMLRPC_DIR)/include && $(MAKE) xmlrpc-c/config.h + +clean: + cd $(XMLRPC_DIR) && $(MAKE) clean + + + + diff --git a/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c b/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c index 39235cc833..cb3c041a1e 100644 --- a/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c +++ b/src/mod/xml_int/mod_xml_rpc/mod_xml_rpc.c @@ -1196,8 +1196,8 @@ SWITCH_MODULE_RUNTIME_FUNCTION(mod_xml_rpc_runtime) MIMETypeInit(); - for (hi = switch_core_mime_index(); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, &var, NULL, &val); + for (hi = switch_core_mime_index(); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, &var, NULL, &val); if (var && val) { MIMETypeAdd((char *) val, (char *) var); } diff --git a/src/mod/xml_int/mod_xml_scgi/Makefile b/src/mod/xml_int/mod_xml_scgi/Makefile deleted file mode 100644 index 2c7a91d26d..0000000000 --- a/src/mod/xml_int/mod_xml_scgi/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -BASE=../../../.. -LOCAL_SOURCES = $(BASE)/libs/libscgi/src/scgi.c -LOCAL_OBJS = $(BASE)/libs/libscgi/src/scgi.o -LOCAL_CFLAGS = -I. -I$(BASE)/libs/libscgi/src/include -include $(BASE)/build/modmake.rules diff --git a/src/mod/xml_int/mod_xml_scgi/Makefile.am b/src/mod/xml_int/mod_xml_scgi/Makefile.am new file mode 100644 index 0000000000..ab044688be --- /dev/null +++ b/src/mod/xml_int/mod_xml_scgi/Makefile.am @@ -0,0 +1,7 @@ +include $(top_srcdir)/build/modmake.rulesam +MODNAME=mod_xml_scgi +mod_LTLIBRARIES = mod_xml_scgi.la +mod_xml_scgi_la_SOURCES = mod_xml_scgi.c ../../../../libs/libscgi/src/scgi.c +mod_xml_scgi_la_CFLAGS = $(AM_CFLAGS) -I. -I$(switch_srcdir)/libs/libscgi/src/include -D_GNU_SOURCE +mod_xml_scgi_la_LIBADD = $(switch_builddir)/libfreeswitch.la +mod_xml_scgi_la_LDFLAGS = -avoid-version -module -no-undefined -shared diff --git a/src/mod/xml_int/mod_xml_scgi/mod_xml_scgi.c b/src/mod/xml_int/mod_xml_scgi/mod_xml_scgi.c index 786a591410..981543ab53 100644 --- a/src/mod/xml_int/mod_xml_scgi/mod_xml_scgi.c +++ b/src/mod/xml_int/mod_xml_scgi/mod_xml_scgi.c @@ -282,7 +282,7 @@ static switch_status_t do_config(void) } } else if (!strcasecmp(var, "enable-post-var")) { if (!vars_map && need_vars_map == 0) { - if (switch_core_hash_init(&vars_map, globals.pool) != SWITCH_STATUS_SUCCESS) { + if (switch_core_hash_init(&vars_map) != SWITCH_STATUS_SUCCESS) { need_vars_map = -1; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Can't init params hash!\n"); continue; diff --git a/src/switch_channel.c b/src/switch_channel.c index 8c338cf8cb..9adb2a7d9f 100644 --- a/src/switch_channel.c +++ b/src/switch_channel.c @@ -416,7 +416,7 @@ SWITCH_DECLARE(switch_status_t) switch_channel_alloc(switch_channel_t **channel, switch_event_create_plain(&(*channel)->variables, SWITCH_EVENT_CHANNEL_DATA); - switch_core_hash_init(&(*channel)->private_hash, pool); + switch_core_hash_init(&(*channel)->private_hash); switch_queue_create(&(*channel)->dtmf_queue, SWITCH_DTMF_LOG_LEN, pool); switch_queue_create(&(*channel)->dtmf_log_queue, SWITCH_DTMF_LOG_LEN, pool); @@ -1862,7 +1862,7 @@ SWITCH_DECLARE(void) switch_channel_set_app_flag_key(const char *key, switch_cha switch_mutex_lock(channel->flag_mutex); if (!channel->app_flag_hash) { - switch_core_hash_init(&channel->app_flag_hash, switch_core_session_get_pool(channel->session)); + switch_core_hash_init(&channel->app_flag_hash); new++; } @@ -4686,7 +4686,7 @@ SWITCH_DECLARE(void) switch_channel_global_init(switch_memory_pool_t *pool) globals.pool = pool; switch_mutex_init(&globals.device_mutex, SWITCH_MUTEX_NESTED, pool); - switch_core_hash_init(&globals.device_hash, globals.pool); + switch_core_hash_init(&globals.device_hash); } SWITCH_DECLARE(void) switch_channel_global_uninit(void) diff --git a/src/switch_console.c b/src/switch_console.c index be6852c83d..b5b79debdc 100644 --- a/src/switch_console.c +++ b/src/switch_console.c @@ -1660,7 +1660,7 @@ static struct { SWITCH_DECLARE(switch_status_t) switch_console_init(switch_memory_pool_t *pool) { switch_mutex_init(&globals.func_mutex, SWITCH_MUTEX_NESTED, pool); - switch_core_hash_init(&globals.func_hash, pool); + switch_core_hash_init(&globals.func_hash); switch_console_add_complete_func("::console::list_available_modules", (switch_console_complete_callback_t) switch_console_list_available_modules); switch_console_add_complete_func("::console::list_loaded_modules", (switch_console_complete_callback_t) switch_console_list_loaded_modules); switch_console_add_complete_func("::console::list_interfaces", (switch_console_complete_callback_t) switch_console_list_interfaces); diff --git a/src/switch_core.c b/src/switch_core.c index 160af2838b..df8db29717 100644 --- a/src/switch_core.c +++ b/src/switch_core.c @@ -1022,7 +1022,7 @@ SWITCH_DECLARE(const char *) switch_core_mime_ext2type(const char *ext) SWITCH_DECLARE(switch_hash_index_t *) switch_core_mime_index(void) { - return switch_hash_first(NULL, runtime.mime_types); + return switch_core_hash_first( runtime.mime_types); } SWITCH_DECLARE(switch_status_t) switch_core_mime_add_type(const char *type, const char *ext) @@ -1250,7 +1250,7 @@ SWITCH_DECLARE(void) switch_load_network_lists(switch_bool_t reload) memset(&IP_LIST, 0, sizeof(IP_LIST)); switch_core_new_memory_pool(&IP_LIST.pool); - switch_core_hash_init(&IP_LIST.hash, IP_LIST.pool); + switch_core_hash_init(&IP_LIST.hash); tmp_name = "rfc1918.auto"; @@ -1646,8 +1646,8 @@ SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, switc switch_core_set_globals(); switch_core_session_init(runtime.memory_pool); switch_event_create_plain(&runtime.global_vars, SWITCH_EVENT_CHANNEL_DATA); - switch_core_hash_init(&runtime.mime_types, runtime.memory_pool); - switch_core_hash_init_case(&runtime.ptimes, runtime.memory_pool, SWITCH_FALSE); + switch_core_hash_init(&runtime.mime_types); + switch_core_hash_init_case(&runtime.ptimes, SWITCH_FALSE); load_mime_types(); runtime.flags |= flags; runtime.sps_total = 30; diff --git a/src/switch_core_hash.c b/src/switch_core_hash.c index ebbfce065e..56aee60620 100644 --- a/src/switch_core_hash.c +++ b/src/switch_core_hash.c @@ -34,50 +34,27 @@ #include #include "private/switch_core_pvt.h" -#include -#include "../../../libs/sqlite/src/hash.h" +#include "private/switch_hashtable_private.h" -struct switch_hash { - Hash table; - switch_memory_pool_t *pool; -}; - -SWITCH_DECLARE(switch_status_t) switch_core_hash_init_case(switch_hash_t **hash, switch_memory_pool_t *pool, switch_bool_t case_sensitive) +SWITCH_DECLARE(switch_status_t) switch_core_hash_init_case(switch_hash_t **hash, switch_bool_t case_sensitive) { - switch_hash_t *newhash; - - if (pool) { - newhash = switch_core_alloc(pool, sizeof(*newhash)); - newhash->pool = pool; - } else { - switch_zmalloc(newhash, sizeof(*newhash)); - } - - switch_assert(newhash); - - sqlite3HashInit(&newhash->table, case_sensitive ? SQLITE_HASH_BINARY : SQLITE_HASH_STRING, 1); - *hash = newhash; - - return SWITCH_STATUS_SUCCESS; + return switch_create_hashtable(hash, 16, case_sensitive ? switch_hash_default : switch_hash_default_ci, switch_hash_equalkeys); } + SWITCH_DECLARE(switch_status_t) switch_core_hash_destroy(switch_hash_t **hash) { switch_assert(hash != NULL && *hash != NULL); - sqlite3HashClear(&(*hash)->table); - if (!(*hash)->pool) { - free(*hash); - } - - *hash = NULL; + switch_hashtable_destroy(hash); return SWITCH_STATUS_SUCCESS; } SWITCH_DECLARE(switch_status_t) switch_core_hash_insert(switch_hash_t *hash, const char *key, const void *data) { - sqlite3HashInsert(&hash->table, key, (int) strlen(key) + 1, (void *) data); + switch_hashtable_insert(hash, strdup(key), (void *)data, HASHTABLE_FLAG_FREE_KEY); + return SWITCH_STATUS_SUCCESS; } @@ -87,7 +64,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_hash_insert_locked(switch_hash_t *ha switch_mutex_lock(mutex); } - sqlite3HashInsert(&hash->table, key, (int) strlen(key) + 1, (void *) data); + switch_core_hash_insert(hash, key, data); if (mutex) { switch_mutex_unlock(mutex); @@ -102,7 +79,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_hash_insert_wrlock(switch_hash_t *ha switch_thread_rwlock_wrlock(rwlock); } - sqlite3HashInsert(&hash->table, key, (int) strlen(key) + 1, (void *) data); + switch_core_hash_insert(hash, key, data); if (rwlock) { switch_thread_rwlock_unlock(rwlock); @@ -113,7 +90,8 @@ SWITCH_DECLARE(switch_status_t) switch_core_hash_insert_wrlock(switch_hash_t *ha SWITCH_DECLARE(switch_status_t) switch_core_hash_delete(switch_hash_t *hash, const char *key) { - sqlite3HashInsert(&hash->table, key, (int) strlen(key) + 1, NULL); + switch_hashtable_remove(hash, (void *)key); + return SWITCH_STATUS_SUCCESS; } @@ -123,7 +101,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_hash_delete_locked(switch_hash_t *ha switch_mutex_lock(mutex); } - sqlite3HashInsert(&hash->table, key, (int) strlen(key) + 1, NULL); + switch_core_hash_delete(hash, key); if (mutex) { switch_mutex_unlock(mutex); @@ -138,7 +116,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_hash_delete_wrlock(switch_hash_t *ha switch_thread_rwlock_wrlock(rwlock); } - sqlite3HashInsert(&hash->table, key, (int) strlen(key) + 1, NULL); + switch_core_hash_delete(hash, key); if (rwlock) { switch_thread_rwlock_unlock(rwlock); @@ -161,10 +139,10 @@ SWITCH_DECLARE(switch_status_t) switch_core_hash_delete_multi(switch_hash_t *has When done, iterate through the list deleting hash entries */ - for (hi = switch_hash_first(NULL, hash); hi; hi = switch_hash_next(hi)) { + for (hi = switch_core_hash_first(hash); hi; hi = switch_core_hash_next(hi)) { const void *key; void *val; - switch_hash_this(hi, &key, NULL, &val); + switch_core_hash_this(hi, &key, NULL, &val); if (!callback || callback(key, val, pData)) { switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "delete", (const char *) key); } @@ -185,7 +163,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_hash_delete_multi(switch_hash_t *has SWITCH_DECLARE(void *) switch_core_hash_find(switch_hash_t *hash, const char *key) { - return sqlite3HashFind(&hash->table, key, (int) strlen(key) + 1); + return switch_hashtable_search(hash, (void *)key); } SWITCH_DECLARE(void *) switch_core_hash_find_locked(switch_hash_t *hash, const char *key, switch_mutex_t *mutex) @@ -196,7 +174,8 @@ SWITCH_DECLARE(void *) switch_core_hash_find_locked(switch_hash_t *hash, const c switch_mutex_lock(mutex); } - val = sqlite3HashFind(&hash->table, key, (int) strlen(key) + 1); + val = switch_core_hash_find(hash, key); + if (mutex) { switch_mutex_unlock(mutex); @@ -213,7 +192,7 @@ SWITCH_DECLARE(void *) switch_core_hash_find_rdlock(switch_hash_t *hash, const c switch_thread_rwlock_rdlock(rwlock); } - val = sqlite3HashFind(&hash->table, key, (int) strlen(key) + 1); + val = switch_core_hash_find(hash, key); if (rwlock) { switch_thread_rwlock_unlock(rwlock); @@ -224,44 +203,19 @@ SWITCH_DECLARE(void *) switch_core_hash_find_rdlock(switch_hash_t *hash, const c SWITCH_DECLARE(switch_hash_index_t *) switch_core_hash_first(switch_hash_t *hash) { - return (switch_hash_index_t *) sqliteHashFirst(&hash->table); + return switch_hashtable_first(hash); } SWITCH_DECLARE(switch_hash_index_t *) switch_core_hash_next(switch_hash_index_t *hi) { - return (switch_hash_index_t *) sqliteHashNext((HashElem *) hi); + return switch_hashtable_next(hi); } SWITCH_DECLARE(void) switch_core_hash_this(switch_hash_index_t *hi, const void **key, switch_ssize_t *klen, void **val) { - if (key) { - *key = sqliteHashKey((HashElem *) hi); - if (klen) { - *klen = strlen((char *) *key) + 1; - } - } - if (val) { - *val = sqliteHashData((HashElem *) hi); - } + switch_hashtable_this(hi, key, klen, val); } -/* Deprecated */ -SWITCH_DECLARE(switch_hash_index_t *) switch_hash_first(char *deprecate_me, switch_hash_t *hash) -{ - return switch_core_hash_first(hash); -} - -/* Deprecated */ -SWITCH_DECLARE(switch_hash_index_t *) switch_hash_next(switch_hash_index_t *hi) -{ - return switch_core_hash_next(hi); -} - -/* Deprecated */ -SWITCH_DECLARE(void) switch_hash_this(switch_hash_index_t *hi, const void **key, switch_ssize_t *klen, void **val) -{ - switch_core_hash_this(hi, key, klen, val); -} /* For Emacs: * Local Variables: diff --git a/src/switch_core_io.c b/src/switch_core_io.c index c290d9175f..4c7b7fd8b8 100644 --- a/src/switch_core_io.c +++ b/src/switch_core_io.c @@ -599,6 +599,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_frame(switch_core_sessi case SWITCH_STATUS_RESAMPLE: if (!session->read_resampler) { switch_mutex_lock(session->resample_mutex); + status = switch_resample_create(&session->read_resampler, read_frame->codec->implementation->actual_samples_per_second, session->read_impl.actual_samples_per_second, @@ -610,6 +611,13 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_frame(switch_core_sessi switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Unable to allocate resampler\n"); status = SWITCH_STATUS_FALSE; goto done; + } else { + switch_core_session_message_t msg = { 0 }; + msg.numeric_arg = 1; + msg.message_id = SWITCH_MESSAGE_RESAMPLE_EVENT; + switch_core_session_receive_message(session, &msg); + + switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE, "Activating read resampler\n"); } } case SWITCH_STATUS_SUCCESS: @@ -636,6 +644,14 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_frame(switch_core_sessi switch_resample_destroy(&session->read_resampler); switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE, "Deactivating read resampler\n"); switch_mutex_unlock(session->resample_mutex); + + { + switch_core_session_message_t msg = { 0 }; + msg.numeric_arg = 0; + msg.message_id = SWITCH_MESSAGE_RESAMPLE_EVENT; + switch_core_session_receive_message(session, &msg); + } + } status = SWITCH_STATUS_SUCCESS; @@ -1199,6 +1215,13 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_frame(switch_core_sess switch_mutex_unlock(session->resample_mutex); if (status != SWITCH_STATUS_SUCCESS) { goto done; + } else { + switch_core_session_message_t msg = { 0 }; + msg.numeric_arg = 1; + msg.message_id = SWITCH_MESSAGE_RESAMPLE_EVENT; + switch_core_session_receive_message(session, &msg); + + switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE, "Activating write resampler\n"); } } break; @@ -1226,6 +1249,14 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_frame(switch_core_sess switch_resample_destroy(&session->write_resampler); switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE, "Deactivating write resampler\n"); switch_mutex_unlock(session->resample_mutex); + + { + switch_core_session_message_t msg = { 0 }; + msg.numeric_arg = 0; + msg.message_id = SWITCH_MESSAGE_RESAMPLE_EVENT; + switch_core_session_receive_message(session, &msg); + } + } write_frame = frame; status = SWITCH_STATUS_SUCCESS; @@ -1497,6 +1528,14 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_frame(switch_core_sess if (status != SWITCH_STATUS_SUCCESS) { goto done; + } else { + switch_core_session_message_t msg = { 0 }; + msg.numeric_arg = 1; + msg.message_id = SWITCH_MESSAGE_RESAMPLE_EVENT; + switch_core_session_receive_message(session, &msg); + + + switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE, "Activating write resampler\n"); } } break; @@ -1511,12 +1550,23 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_frame(switch_core_sess break; case SWITCH_STATUS_NOOP: if (session->write_resampler) { + switch_core_session_message_t msg = { 0 }; + int ok = 0; + switch_mutex_lock(session->resample_mutex); - if (session->write_resampler) { + if (session->write_resampler) { switch_resample_destroy(&session->write_resampler); switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE, "Deactivating write resampler\n"); + ok = 1; } switch_mutex_unlock(session->resample_mutex); + + if (ok) { + msg.numeric_arg = 0; + msg.message_id = SWITCH_MESSAGE_RESAMPLE_EVENT; + switch_core_session_receive_message(session, &msg); + } + } enc_frame->codec = session->write_codec; enc_frame->samples = enc_frame->datalen / sizeof(int16_t); diff --git a/src/switch_core_media.c b/src/switch_core_media.c index c0dc0b48c0..e7c19aed67 100644 --- a/src/switch_core_media.c +++ b/src/switch_core_media.c @@ -74,6 +74,11 @@ struct media_helper { int up; }; +typedef enum { + CRYPTO_MODE_OPTIONAL, + CRYPTO_MODE_MANDATORY, + CRYPTO_MODE_FORBIDDEN +} switch_rtp_crypto_mode_t; typedef struct switch_rtp_engine_s { switch_secure_settings_t ssec[CRYPTO_INVALID+1]; @@ -181,6 +186,8 @@ struct switch_media_handle_s { char *msid; char *cname; + switch_rtp_crypto_mode_t crypto_mode; + switch_rtp_crypto_key_type_t crypto_suite_order[CRYPTO_INVALID+1]; }; @@ -226,7 +233,8 @@ SWITCH_DECLARE(int) switch_core_media_crypto_keylen(switch_rtp_crypto_key_type_t static int get_channels(const char *name, int dft) { - if (switch_false(switch_core_get_variable("NDLB_broken_opus_sdp")) && !strcasecmp(name, "opus")) { + + if (!switch_true(switch_core_get_variable("NDLB_broken_opus_sdp")) && !strcasecmp(name, "opus")) { return 2; /* IKR???*/ } @@ -713,6 +721,8 @@ SWITCH_DECLARE(void) switch_core_session_clear_crypto(switch_core_session_t *ses "srtp_remote_video_crypto_tag", "srtp_remote_video_crypto_type", "rtp_secure_media", + "rtp_secure_media_inbound", + "rtp_secure_media_outbound", NULL}; for(i = 0; vars[i] ;i++) { @@ -901,7 +911,7 @@ static switch_status_t switch_core_media_build_crypto(switch_media_handle_t *smh engine->ssec[ctype].local_crypto_key = switch_core_session_sprintf(smh->session, "%d %s inline:%s", index, SUITES[ctype].name, b64_key); switch_channel_set_variable_name_printf(smh->session->channel, engine->ssec[ctype].local_crypto_key, "rtp_last_%s_local_crypto_key", type2str(type)); - + switch_channel_set_flag(smh->session->channel, CF_SECURE); switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(smh->session), SWITCH_LOG_DEBUG, "Set Local %s crypto Key [%s]\n", type2str(type), @@ -934,7 +944,7 @@ switch_status_t switch_core_media_add_crypto(switch_secure_settings_t *ssec, con p++; type = switch_core_media_crypto_str2type(p); - + if (type == CRYPTO_INVALID) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Parse Error near [%s]\n", p); goto bad; @@ -1028,6 +1038,7 @@ static void switch_core_session_apply_crypto(switch_core_session_t *session, swi } if (!session->media_handle) return; + engine = &session->media_handle->engines[type]; if (switch_channel_test_flag(session->channel, CF_RECOVERING)) { @@ -1050,10 +1061,96 @@ static void switch_core_session_apply_crypto(switch_core_session_t *session, swi SUITES[engine->ssec[engine->crypto_type].crypto_type].keylen); switch_channel_set_variable(session->channel, varname, "true"); + + + switch_channel_set_variable(session->channel, "rtp_secure_media_negotiated", SUITES[engine->crypto_type].name); + } } +static void switch_core_session_parse_crypto_prefs(switch_core_session_t *session) +{ + const char *var = NULL; + const char *val = NULL; + char *suites = NULL; + switch_media_handle_t *smh; + char *fields[CRYPTO_INVALID+1]; + int argc = 0, i = 0, j = 0, k = 0; + + if (!(smh = session->media_handle)) { + return; + } + + if (switch_channel_test_flag(session->channel, CF_WEBRTC)) { + return; + } + + if (switch_channel_direction(session->channel) == SWITCH_CALL_DIRECTION_INBOUND) { + var = "rtp_secure_media_inbound"; + } else { + var = "rtp_secure_media_outbound"; + } + + if (!(val = switch_channel_get_variable(session->channel, var))) { + var = "rtp_secure_media"; + val = switch_channel_get_variable(session->channel, var); + } + + if (!zstr(val) && (suites = strchr(val, ':'))) { + *suites++ = '\0'; + } + + if (zstr(suites)) { + suites = (char *) switch_channel_get_variable(session->channel, "rtp_secure_media_suites"); + } + + if (zstr(val)) { + if (switch_channel_direction(session->channel) == SWITCH_CALL_DIRECTION_INBOUND && !switch_channel_test_flag(session->channel, CF_RECOVERING)) { + val = "optional"; + } else { + val = "forbidden"; + } + } + + if (!strcasecmp(val, "optional")) { + smh->crypto_mode = CRYPTO_MODE_OPTIONAL; + } else if (switch_true(val) || !strcasecmp(val, "mandatory")) { + smh->crypto_mode = CRYPTO_MODE_MANDATORY; + } else { + smh->crypto_mode = CRYPTO_MODE_FORBIDDEN; + if (!switch_false(val) && strcasecmp(val, "forbidden")) { + switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "INVALID VALUE FOR %s defaulting to 'forbidden'\n", var); + } + } + + if (smh->crypto_mode != CRYPTO_MODE_FORBIDDEN && !zstr(suites)) { + argc = switch_split((char *)suites, ':', fields); + + for (i = 0; i < argc; i++) { + int ok = 0; + + for (j = 0; j < CRYPTO_INVALID; j++) { + if (!strcasecmp(fields[i], SUITES[j].name)) { + smh->crypto_suite_order[k++] = SUITES[j].type; + ok++; + break; + } + } + + if (!ok) { + switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "INVALID SUITE SUPPLIED\n"); + } + + } + } else { + for (i = 0; i < CRYPTO_INVALID; i++) { + smh->crypto_suite_order[k++] = SUITES[i].type; + } + } +} + + SWITCH_DECLARE(int) switch_core_session_check_incoming_crypto(switch_core_session_t *session, const char *varname, @@ -1064,29 +1161,28 @@ SWITCH_DECLARE(int) switch_core_session_check_incoming_crypto(switch_core_sessio int ctype = 0; const char *vval = NULL; switch_rtp_engine_t *engine; - const char *suite = switch_channel_get_variable(session->channel, "rtp_secure_media"); + switch_media_handle_t *smh; - if (!session->media_handle) return 0; + if (!(smh = session->media_handle)) { + return 0; + } + if (smh->crypto_mode == CRYPTO_MODE_FORBIDDEN) { + return -1; + } + engine = &session->media_handle->engines[type]; - - if (suite && !strcasecmp(suite, "optional")) { - suite = "true"; - } - - if (zstr(suite) || (!switch_true(suite) && switch_core_media_crypto_str2type(suite) == CRYPTO_INVALID)) { - switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Crypto suite: [%s] not valid in this context.\n", crypto); - goto end; - } - - if (switch_true(suite)) { - suite = NULL; - } - - for (i = 0; i < CRYPTO_INVALID; i++) { - if ((zstr(suite) || switch_stristr(SUITES[i].name, suite)) && switch_stristr(SUITES[i].name, crypto)) { - ctype = SUITES[i].type; - vval = SUITES[i].name; + + for (i = 0; smh->crypto_suite_order[i] != CRYPTO_INVALID; i++) { + switch_rtp_crypto_key_type_t j = SUITES[smh->crypto_suite_order[i]].type; + + switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG,"looking for crypto suite [%s] in [%s]\n", SUITES[j].name, crypto); + + if (switch_stristr(SUITES[j].name, crypto)) { + ctype = SUITES[j].type; + vval = SUITES[j].name; + switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Found suite %s\n", vval); + switch_channel_set_variable(session->channel, "rtp_secure_media_negotiated", vval); break; } } @@ -1163,48 +1259,48 @@ SWITCH_DECLARE(int) switch_core_session_check_incoming_crypto(switch_core_sessio engine->ssec[engine->crypto_type].crypto_tag = crypto_tag; got_crypto++; + switch_channel_set_variable(session->channel, varname, vval); + switch_channel_set_flag(smh->session->channel, CF_SECURE); if (zstr(engine->ssec[engine->crypto_type].local_crypto_key)) { - switch_channel_set_variable(session->channel, varname, vval); switch_core_media_build_crypto(session->media_handle, type, crypto_tag, ctype, SWITCH_RTP_CRYPTO_SEND, 1); } } end: - if (got_crypto && vval && switch_true(switch_channel_get_variable(session->channel, "rtp_secure_media"))) { - switch_channel_set_variable(session->channel, "rtp_secure_media", vval); - } - return got_crypto; } -SWITCH_DECLARE(void) switch_core_session_check_outgoing_crypto(switch_core_session_t *session, const char *sec_var) +SWITCH_DECLARE(void) switch_core_session_check_outgoing_crypto(switch_core_session_t *session) { switch_channel_t *channel = switch_core_session_get_channel(session); + switch_media_handle_t *smh; + int i; if (!switch_core_session_media_handle_ready(session) == SWITCH_STATUS_SUCCESS) { return; } - - if (!zstr(sec_var)) { - int i; - int all = switch_true(sec_var) || !strcasecmp(sec_var, "optional"); - for (i = 0; i < CRYPTO_INVALID; i++) { - if (all || switch_stristr(SUITES[i].name, sec_var)) { - - switch_channel_set_flag(channel, CF_SECURE); - - switch_core_media_build_crypto(session->media_handle, - SWITCH_MEDIA_TYPE_AUDIO, 0, SUITES[i].type, SWITCH_RTP_CRYPTO_SEND, 0); - - switch_core_media_build_crypto(session->media_handle, - SWITCH_MEDIA_TYPE_VIDEO, 0, SUITES[i].type, SWITCH_RTP_CRYPTO_SEND, 0); - } - } + if (!(smh = session->media_handle)) { + return; } + + if (!(smh->crypto_mode == CRYPTO_MODE_OPTIONAL || smh->crypto_mode == CRYPTO_MODE_MANDATORY)) { + return; + } + + switch_channel_set_flag(channel, CF_SECURE); + + for (i = 0; smh->crypto_suite_order[i] != CRYPTO_INVALID; i++) { + switch_core_media_build_crypto(session->media_handle, + SWITCH_MEDIA_TYPE_AUDIO, 0, smh->crypto_suite_order[i], SWITCH_RTP_CRYPTO_SEND, 0); + + switch_core_media_build_crypto(session->media_handle, + SWITCH_MEDIA_TYPE_VIDEO, 0, smh->crypto_suite_order[i], SWITCH_RTP_CRYPTO_SEND, 0); + } + } #define add_stat(_i, _s) \ @@ -1337,21 +1433,24 @@ SWITCH_DECLARE(switch_status_t) switch_media_handle_create(switch_media_handle_t session->media_handle->engines[SWITCH_MEDIA_TYPE_AUDIO].read_frame.buflen = SWITCH_RTP_MAX_BUF_LEN; session->media_handle->engines[SWITCH_MEDIA_TYPE_AUDIO].type = SWITCH_MEDIA_TYPE_AUDIO; session->media_handle->engines[SWITCH_MEDIA_TYPE_AUDIO].crypto_type = CRYPTO_INVALID; + for (i = 0; i < CRYPTO_INVALID; i++) { session->media_handle->engines[SWITCH_MEDIA_TYPE_AUDIO].ssec[i].crypto_type = i; } - session->media_handle->engines[SWITCH_MEDIA_TYPE_VIDEO].read_frame.buflen = SWITCH_RTP_MAX_BUF_LEN; session->media_handle->engines[SWITCH_MEDIA_TYPE_VIDEO].type = SWITCH_MEDIA_TYPE_VIDEO; session->media_handle->engines[SWITCH_MEDIA_TYPE_VIDEO].crypto_type = CRYPTO_INVALID; + for (i = 0; i < CRYPTO_INVALID; i++) { session->media_handle->engines[SWITCH_MEDIA_TYPE_VIDEO].ssec[i].crypto_type = i; } session->media_handle->mparams = params; - + for (i = 0; i <= CRYPTO_INVALID; i++) { + session->media_handle->crypto_suite_order[i] = CRYPTO_INVALID; + } switch_mutex_init(&session->media_handle->mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); switch_mutex_init(&session->media_handle->sdp_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session)); @@ -2815,8 +2914,6 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s const char *tmp; int m_idx = 0; int nm_idx = 0; - int needs_crypto = 0; - const char *var; switch_assert(session); @@ -2839,27 +2936,13 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s return 0; } - if (!switch_channel_test_flag(session->channel, CF_DTLS) && (var = switch_channel_get_variable(session->channel, "rtp_secure_media"))) { - if (strcasecmp(var, "optional")) { - if (switch_true(var) || switch_core_media_crypto_str2type(var) != CRYPTO_INVALID) { - needs_crypto = 1; - switch_channel_set_variable(session->channel, "rtp_crypto_mandatory", "true"); - } - - if (sdp_type == SDP_TYPE_REQUEST) { - if (switch_false(var) || switch_core_media_crypto_str2type(var) == CRYPTO_INVALID) { - got_crypto = -1; - } - } - } - } - - if (dtls_ok(session) && (tmp = switch_channel_get_variable(smh->session->channel, "webrtc_enable_dtls")) && switch_false(tmp)) { switch_channel_clear_flag(smh->session->channel, CF_DTLS_OK); switch_channel_clear_flag(smh->session->channel, CF_DTLS); } + switch_core_session_parse_crypto_prefs(session); + clear_pmaps(a_engine); clear_pmaps(v_engine); @@ -2872,15 +2955,12 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s if (!strcasecmp(val, "generous")) { greedy = 0; scrooge = 0; - switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "rtp_codec_negotiation overriding sofia inbound-codec-negotiation : generous\n" ); } else if (!strcasecmp(val, "greedy")) { greedy = 1; scrooge = 0; - switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "rtp_codec_negotiation overriding sofia inbound-codec-negotiation : greedy\n" ); } else if (!strcasecmp(val, "scrooge")) { scrooge = 1; greedy = 1; - switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "rtp_codec_negotiation overriding sofia inbound-codec-negotiation : scrooge\n" ); } else { switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "rtp_codec_negotiation ignored invalid value : '%s' \n", val ); } @@ -3093,7 +3173,7 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s SWITCH_LOG_WARNING, "%s Error Passing T.38 to unanswered channel %s\n", switch_channel_get_name(session->channel), switch_channel_get_name(other_channel)); switch_core_session_rwunlock(other_session); - //sofia_set_flag(session, TFLAG_NOREPLY); + pass = 0; match = 0; goto done; @@ -3175,8 +3255,7 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s ptime = atoi(attr->a_value); } else if (!strcasecmp(attr->a_name, "maxptime") && attr->a_value) { maxptime = atoi(attr->a_value); - } else if (got_crypto < 1 && !strcasecmp(attr->a_name, "crypto") && !zstr(attr->a_value)) { //&& - //(!switch_channel_test_flag(session->channel, CF_WEBRTC) || switch_stristr(SWITCH_RTP_CRYPTO_KEY_80, attr->a_value))) { + } else if (got_crypto < 1 && !strcasecmp(attr->a_name, "crypto") && !zstr(attr->a_value)) { int crypto_tag; if (!(smh->mparams->ndlb & SM_NDLB_ALLOW_CRYPTO_IN_AVP) && @@ -3374,7 +3453,7 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s } } - if (needs_crypto && got_crypto < 1) { + if (smh->crypto_mode == CRYPTO_MODE_MANDATORY && got_crypto < 1) { switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Crypto not negotiated but required.\n"); match = 0; m_idx = nm_idx = 0; @@ -3685,7 +3764,7 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s } } - if (needs_crypto && got_video_crypto < 1) { + if (smh->crypto_mode == CRYPTO_MODE_MANDATORY && got_video_crypto < 1) { switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Crypto not negotiated but required.\n"); vmatch = 0; m_idx = 0; @@ -4670,8 +4749,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_activate_rtp(switch_core_sessi switch_rtp_reset_media_timer(a_engine->rtp_session); } - if (!switch_channel_test_flag(session->channel, CF_SECURE) && (var = switch_channel_get_variable(session->channel, "rtp_secure_media")) && - (switch_true(var) || switch_core_media_crypto_str2type(var) != CRYPTO_INVALID)) { + if (a_engine->crypto_type != CRYPTO_INVALID) { switch_channel_set_flag(session->channel, CF_SECURE); } @@ -5528,7 +5606,6 @@ static void generate_m(switch_core_session_t *session, char *buf, size_t buflen, int rate; int already_did[128] = { 0 }; int ptime = 0, noptime = 0; - //const char *local_audio_crypto_key = switch_core_session_local_crypto_key(session, SWITCH_MEDIA_TYPE_AUDIO); const char *local_sdp_audio_zrtp_hash; switch_media_handle_t *smh; switch_rtp_engine_t *a_engine; @@ -5767,10 +5844,12 @@ static void generate_m(switch_core_session_t *session, char *buf, size_t buflen, if (secure && !switch_channel_test_flag(session->channel, CF_DTLS)) { int i; - - for (i = 0; i < CRYPTO_INVALID; i++) { - if ((a_engine->crypto_type == i || a_engine->crypto_type == CRYPTO_INVALID) && !zstr(a_engine->ssec[i].local_crypto_key)) { - switch_snprintf(buf + strlen(buf), buflen - strlen(buf), "a=crypto:%s\n", a_engine->ssec[i].local_crypto_key); + + for (i = 0; smh->crypto_suite_order[i] != CRYPTO_INVALID; i++) { + switch_rtp_crypto_key_type_t j = SUITES[smh->crypto_suite_order[i]].type; + + if ((a_engine->crypto_type == j || a_engine->crypto_type == CRYPTO_INVALID) && !zstr(a_engine->ssec[j].local_crypto_key)) { + switch_snprintf(buf + strlen(buf), buflen - strlen(buf), "a=crypto:%s\n", a_engine->ssec[j].local_crypto_key); } } //switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=encryption:optional\n"); @@ -5941,7 +6020,6 @@ SWITCH_DECLARE(void) switch_core_media_gen_local_sdp(switch_core_session_t *sess int red = 0; payload_map_t *pmap; int is_outbound = switch_channel_direction(session->channel) == SWITCH_CALL_DIRECTION_OUTBOUND; - const char *secure_media_var = switch_channel_get_variable(session->channel, "rtp_secure_media"); switch_assert(session); @@ -5987,13 +6065,8 @@ SWITCH_DECLARE(void) switch_core_media_gen_local_sdp(switch_core_session_t *sess generate_local_fingerprint(smh, SWITCH_MEDIA_TYPE_AUDIO); } } - - switch_core_session_check_outgoing_crypto(session, secure_media_var); - - } else { - if (switch_channel_test_flag(smh->session->channel, CF_DTLS)) { - a_engine->no_crypto = 1; - } + switch_core_session_parse_crypto_prefs(session); + switch_core_session_check_outgoing_crypto(session); } fmtp_out = a_engine->cur_payload_map->fmtp_out; @@ -6017,8 +6090,11 @@ SWITCH_DECLARE(void) switch_core_media_gen_local_sdp(switch_core_session_t *sess if (!smh->payload_space) { int i; - - smh->payload_space = 98; + if (switch_channel_test_flag(session->channel, CF_WEBRTC)) { + smh->payload_space = 102; + } else { + smh->payload_space = 98; + } for (i = 0; i < smh->mparams->num_codecs; i++) { smh->ianacodes[i] = smh->codecs[i]->ianacode; @@ -6170,12 +6246,12 @@ SWITCH_DECLARE(void) switch_core_media_gen_local_sdp(switch_core_session_t *sess if (a_engine->codec_negotiated) { - switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "m=audio %d %s", port, - get_media_profile_name(session, - ((!a_engine->no_crypto || switch_channel_test_flag(session->channel, CF_DTLS)) && - a_engine->crypto_type != CRYPTO_INVALID - ))); + get_media_profile_name(session, !a_engine->no_crypto && + (switch_channel_test_flag(session->channel, CF_DTLS) || a_engine->crypto_type != CRYPTO_INVALID))); + + + switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), " %d", a_engine->cur_payload_map->pt); @@ -6367,9 +6443,6 @@ SWITCH_DECLARE(void) switch_core_media_gen_local_sdp(switch_core_session_t *sess #endif } - - - if (a_engine->crypto_type != CRYPTO_INVALID && !switch_channel_test_flag(session->channel, CF_DTLS) && !zstr(a_engine->ssec[a_engine->crypto_type].local_crypto_key) && switch_channel_test_flag(session->channel, CF_SECURE)) { @@ -6395,15 +6468,14 @@ SWITCH_DECLARE(void) switch_core_media_gen_local_sdp(switch_core_session_t *sess if (switch_channel_test_flag(session->channel, CF_WEBRTC) || (mult && switch_false(mult))) { char *bp = buf; - int both = switch_channel_test_flag(session->channel, CF_WEBRTC) ? 0 : 1; + int both = (switch_channel_test_flag(session->channel, CF_WEBRTC) || switch_channel_test_flag(session->channel, CF_DTLS)) ? 0 : 1; if ((!a_engine->no_crypto && switch_channel_test_flag(session->channel, CF_SECURE)) || switch_channel_test_flag(session->channel, CF_DTLS)) { generate_m(session, buf, SDPBUFLEN, port, family, ip, 0, append_audio, sr, use_cng, cng_type, map, 1, sdp_type); bp = (buf + strlen(buf)); - /* asterisk can't handle AVP and SAVP in sep streams, way to blow off the spec....*/ - if (switch_true(switch_channel_get_variable(session->channel, "sdp_secure_savp_only"))) { + if (smh->crypto_mode == CRYPTO_MODE_MANDATORY) { both = 0; } @@ -6439,13 +6511,12 @@ SWITCH_DECLARE(void) switch_core_media_gen_local_sdp(switch_core_session_t *sess generate_m(session, bp, SDPBUFLEN - strlen(buf), port, family, ip, cur_ptime, append_audio, sr, use_cng, cng_type, map, 1, sdp_type); bp = (buf + strlen(buf)); - /* asterisk can't handle AVP and SAVP in sep streams, way to blow off the spec....*/ - if (switch_true(switch_channel_get_variable(session->channel, "sdp_secure_savp_only"))) { + if (smh->crypto_mode == CRYPTO_MODE_MANDATORY) { both = 0; } } - if (switch_channel_test_flag(session->channel, CF_WEBRTC)) { + if (switch_channel_test_flag(session->channel, CF_WEBRTC) || switch_channel_test_flag(session->channel, CF_DTLS)) { both = 0; } @@ -6476,344 +6547,359 @@ SWITCH_DECLARE(void) switch_core_media_gen_local_sdp(switch_core_session_t *sess } if ((v_port = v_engine->adv_sdp_port)) { + int loops; - if (switch_channel_test_flag(smh->session->channel, CF_ICE)) { - gen_ice(session, SWITCH_MEDIA_TYPE_VIDEO, ip, (switch_port_t)v_port); - } - /* - switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "m=video %d RTP/%sAVP%s", - v_port, ((!zstr(local_video_crypto_key) || switch_channel_test_flag(session->channel, CF_DTLS)) - && switch_channel_test_flag(session->channel, CF_SECURE)) ? "S" : "", - switch_channel_test_flag(session->channel, CF_WEBRTC) ? "F" : ""); - */ + for (loops = 0; loops < 2; loops++) { - switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "m=video %d %s", - v_port, get_media_profile_name(session, - (!v_engine->no_crypto || switch_channel_test_flag(session->channel, CF_DTLS)) - && v_engine->crypto_type != CRYPTO_INVALID)); + if (switch_channel_test_flag(smh->session->channel, CF_ICE)) { + gen_ice(session, SWITCH_MEDIA_TYPE_VIDEO, ip, (switch_port_t)v_port); + } + + + switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "m=video %d %s", + v_port, + get_media_profile_name(session, + (loops == 0 && switch_channel_test_flag(session->channel, CF_SECURE) + && switch_channel_direction(session->channel) == SWITCH_CALL_DIRECTION_OUTBOUND) || + a_engine->crypto_type != CRYPTO_INVALID || switch_channel_test_flag(session->channel, CF_DTLS))); + - /*****************************/ - if (v_engine->codec_negotiated) { - payload_map_t *pmap; - switch_core_media_set_video_codec(session, 0); - switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), " %d", v_engine->cur_payload_map->agreed_pt); + /*****************************/ + if (v_engine->codec_negotiated) { + payload_map_t *pmap; + switch_core_media_set_video_codec(session, 0); + switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), " %d", v_engine->cur_payload_map->agreed_pt); - if (switch_media_handle_test_media_flag(smh, SCMF_MULTI_ANSWER_VIDEO)) { - switch_mutex_lock(smh->sdp_mutex); - for (pmap = v_engine->cur_payload_map; pmap && pmap->allocated; pmap = pmap->next) { - if (pmap->pt != v_engine->cur_payload_map->pt) { - switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), " %d", pmap->pt); + if (switch_media_handle_test_media_flag(smh, SCMF_MULTI_ANSWER_VIDEO)) { + switch_mutex_lock(smh->sdp_mutex); + for (pmap = v_engine->cur_payload_map; pmap && pmap->allocated; pmap = pmap->next) { + if (pmap->pt != v_engine->cur_payload_map->pt) { + switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), " %d", pmap->pt); + } } + switch_mutex_unlock(smh->sdp_mutex); } - switch_mutex_unlock(smh->sdp_mutex); - } - } else if (smh->mparams->num_codecs) { - int i; - int already_did[128] = { 0 }; - for (i = 0; i < smh->mparams->num_codecs; i++) { - const switch_codec_implementation_t *imp = smh->codecs[i]; + } else if (smh->mparams->num_codecs) { + int i; + int already_did[128] = { 0 }; + for (i = 0; i < smh->mparams->num_codecs; i++) { + const switch_codec_implementation_t *imp = smh->codecs[i]; - if (imp->codec_type != SWITCH_CODEC_TYPE_VIDEO) { - continue; - } - - if (switch_channel_direction(session->channel) == SWITCH_CALL_DIRECTION_INBOUND && - switch_channel_test_flag(session->channel, CF_NOVIDEO)) { - continue; - } - - if (smh->ianacodes[i] < 128) { - if (already_did[smh->ianacodes[i]]) { + if (imp->codec_type != SWITCH_CODEC_TYPE_VIDEO) { continue; } - already_did[smh->ianacodes[i]] = 1; - } - switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), " %d", smh->ianacodes[i]); + if (switch_channel_direction(session->channel) == SWITCH_CALL_DIRECTION_INBOUND && + switch_channel_test_flag(session->channel, CF_NOVIDEO)) { + continue; + } - if (!ptime) { - ptime = imp->microseconds_per_packet / 1000; + if (smh->ianacodes[i] < 128) { + if (already_did[smh->ianacodes[i]]) { + continue; + } + already_did[smh->ianacodes[i]] = 1; + } + + switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), " %d", smh->ianacodes[i]); + + if (!ptime) { + ptime = imp->microseconds_per_packet / 1000; + } } } - } - switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "\n"); + switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "\n"); - if (v_engine->codec_negotiated) { - const char *of; - payload_map_t *pmap; + if (v_engine->codec_negotiated) { + const char *of; + payload_map_t *pmap; - if (!strcasecmp(v_engine->cur_payload_map->rm_encoding, "VP8")) { - vp8 = v_engine->cur_payload_map->pt; - } + if (!strcasecmp(v_engine->cur_payload_map->rm_encoding, "VP8")) { + vp8 = v_engine->cur_payload_map->pt; + } - if (!strcasecmp(v_engine->cur_payload_map->rm_encoding, "red")) { - red = v_engine->cur_payload_map->pt; - } + if (!strcasecmp(v_engine->cur_payload_map->rm_encoding, "red")) { + red = v_engine->cur_payload_map->pt; + } - rate = v_engine->cur_payload_map->rm_rate; - switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "a=rtpmap:%d %s/%ld\n", - v_engine->cur_payload_map->pt, v_engine->cur_payload_map->rm_encoding, - v_engine->cur_payload_map->rm_rate); + rate = v_engine->cur_payload_map->rm_rate; + switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "a=rtpmap:%d %s/%ld\n", + v_engine->cur_payload_map->pt, v_engine->cur_payload_map->rm_encoding, + v_engine->cur_payload_map->rm_rate); - if (switch_channel_test_flag(session->channel, CF_RECOVERING)) { - pass_fmtp = v_engine->cur_payload_map->rm_fmtp; - } else { + if (switch_channel_test_flag(session->channel, CF_RECOVERING)) { + pass_fmtp = v_engine->cur_payload_map->rm_fmtp; + } else { - pass_fmtp = NULL; + pass_fmtp = NULL; - if (switch_channel_get_partner_uuid(session->channel)) { - if ((of = switch_channel_get_variable_partner(session->channel, "rtp_video_fmtp"))) { - pass_fmtp = of; + if (switch_channel_get_partner_uuid(session->channel)) { + if ((of = switch_channel_get_variable_partner(session->channel, "rtp_video_fmtp"))) { + pass_fmtp = of; + } + } + + if (ov_fmtp) { + pass_fmtp = ov_fmtp; + } else { //if (switch_true(switch_channel_get_variable_dup(session->channel, "rtp_mirror_fmtp", SWITCH_FALSE, -1))) { + // seems to break eyebeam at least... + pass_fmtp = switch_channel_get_variable(session->channel, "rtp_video_fmtp"); } } - - if (ov_fmtp) { - pass_fmtp = ov_fmtp; - } else { //if (switch_true(switch_channel_get_variable_dup(session->channel, "rtp_mirror_fmtp", SWITCH_FALSE, -1))) { - // seems to break eyebeam at least... - pass_fmtp = switch_channel_get_variable(session->channel, "rtp_video_fmtp"); - } - } - if (pass_fmtp) { - switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "a=fmtp:%d %s\n", v_engine->cur_payload_map->pt, pass_fmtp); - } + if (pass_fmtp) { + switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "a=fmtp:%d %s\n", v_engine->cur_payload_map->pt, pass_fmtp); + } - if (switch_media_handle_test_media_flag(smh, SCMF_MULTI_ANSWER_VIDEO)) { - switch_mutex_lock(smh->sdp_mutex); - for (pmap = v_engine->cur_payload_map; pmap && pmap->allocated; pmap = pmap->next) { - if (pmap->pt != v_engine->cur_payload_map->pt && pmap->negotiated) { - switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "a=rtpmap:%d %s/%ld\n", - pmap->pt, pmap->iananame, pmap->rate); + if (switch_media_handle_test_media_flag(smh, SCMF_MULTI_ANSWER_VIDEO)) { + switch_mutex_lock(smh->sdp_mutex); + for (pmap = v_engine->cur_payload_map; pmap && pmap->allocated; pmap = pmap->next) { + if (pmap->pt != v_engine->cur_payload_map->pt && pmap->negotiated) { + switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "a=rtpmap:%d %s/%ld\n", + pmap->pt, pmap->iananame, pmap->rate); + } } - } - switch_mutex_unlock(smh->sdp_mutex); - } - - - if (append_video) { - switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "%s%s", append_video, end_of(append_video) == '\n' ? "" : "\n"); - } - - } else if (smh->mparams->num_codecs) { - int i; - int already_did[128] = { 0 }; - - for (i = 0; i < smh->mparams->num_codecs; i++) { - const switch_codec_implementation_t *imp = smh->codecs[i]; - char *fmtp = NULL; - uint32_t ianacode = smh->ianacodes[i]; - int channels; - - if (imp->codec_type != SWITCH_CODEC_TYPE_VIDEO) { - continue; + switch_mutex_unlock(smh->sdp_mutex); } - if (switch_channel_direction(session->channel) == SWITCH_CALL_DIRECTION_INBOUND && - switch_channel_test_flag(session->channel, CF_NOVIDEO)) { - continue; + + if (append_video) { + switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "%s%s", append_video, end_of(append_video) == '\n' ? "" : "\n"); } - if (ianacode < 128) { - if (already_did[ianacode]) { + } else if (smh->mparams->num_codecs) { + int i; + int already_did[128] = { 0 }; + + for (i = 0; i < smh->mparams->num_codecs; i++) { + const switch_codec_implementation_t *imp = smh->codecs[i]; + char *fmtp = NULL; + uint32_t ianacode = smh->ianacodes[i]; + int channels; + + if (imp->codec_type != SWITCH_CODEC_TYPE_VIDEO) { continue; } - already_did[ianacode] = 1; - } - if (!rate) { - rate = imp->samples_per_second; - } - - channels = get_channels(imp->iananame, imp->number_of_channels); - - if (!strcasecmp(imp->iananame, "VP8")) { - vp8 = ianacode; - } - - if (!strcasecmp(imp->iananame, "red")) { - red = ianacode; - } - - if (channels > 1) { - switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "a=rtpmap:%d %s/%d/%d\n", ianacode, imp->iananame, - imp->samples_per_second, channels); - } else { - switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "a=rtpmap:%d %s/%d\n", ianacode, imp->iananame, - imp->samples_per_second); - } - - if (!zstr(ov_fmtp)) { - fmtp = (char *) ov_fmtp; - } else { - - if (map) { - fmtp = switch_event_get_header(map, imp->iananame); + if (switch_channel_direction(session->channel) == SWITCH_CALL_DIRECTION_INBOUND && + switch_channel_test_flag(session->channel, CF_NOVIDEO)) { + continue; } - - if (smh->fmtps[i]) { - fmtp = smh->fmtps[i]; + + if (ianacode < 128) { + if (already_did[ianacode]) { + continue; + } + already_did[ianacode] = 1; } - - if (zstr(fmtp)) fmtp = imp->fmtp; - if (zstr(fmtp)) fmtp = (char *) pass_fmtp; - } + if (!rate) { + rate = imp->samples_per_second; + } - if (!zstr(fmtp) && strcasecmp(fmtp, "_blank_")) { - switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "a=fmtp:%d %s\n", ianacode, fmtp); + channels = get_channels(imp->iananame, imp->number_of_channels); + + if (!strcasecmp(imp->iananame, "VP8")) { + vp8 = ianacode; + } + + if (!strcasecmp(imp->iananame, "red")) { + red = ianacode; + } + + if (channels > 1) { + switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "a=rtpmap:%d %s/%d/%d\n", ianacode, imp->iananame, + imp->samples_per_second, channels); + } else { + switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "a=rtpmap:%d %s/%d\n", ianacode, imp->iananame, + imp->samples_per_second); + } + + if (!zstr(ov_fmtp)) { + fmtp = (char *) ov_fmtp; + } else { + + if (map) { + fmtp = switch_event_get_header(map, imp->iananame); + } + + if (smh->fmtps[i]) { + fmtp = smh->fmtps[i]; + } + + if (zstr(fmtp)) fmtp = imp->fmtp; + + if (zstr(fmtp)) fmtp = (char *) pass_fmtp; + } + + if (!zstr(fmtp) && strcasecmp(fmtp, "_blank_")) { + switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "a=fmtp:%d %s\n", ianacode, fmtp); + } + } + + } + + if ((is_outbound || switch_channel_test_flag(session->channel, CF_RECOVERING)) + && switch_channel_test_flag(smh->session->channel, CF_DTLS)) { + generate_local_fingerprint(smh, SWITCH_MEDIA_TYPE_VIDEO); + } + + + if (!zstr(v_engine->local_dtls_fingerprint.type)) { + switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "a=fingerprint:%s %s\n", v_engine->local_dtls_fingerprint.type, + v_engine->local_dtls_fingerprint.str); + } + + + if (smh->mparams->rtcp_video_interval_msec) { + if (v_engine->rtcp_mux > 0) { + switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "a=rtcp-mux\n"); + switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "a=rtcp:%d IN %s %s\n", v_port, family, ip); + } else { + switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "a=rtcp:%d IN %s %s\n", v_port + 1, family, ip); } } - - } - - if ((is_outbound || switch_channel_test_flag(session->channel, CF_RECOVERING)) - && switch_channel_test_flag(smh->session->channel, CF_DTLS)) { - generate_local_fingerprint(smh, SWITCH_MEDIA_TYPE_VIDEO); - } - if (!zstr(v_engine->local_dtls_fingerprint.type)) { - switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "a=fingerprint:%s %s\n", v_engine->local_dtls_fingerprint.type, - v_engine->local_dtls_fingerprint.str); - } - - - if (smh->mparams->rtcp_video_interval_msec) { - if (v_engine->rtcp_mux > 0) { - switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "a=rtcp-mux\n"); - switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "a=rtcp:%d IN %s %s\n", v_port, family, ip); - } else { - switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "a=rtcp:%d IN %s %s\n", v_port + 1, family, ip); - } - } - - - if (v_engine->fir || v_engine->pli) { - switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), - "a=rtcp-fb:* %s%s\n", v_engine->fir ? "fir " : "", v_engine->pli ? "pli" : ""); - } - - //switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "a=ssrc:%u\n", v_engine->ssrc); - - if (v_engine->ice_out.cands[0][0].ready) { - char tmp1[11] = ""; - char tmp2[11] = ""; - uint32_t c1 = (2^24)*126 + (2^8)*65535 + (2^0)*(256 - 1); - uint32_t c2 = (2^24)*126 + (2^8)*65535 + (2^0)*(256 - 2); - uint32_t c3 = (2^24)*126 + (2^8)*65534 + (2^0)*(256 - 1); - uint32_t c4 = (2^24)*126 + (2^8)*65534 + (2^0)*(256 - 2); - const char *vbw; - int bw = 256; - - tmp1[10] = '\0'; - tmp2[10] = '\0'; - switch_stun_random_string(tmp1, 10, "0123456789"); - switch_stun_random_string(tmp2, 10, "0123456789"); - - ice_out = &v_engine->ice_out; - - - if ((vbw = switch_channel_get_variable(smh->session->channel, "rtp_video_max_bandwidth"))) { - int v = atoi(vbw); - bw = v; - } - - if (bw > 0) { - switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "b=AS:%d\n", bw); - } - - if (vp8 && switch_channel_test_flag(session->channel, CF_WEBRTC)) { + if (v_engine->fir || v_engine->pli) { switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), - "a=rtcp-fb:%d ccm fir\n", vp8); + "a=rtcp-fb:* %s%s\n", v_engine->fir ? "fir " : "", v_engine->pli ? "pli" : ""); } + + //switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "a=ssrc:%u\n", v_engine->ssrc); + + if (v_engine->ice_out.cands[0][0].ready) { + char tmp1[11] = ""; + char tmp2[11] = ""; + uint32_t c1 = (2^24)*126 + (2^8)*65535 + (2^0)*(256 - 1); + uint32_t c2 = (2^24)*126 + (2^8)*65535 + (2^0)*(256 - 2); + uint32_t c3 = (2^24)*126 + (2^8)*65534 + (2^0)*(256 - 1); + uint32_t c4 = (2^24)*126 + (2^8)*65534 + (2^0)*(256 - 2); + const char *vbw; + int bw = 256; - if (red) { - switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), - "a=rtcp-fb:%d nack\n", vp8); - } + tmp1[10] = '\0'; + tmp2[10] = '\0'; + switch_stun_random_string(tmp1, 10, "0123456789"); + switch_stun_random_string(tmp2, 10, "0123456789"); + + ice_out = &v_engine->ice_out; + + + if ((vbw = switch_channel_get_variable(smh->session->channel, "rtp_video_max_bandwidth"))) { + int v = atoi(vbw); + bw = v; + } - switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "a=ssrc:%u cname:%s\n", v_engine->ssrc, smh->cname); - switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "a=ssrc:%u msid:%s v0\n", v_engine->ssrc, smh->msid); - switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "a=ssrc:%u mslabel:%s\n", v_engine->ssrc, smh->msid); - switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "a=ssrc:%u label:%sv0\n", v_engine->ssrc, smh->msid); + if (bw > 0) { + switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "b=AS:%d\n", bw); + } + + if (vp8 && switch_channel_test_flag(session->channel, CF_WEBRTC)) { + switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), + "a=rtcp-fb:%d ccm fir\n", vp8); + } + + if (red) { + switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), + "a=rtcp-fb:%d nack\n", vp8); + } + + switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "a=ssrc:%u cname:%s\n", v_engine->ssrc, smh->cname); + switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "a=ssrc:%u msid:%s v0\n", v_engine->ssrc, smh->msid); + switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "a=ssrc:%u mslabel:%s\n", v_engine->ssrc, smh->msid); + switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "a=ssrc:%u label:%sv0\n", v_engine->ssrc, smh->msid); - switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "a=ice-ufrag:%s\n", ice_out->ufrag); - switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "a=ice-pwd:%s\n", ice_out->pwd); + switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "a=ice-ufrag:%s\n", ice_out->ufrag); + switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "a=ice-pwd:%s\n", ice_out->pwd); - switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "a=candidate:%s 1 %s %u %s %d typ host generation 0\n", - tmp1, ice_out->cands[0][0].transport, c1, - ice_out->cands[0][0].con_addr, ice_out->cands[0][0].con_port - ); - - if (!zstr(v_engine->local_sdp_ip) && !zstr(ice_out->cands[0][0].con_addr) && - strcmp(v_engine->local_sdp_ip, ice_out->cands[0][0].con_addr) - && v_engine->local_sdp_port != ice_out->cands[0][0].con_port) { - - switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "a=candidate:%s 1 %s %u %s %d typ srflx raddr %s rport %d generation 0\n", - tmp2, ice_out->cands[0][0].transport, c3, - ice_out->cands[0][0].con_addr, ice_out->cands[0][0].con_port, - v_engine->local_sdp_ip, v_engine->local_sdp_port + switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "a=candidate:%s 1 %s %u %s %d typ host generation 0\n", + tmp1, ice_out->cands[0][0].transport, c1, + ice_out->cands[0][0].con_addr, ice_out->cands[0][0].con_port ); - } + if (!zstr(v_engine->local_sdp_ip) && !zstr(ice_out->cands[0][0].con_addr) && + strcmp(v_engine->local_sdp_ip, ice_out->cands[0][0].con_addr) + && v_engine->local_sdp_port != ice_out->cands[0][0].con_port) { - if (v_engine->rtcp_mux < 1 || is_outbound || - switch_channel_test_flag(session->channel, CF_RECOVERING)) { - - switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "a=candidate:%s 2 %s %u %s %d typ host generation 0\n", - tmp1, ice_out->cands[0][0].transport, c2, - ice_out->cands[0][0].con_addr, ice_out->cands[0][0].con_port + (v_engine->rtcp_mux > 0 ? 0 : 1) - ); - - - if (!zstr(v_engine->local_sdp_ip) && !zstr(ice_out->cands[0][1].con_addr) && - strcmp(v_engine->local_sdp_ip, ice_out->cands[0][1].con_addr) - && v_engine->local_sdp_port != ice_out->cands[0][1].con_port) { - - switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "a=candidate:%s 2 %s %u %s %d typ srflx generation 0\n", - tmp2, ice_out->cands[0][0].transport, c4, - ice_out->cands[0][0].con_addr, ice_out->cands[0][0].con_port + (v_engine->rtcp_mux > 0 ? 0 : 1), - v_engine->local_sdp_ip, v_engine->local_sdp_port + (v_engine->rtcp_mux > 0 ? 0 : 1) + switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "a=candidate:%s 1 %s %u %s %d typ srflx raddr %s rport %d generation 0\n", + tmp2, ice_out->cands[0][0].transport, c3, + ice_out->cands[0][0].con_addr, ice_out->cands[0][0].con_port, + v_engine->local_sdp_ip, v_engine->local_sdp_port ); } - } + + + if (v_engine->rtcp_mux < 1 || is_outbound || + switch_channel_test_flag(session->channel, CF_RECOVERING)) { + + switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "a=candidate:%s 2 %s %u %s %d typ host generation 0\n", + tmp1, ice_out->cands[0][0].transport, c2, + ice_out->cands[0][0].con_addr, ice_out->cands[0][0].con_port + (v_engine->rtcp_mux > 0 ? 0 : 1) + ); + + + if (!zstr(v_engine->local_sdp_ip) && !zstr(ice_out->cands[0][1].con_addr) && + strcmp(v_engine->local_sdp_ip, ice_out->cands[0][1].con_addr) + && v_engine->local_sdp_port != ice_out->cands[0][1].con_port) { + + switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "a=candidate:%s 2 %s %u %s %d typ srflx generation 0\n", + tmp2, ice_out->cands[0][0].transport, c4, + ice_out->cands[0][0].con_addr, ice_out->cands[0][0].con_port + (v_engine->rtcp_mux > 0 ? 0 : 1), + v_engine->local_sdp_ip, v_engine->local_sdp_port + (v_engine->rtcp_mux > 0 ? 0 : 1) + ); + } + } #ifdef GOOGLE_ICE - switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "a=ice-options:google-ice\n"); + switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "a=ice-options:google-ice\n"); #endif - } + } + if (loops == 0 && switch_channel_test_flag(session->channel, CF_SECURE) && !switch_channel_test_flag(session->channel, CF_DTLS)) { + int i; + + for (i = 0; smh->crypto_suite_order[i] != CRYPTO_INVALID; i++) { + switch_rtp_crypto_key_type_t j = SUITES[smh->crypto_suite_order[i]].type; + + if ((a_engine->crypto_type == j || a_engine->crypto_type == CRYPTO_INVALID) && !zstr(a_engine->ssec[j].local_crypto_key)) { + switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "a=crypto:%s\n", v_engine->ssec[j].local_crypto_key); + } + } + //switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=encryption:optional\n"); + } - if (switch_channel_test_flag(session->channel, CF_SECURE) && !switch_channel_test_flag(session->channel, CF_DTLS) && - v_engine->crypto_type != CRYPTO_INVALID && - !zstr(v_engine->ssec[v_engine->crypto_type].local_crypto_key)) { - switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "a=crypto:%s\n", v_engine->ssec[v_engine->crypto_type].local_crypto_key); - //switch_snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "a=encryption:optional\n"); - } - - if (local_sdp_video_zrtp_hash) { - switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Adding video a=zrtp-hash:%s\n", local_sdp_video_zrtp_hash); - switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "a=zrtp-hash:%s\n", local_sdp_video_zrtp_hash); + if (local_sdp_video_zrtp_hash) { + switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Adding video a=zrtp-hash:%s\n", local_sdp_video_zrtp_hash); + switch_snprintf(buf + strlen(buf), SDPBUFLEN - strlen(buf), "a=zrtp-hash:%s\n", local_sdp_video_zrtp_hash); + } + + + if (switch_channel_test_flag(session->channel, CF_DTLS) || + !switch_channel_test_flag(session->channel, CF_SECURE) || + smh->crypto_mode == CRYPTO_MODE_MANDATORY || smh->crypto_mode == CRYPTO_MODE_FORBIDDEN) { + break; + } } } + } @@ -7399,6 +7485,14 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_receive_message(switch_core_se switch (msg->message_id) { + case SWITCH_MESSAGE_RESAMPLE_EVENT: + { + if (switch_channel_test_flag(session->channel, CF_CONFERENCE)) { + switch_channel_set_flag(session->channel, CF_CONFERENCE_RESET_MEDIA); + } + } + break; + case SWITCH_MESSAGE_INDICATE_VIDEO_REFRESH_REQ: { if (v_engine->rtp_session) { diff --git a/src/switch_core_session.c b/src/switch_core_session.c index 028f745457..37b4bf7654 100644 --- a/src/switch_core_session.c +++ b/src/switch_core_session.c @@ -222,8 +222,8 @@ SWITCH_DECLARE(uint32_t) switch_core_session_hupall_matching_var_ans(const char return r; switch_mutex_lock(runtime.session_hash_mutex); - for (hi = switch_hash_first(NULL, session_manager.session_table); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, NULL, NULL, &val); + for (hi = switch_core_hash_first( session_manager.session_table); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, NULL, NULL, &val); if (val) { session = (switch_core_session_t *) val; if (switch_core_session_read_lock(session) == SWITCH_STATUS_SUCCESS) { @@ -275,8 +275,8 @@ SWITCH_DECLARE(switch_console_callback_match_t *) switch_core_session_findall_ma switch_core_new_memory_pool(&pool); switch_mutex_lock(runtime.session_hash_mutex); - for (hi = switch_hash_first(NULL, session_manager.session_table); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, NULL, NULL, &val); + for (hi = switch_core_hash_first( session_manager.session_table); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, NULL, NULL, &val); if (val) { session = (switch_core_session_t *) val; if (switch_core_session_read_lock(session) == SWITCH_STATUS_SUCCESS) { @@ -319,8 +319,8 @@ SWITCH_DECLARE(void) switch_core_session_hupall_endpoint(const switch_endpoint_i switch_core_new_memory_pool(&pool); switch_mutex_lock(runtime.session_hash_mutex); - for (hi = switch_hash_first(NULL, session_manager.session_table); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, NULL, NULL, &val); + for (hi = switch_core_hash_first( session_manager.session_table); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, NULL, NULL, &val); if (val) { session = (switch_core_session_t *) val; if (switch_core_session_read_lock(session) == SWITCH_STATUS_SUCCESS) { @@ -359,8 +359,8 @@ SWITCH_DECLARE(void) switch_core_session_hupall(switch_call_cause_t cause) switch_mutex_lock(runtime.session_hash_mutex); - for (hi = switch_hash_first(NULL, session_manager.session_table); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, NULL, NULL, &val); + for (hi = switch_core_hash_first( session_manager.session_table); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, NULL, NULL, &val); if (val) { session = (switch_core_session_t *) val; if (switch_core_session_read_lock(session) == SWITCH_STATUS_SUCCESS) { @@ -394,8 +394,8 @@ SWITCH_DECLARE(switch_console_callback_match_t *) switch_core_session_findall(vo switch_console_callback_match_t *my_matches = NULL; switch_mutex_lock(runtime.session_hash_mutex); - for (hi = switch_hash_first(NULL, session_manager.session_table); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, NULL, NULL, &val); + for (hi = switch_core_hash_first( session_manager.session_table); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, NULL, NULL, &val); if (val) { session = (switch_core_session_t *) val; if (switch_core_session_read_lock(session) == SWITCH_STATUS_SUCCESS) { @@ -754,6 +754,7 @@ static const char *message_names[] = { "ANSWER_EVENT", "PROGRESS_EVENT", "RING_EVENT", + "RESAMPLE_EVENT", "INVALID" }; @@ -2514,7 +2515,7 @@ void switch_core_session_init(switch_memory_pool_t *pool) session_manager.session_limit = 1000; session_manager.session_id = 1; session_manager.memory_pool = pool; - switch_core_hash_init(&session_manager.session_table, session_manager.memory_pool); + switch_core_hash_init(&session_manager.session_table); if (switch_test_flag((&runtime), SCF_SESSION_THREAD_POOL)) { switch_threadattr_t *thd_attr; diff --git a/src/switch_event.c b/src/switch_event.c index bf67d404a8..18cab00728 100644 --- a/src/switch_event.c +++ b/src/switch_event.c @@ -576,9 +576,9 @@ SWITCH_DECLARE(switch_status_t) switch_event_shutdown(void) } } - for (hi = switch_hash_first(NULL, CUSTOM_HASH); hi; hi = switch_hash_next(hi)) { + for (hi = switch_core_hash_first( CUSTOM_HASH); hi; hi = switch_core_hash_next(hi)) { switch_event_subclass_t *subclass; - switch_hash_this(hi, &var, NULL, &val); + switch_core_hash_this(hi, &var, NULL, &val); if ((subclass = (switch_event_subclass_t *) val)) { FREE(subclass->name); FREE(subclass->owner); @@ -671,14 +671,14 @@ SWITCH_DECLARE(switch_status_t) switch_event_init(switch_memory_pool_t *pool) switch_mutex_init(&BLOCK, SWITCH_MUTEX_NESTED, RUNTIME_POOL); switch_mutex_init(&POOL_LOCK, SWITCH_MUTEX_NESTED, RUNTIME_POOL); switch_mutex_init(&EVENT_QUEUE_MUTEX, SWITCH_MUTEX_NESTED, RUNTIME_POOL); - switch_core_hash_init(&CUSTOM_HASH, RUNTIME_POOL); + switch_core_hash_init(&CUSTOM_HASH); - switch_core_hash_init(&event_channel_manager.lahash, RUNTIME_POOL); + switch_core_hash_init(&event_channel_manager.lahash); switch_mutex_init(&event_channel_manager.lamutex, SWITCH_MUTEX_NESTED, RUNTIME_POOL); switch_thread_rwlock_create(&event_channel_manager.rwlock, RUNTIME_POOL); - switch_core_hash_init(&event_channel_manager.hash, RUNTIME_POOL); - switch_core_hash_init(&event_channel_manager.perm_hash, RUNTIME_POOL); + switch_core_hash_init(&event_channel_manager.hash); + switch_core_hash_init(&event_channel_manager.perm_hash); event_channel_manager.ID = 1; switch_mutex_lock(EVENT_QUEUE_MUTEX); @@ -2693,16 +2693,16 @@ static void unsub_all_switch_event_channel(void) switch_thread_rwlock_wrlock(event_channel_manager.rwlock); - while ((hi = switch_hash_first(NULL, event_channel_manager.perm_hash))) { + while ((hi = switch_core_hash_first( event_channel_manager.perm_hash))) { switch_event_t *vals = NULL; - switch_hash_this(hi, &var, NULL, &val); + switch_core_hash_this(hi, &var, NULL, &val); vals = (switch_event_t *) val; switch_core_hash_delete(event_channel_manager.perm_hash, var); switch_event_destroy(&vals); } - while ((hi = switch_hash_first(NULL, event_channel_manager.hash))) { - switch_hash_this(hi, NULL, NULL, &val); + while ((hi = switch_core_hash_first( event_channel_manager.hash))) { + switch_core_hash_this(hi, NULL, NULL, &val); head = (switch_event_channel_sub_node_head_t *) val; switch_event_channel_unsub_head(NULL, head); switch_core_hash_delete(event_channel_manager.hash, head->event_channel); @@ -2724,8 +2724,8 @@ static uint32_t switch_event_channel_unsub_channel(switch_event_channel_func_t f switch_hash_index_t *hi; void *val; - for (hi = switch_hash_first(NULL, event_channel_manager.hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, NULL, NULL, &val); + for (hi = switch_core_hash_first( event_channel_manager.hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, NULL, NULL, &val); if (val) { head = (switch_event_channel_sub_node_head_t *) val; @@ -3357,7 +3357,7 @@ SWITCH_DECLARE(switch_status_t) switch_live_array_create(const char *event_chann la->key = key; la->new = SWITCH_TRUE; la->channel_id = channel_id; - switch_core_hash_init(&la->hash, la->pool); + switch_core_hash_init(&la->hash); switch_mutex_init(&la->mutex, SWITCH_MUTEX_NESTED, la->pool); switch_mutex_lock(event_channel_manager.lamutex); diff --git a/src/switch_hashtable.c b/src/switch_hashtable.c new file mode 100644 index 0000000000..a550aa9fd6 --- /dev/null +++ b/src/switch_hashtable.c @@ -0,0 +1,336 @@ +/* + * Copyright (c) 2002, Christopher Clark + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * * Neither the name of the original author; nor the names of any contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER + * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "switch.h" +#include "private/switch_hashtable_private.h" + +/* + Credit for primes table: Aaron Krowne + http://br.endernet.org/~akrowne/ + http://planetmath.org/encyclopedia/GoodHashTablePrimes.html +*/ +static const unsigned int primes[] = { + 53, 97, 193, 389, + 769, 1543, 3079, 6151, + 12289, 24593, 49157, 98317, + 196613, 393241, 786433, 1572869, + 3145739, 6291469, 12582917, 25165843, + 50331653, 100663319, 201326611, 402653189, + 805306457, 1610612741 +}; +const unsigned int prime_table_length = sizeof(primes)/sizeof(primes[0]); +const float max_load_factor = 0.65f; + +/*****************************************************************************/ +SWITCH_DECLARE(switch_status_t) +switch_create_hashtable(switch_hashtable_t **hp, unsigned int minsize, + unsigned int (*hashf) (void*), + int (*eqf) (void*,void*)) +{ + switch_hashtable_t *h; + unsigned int pindex, size = primes[0]; + + /* Check requested hashtable isn't too large */ + if (minsize > (1u << 30)) {*hp = NULL; return SWITCH_STATUS_FALSE;} + /* Enforce size as prime */ + for (pindex=0; pindex < prime_table_length; pindex++) { + if (primes[pindex] > minsize) { + size = primes[pindex]; + break; + } + } + h = (switch_hashtable_t *) malloc(sizeof(switch_hashtable_t)); + + if (NULL == h) abort(); /*oom*/ + + h->table = (struct entry **)malloc(sizeof(struct entry*) * size); + + if (NULL == h->table) abort(); /*oom*/ + + memset(h->table, 0, size * sizeof(struct entry *)); + h->tablelength = size; + h->primeindex = pindex; + h->entrycount = 0; + h->hashfn = hashf; + h->eqfn = eqf; + h->loadlimit = (unsigned int) ceil(size * max_load_factor); + + *hp = h; + return SWITCH_STATUS_SUCCESS; +} + +/*****************************************************************************/ +static int +hashtable_expand(switch_hashtable_t *h) +{ + /* Double the size of the table to accomodate more entries */ + struct entry **newtable; + struct entry *e; + struct entry **pE; + unsigned int newsize, i, index; + /* Check we're not hitting max capacity */ + if (h->primeindex == (prime_table_length - 1)) return 0; + newsize = primes[++(h->primeindex)]; + + newtable = (struct entry **)malloc(sizeof(struct entry*) * newsize); + if (NULL != newtable) + { + memset(newtable, 0, newsize * sizeof(struct entry *)); + /* This algorithm is not 'stable'. ie. it reverses the list + * when it transfers entries between the tables */ + for (i = 0; i < h->tablelength; i++) { + while (NULL != (e = h->table[i])) { + h->table[i] = e->next; + index = indexFor(newsize,e->h); + e->next = newtable[index]; + newtable[index] = e; + } + } + switch_safe_free(h->table); + h->table = newtable; + } + /* Plan B: realloc instead */ + else + { + newtable = (struct entry **) + realloc(h->table, newsize * sizeof(struct entry *)); + if (NULL == newtable) { (h->primeindex)--; return 0; } + h->table = newtable; + memset(newtable[h->tablelength], 0, newsize - h->tablelength); + for (i = 0; i < h->tablelength; i++) { + for (pE = &(newtable[i]), e = *pE; e != NULL; e = *pE) { + index = indexFor(newsize,e->h); + + if (index == i) { + pE = &(e->next); + } else { + *pE = e->next; + e->next = newtable[index]; + newtable[index] = e; + } + } + } + } + h->tablelength = newsize; + h->loadlimit = (unsigned int) ceil(newsize * max_load_factor); + return -1; +} + +/*****************************************************************************/ +SWITCH_DECLARE(unsigned int) +switch_hashtable_count(switch_hashtable_t *h) +{ + return h->entrycount; +} + +/*****************************************************************************/ +SWITCH_DECLARE(int) +switch_hashtable_insert(switch_hashtable_t *h, void *k, void *v, hashtable_flag_t flags) +{ + /* This method allows duplicate keys - but they shouldn't be used */ + unsigned int index; + struct entry *e; + if (++(h->entrycount) > h->loadlimit) + { + /* Ignore the return value. If expand fails, we should + * still try cramming just this value into the existing table + * -- we may not have memory for a larger table, but one more + * element may be ok. Next time we insert, we'll try expanding again.*/ + hashtable_expand(h); + } + e = (struct entry *)malloc(sizeof(struct entry)); + if (NULL == e) { --(h->entrycount); return 0; } /*oom*/ + e->h = hash(h,k); + index = indexFor(h->tablelength,e->h); + e->k = k; + e->v = v; + e->flags = flags; + e->next = h->table[index]; + h->table[index] = e; + return -1; +} + +/*****************************************************************************/ +SWITCH_DECLARE(void *) /* returns value associated with key */ +switch_hashtable_search(switch_hashtable_t *h, void *k) +{ + struct entry *e; + unsigned int hashvalue, index; + hashvalue = hash(h,k); + index = indexFor(h->tablelength,hashvalue); + e = h->table[index]; + while (NULL != e) { + /* Check hash value to short circuit heavier comparison */ + if ((hashvalue == e->h) && (h->eqfn(k, e->k))) return e->v; + e = e->next; + } + return NULL; +} + +/*****************************************************************************/ +SWITCH_DECLARE(void *) /* returns value associated with key */ +switch_hashtable_remove(switch_hashtable_t *h, void *k) +{ + /* TODO: consider compacting the table when the load factor drops enough, + * or provide a 'compact' method. */ + + struct entry *e; + struct entry **pE; + void *v; + unsigned int hashvalue, index; + + hashvalue = hash(h,k); + index = indexFor(h->tablelength,hash(h,k)); + pE = &(h->table[index]); + e = *pE; + while (NULL != e) { + /* Check hash value to short circuit heavier comparison */ + if ((hashvalue == e->h) && (h->eqfn(k, e->k))) { + *pE = e->next; + h->entrycount--; + v = e->v; + if (e->flags & HASHTABLE_FLAG_FREE_KEY) { + freekey(e->k); + } + switch_safe_free(e); + return v; + } + pE = &(e->next); + e = e->next; + } + return NULL; +} + +/*****************************************************************************/ +/* destroy */ +SWITCH_DECLARE(void) +switch_hashtable_destroy(switch_hashtable_t **h) +{ + unsigned int i; + struct entry *e, *f; + struct entry **table = (*h)->table; + + for (i = 0; i < (*h)->tablelength; i++) { + e = table[i]; + while (NULL != e) { + f = e; e = e->next; + + if (f->flags & HASHTABLE_FLAG_FREE_KEY) { + freekey(f->k); + } + + if (f->flags & HASHTABLE_FLAG_FREE_VALUE) { + switch_safe_free(f->v); + } + switch_safe_free(f); + } + } + + switch_safe_free((*h)->table); + free(*h); + *h = NULL; +} + +SWITCH_DECLARE(switch_hashtable_iterator_t *) switch_hashtable_next(switch_hashtable_iterator_t *i) +{ + + if (i->e) { + if ((i->e = i->e->next) != 0) { + return i; + } else { + i->pos++; + } + } + + while(i->pos < i->h->tablelength && !i->h->table[i->pos]) { + i->pos++; + } + + if (i->pos >= i->h->tablelength) { + return NULL; + } + + if ((i->e = i->h->table[i->pos]) != 0) { + return i; + } + + return NULL; +} + +SWITCH_DECLARE(switch_hashtable_iterator_t *) switch_hashtable_first(switch_hashtable_t *h) +{ + h->iterator.pos = 0; + h->iterator.e = NULL; + h->iterator.h = h; + return switch_hashtable_next(&h->iterator); +} + + + +SWITCH_DECLARE(void) switch_hashtable_this(switch_hashtable_iterator_t *i, const void **key, switch_ssize_t *klen, void **val) +{ + if (i->e) { + if (key) { + *key = i->e->k; + } + if (klen) { + *klen = (int)strlen(i->e->k); + } + if (val) { + *val = i->e->v; + } + } else { + if (key) { + *key = NULL; + } + if (klen) { + *klen = 0; + } + if (val) { + *val = NULL; + } + } +} + + +/* For Emacs: + * Local Variables: + * mode:c + * indent-tabs-mode:t + * tab-width:4 + * c-basic-offset:4 + * End: + * For VIM: + * vim:set softtabstop=4 shiftwidth=4 tabstop=4 noet: + */ + diff --git a/src/switch_ivr.c b/src/switch_ivr.c index 87ea8af4b5..4c1ada013b 100644 --- a/src/switch_ivr.c +++ b/src/switch_ivr.c @@ -1930,7 +1930,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_digit_stream_parser_new(switch_memory (*parser)->pool_auto_created = pool_auto_created; (*parser)->pool = pool; (*parser)->digit_timeout_ms = 1000; - switch_core_hash_init(&(*parser)->hash, (*parser)->pool); + switch_core_hash_init(&(*parser)->hash); status = SWITCH_STATUS_SUCCESS; } else { diff --git a/src/switch_ivr_async.c b/src/switch_ivr_async.c index c8ea1cf964..9a69776380 100644 --- a/src/switch_ivr_async.c +++ b/src/switch_ivr_async.c @@ -146,7 +146,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_dmachine_create(switch_ivr_dmachine_t dmachine->name = switch_core_strdup(dmachine->pool, name); switch_mutex_init(&dmachine->mutex, SWITCH_MUTEX_NESTED, dmachine->pool); - switch_core_hash_init(&dmachine->binding_hash, dmachine->pool); + switch_core_hash_init(&dmachine->binding_hash); if (match_callback) { dmachine->match_callback = match_callback; diff --git a/src/switch_ivr_originate.c b/src/switch_ivr_originate.c index a32574ee99..cf623d88d3 100644 --- a/src/switch_ivr_originate.c +++ b/src/switch_ivr_originate.c @@ -2189,8 +2189,8 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess } /* if ((hi = switch_channel_variable_first(caller_channel))) { - for (; hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, &vvar, NULL, &vval); + for (; hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, &vvar, NULL, &vval); if (vvar && vval) { switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, (void *) vvar, (char *) vval); } diff --git a/src/switch_loadable_module.c b/src/switch_loadable_module.c index 6c360623a3..1ce0ada021 100644 --- a/src/switch_loadable_module.c +++ b/src/switch_loadable_module.c @@ -118,8 +118,8 @@ static void switch_loadable_module_runtime(void) switch_loadable_module_t *module; switch_mutex_lock(loadable_modules.mutex); - for (hi = switch_hash_first(NULL, loadable_modules.module_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, NULL, NULL, &val); + for (hi = switch_core_hash_first( loadable_modules.module_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, NULL, NULL, &val); module = (switch_loadable_module_t *) val; if (module->switch_module_runtime) { @@ -620,8 +620,8 @@ static switch_status_t do_chat_send(switch_event_t *message_event) if (!switch_true(replying) && !switch_stristr("global", proto) && !switch_true(switch_event_get_header(message_event, "skip_global_process"))) { switch_mutex_lock(loadable_modules.mutex); - for (hi = switch_hash_first(NULL, loadable_modules.chat_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, &var, NULL, &val); + for (hi = switch_core_hash_first( loadable_modules.chat_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, &var, NULL, &val); if ((ci = (switch_chat_interface_t *) val)) { if (ci->chat_send && !strncasecmp(ci->interface_name, "GLOBAL_", 7)) { @@ -1639,8 +1639,8 @@ SWITCH_DECLARE(switch_status_t) switch_loadable_module_enumerate_loaded(switch_m switch_loadable_module_t *module; switch_mutex_lock(loadable_modules.mutex); - for (hi = switch_hash_first(NULL, loadable_modules.module_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, NULL, NULL, &val); + for (hi = switch_core_hash_first( loadable_modules.module_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, NULL, NULL, &val); module = (switch_loadable_module_t *) val; callback(user_data, module->module_interface->module_name); @@ -1777,24 +1777,24 @@ SWITCH_DECLARE(switch_status_t) switch_loadable_module_init(switch_bool_t autolo switch_loadable_module_path_init(); #endif - switch_core_hash_init(&loadable_modules.module_hash, loadable_modules.pool); - switch_core_hash_init_nocase(&loadable_modules.endpoint_hash, loadable_modules.pool); - switch_core_hash_init_nocase(&loadable_modules.codec_hash, loadable_modules.pool); - switch_core_hash_init_nocase(&loadable_modules.timer_hash, loadable_modules.pool); - switch_core_hash_init_nocase(&loadable_modules.application_hash, loadable_modules.pool); - switch_core_hash_init_nocase(&loadable_modules.chat_application_hash, loadable_modules.pool); - switch_core_hash_init_nocase(&loadable_modules.api_hash, loadable_modules.pool); - switch_core_hash_init_nocase(&loadable_modules.json_api_hash, loadable_modules.pool); - switch_core_hash_init(&loadable_modules.file_hash, loadable_modules.pool); - switch_core_hash_init_nocase(&loadable_modules.speech_hash, loadable_modules.pool); - switch_core_hash_init_nocase(&loadable_modules.asr_hash, loadable_modules.pool); - switch_core_hash_init_nocase(&loadable_modules.directory_hash, loadable_modules.pool); - switch_core_hash_init_nocase(&loadable_modules.chat_hash, loadable_modules.pool); - switch_core_hash_init_nocase(&loadable_modules.say_hash, loadable_modules.pool); - switch_core_hash_init_nocase(&loadable_modules.management_hash, loadable_modules.pool); - switch_core_hash_init_nocase(&loadable_modules.limit_hash, loadable_modules.pool); - switch_core_hash_init_nocase(&loadable_modules.dialplan_hash, loadable_modules.pool); - switch_core_hash_init(&loadable_modules.secondary_recover_hash, loadable_modules.pool); + switch_core_hash_init(&loadable_modules.module_hash); + switch_core_hash_init_nocase(&loadable_modules.endpoint_hash); + switch_core_hash_init_nocase(&loadable_modules.codec_hash); + switch_core_hash_init_nocase(&loadable_modules.timer_hash); + switch_core_hash_init_nocase(&loadable_modules.application_hash); + switch_core_hash_init_nocase(&loadable_modules.chat_application_hash); + switch_core_hash_init_nocase(&loadable_modules.api_hash); + switch_core_hash_init_nocase(&loadable_modules.json_api_hash); + switch_core_hash_init(&loadable_modules.file_hash); + switch_core_hash_init_nocase(&loadable_modules.speech_hash); + switch_core_hash_init_nocase(&loadable_modules.asr_hash); + switch_core_hash_init_nocase(&loadable_modules.directory_hash); + switch_core_hash_init_nocase(&loadable_modules.chat_hash); + switch_core_hash_init_nocase(&loadable_modules.say_hash); + switch_core_hash_init_nocase(&loadable_modules.management_hash); + switch_core_hash_init_nocase(&loadable_modules.limit_hash); + switch_core_hash_init_nocase(&loadable_modules.dialplan_hash); + switch_core_hash_init(&loadable_modules.secondary_recover_hash); switch_mutex_init(&loadable_modules.mutex, SWITCH_MUTEX_NESTED, loadable_modules.pool); if (!autoload) return SWITCH_STATUS_SUCCESS; @@ -1986,8 +1986,8 @@ SWITCH_DECLARE(void) switch_loadable_module_shutdown(void) } - for (hi = switch_hash_first(NULL, loadable_modules.module_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, NULL, NULL, &val); + for (hi = switch_core_hash_first( loadable_modules.module_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, NULL, NULL, &val); module = (switch_loadable_module_t *) val; if (!module->perm) { do_shutdown(module, SWITCH_TRUE, SWITCH_FALSE, SWITCH_FALSE, NULL); @@ -1996,8 +1996,8 @@ SWITCH_DECLARE(void) switch_loadable_module_shutdown(void) switch_yield(1000000); - for (hi = switch_hash_first(NULL, loadable_modules.module_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, NULL, NULL, &val); + for (hi = switch_core_hash_first( loadable_modules.module_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, NULL, NULL, &val); module = (switch_loadable_module_t *) val; if (!module->perm) { do_shutdown(module, SWITCH_FALSE, SWITCH_TRUE, SWITCH_FALSE, NULL); @@ -2196,8 +2196,8 @@ SWITCH_DECLARE(int) switch_loadable_module_get_codecs(const switch_codec_impleme const switch_codec_implementation_t *imp; switch_mutex_lock(loadable_modules.mutex); - for (hi = switch_hash_first(NULL, loadable_modules.codec_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, NULL, NULL, &val); + for (hi = switch_core_hash_first( loadable_modules.codec_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, NULL, NULL, &val); codec_interface = (switch_codec_interface_t *) val; /* Look for the default ptime of the codec because it's the safest choice */ diff --git a/src/switch_rtp.c b/src/switch_rtp.c index 87472ddaaf..aac2399471 100644 --- a/src/switch_rtp.c +++ b/src/switch_rtp.c @@ -1351,7 +1351,7 @@ SWITCH_DECLARE(void) switch_rtp_init(switch_memory_pool_t *pool) if (global_init) { return; } - switch_core_hash_init(&alloc_hash, pool); + switch_core_hash_init(&alloc_hash); #ifdef ENABLE_ZRTP if (zrtp_on) { uint32_t cache_len; @@ -2017,8 +2017,8 @@ SWITCH_DECLARE(void) switch_rtp_shutdown(void) switch_mutex_lock(port_lock); - for (hi = switch_hash_first(NULL, alloc_hash); hi; hi = switch_hash_next(hi)) { - switch_hash_this(hi, &var, NULL, &val); + for (hi = switch_core_hash_first( alloc_hash); hi; hi = switch_core_hash_next(hi)) { + switch_core_hash_this(hi, &var, NULL, &val); if ((alloc = (switch_core_port_allocator_t *) val)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Destroy port allocator for %s\n", (char *) var); switch_core_port_allocator_destroy(&alloc); @@ -3092,6 +3092,7 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_add_crypto_key(switch_rtp_t *rtp_sess if (switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_OUTBOUND) { switch_channel_set_variable(channel, "rtp_has_crypto", "AES_CM_256_HMAC_SHA1_80"); } + break; case AES_CM_128_NULL_AUTH: crypto_policy_set_aes_cm_128_null_auth(&policy->rtp); crypto_policy_set_aes_cm_128_null_auth(&policy->rtcp); @@ -3355,9 +3356,9 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_create(switch_rtp_t **new_rtp_session int initiator = 0; const char *zrtp_enabled = switch_channel_get_variable(channel, "zrtp_secure_media"); - const char *srtp_enabled = switch_channel_get_variable(channel, "rtp_secure_media"); + int srtp_enabled = switch_channel_test_flag(channel, CF_SECURE); - if (switch_true(srtp_enabled) && switch_true(zrtp_enabled)) { + if (srtp_enabled && switch_true(zrtp_enabled)) { switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session), SWITCH_LOG_WARNING, "You can not have ZRTP and SRTP enabled simultaneously, ZRTP will be disabled for this call!\n"); switch_channel_set_variable(channel, "zrtp_secure_media", NULL); @@ -3593,7 +3594,7 @@ static void jb_logger(const char *file, const char *func, int line, int level, c va_start(ap, fmt); ret = switch_vasprintf(&data, fmt, ap); if (ret != -1) { - switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_CONSOLE, "%s", data); + switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_CONSOLE, "%s", data); free(data); } @@ -4330,6 +4331,22 @@ SWITCH_DECLARE(void) rtp_flush_read_buffer(switch_rtp_t *rtp_session, switch_rtp } } +static int jb_valid(switch_rtp_t *rtp_session) +{ + if (rtp_session->ice.ice_user) { + if (!rtp_session->ice.ready && rtp_session->ice.rready) { + return 0; + } + } + + if (rtp_session->dtls && rtp_session->dtls->state != DS_READY) { + return 0; + } + + return 1; +} + + static void do_flush(switch_rtp_t *rtp_session, int force) { int was_blocking = 0; @@ -4353,8 +4370,12 @@ static void do_flush(switch_rtp_t *rtp_session, int force) READ_INC(rtp_session); - if (switch_rtp_ready(rtp_session)) { - + if (switch_rtp_ready(rtp_session) ) { + + if (rtp_session->jb && !rtp_session->pause_jb && jb_valid(rtp_session)) { + goto end; + } + if (rtp_session->flags[SWITCH_RTP_FLAG_DEBUG_RTP_READ]) { switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session), SWITCH_LOG_CONSOLE, "%s FLUSH\n", @@ -4395,10 +4416,12 @@ static void do_flush(switch_rtp_t *rtp_session, int force) } } while (bytes > 0); +#if 0 if (rtp_session->jb && flushed) { stfu_n_sync(rtp_session->jb, flushed); reset_jitter_seq(rtp_session); } +#endif if (was_blocking && switch_rtp_ready(rtp_session)) { switch_rtp_clear_flag(rtp_session, SWITCH_RTP_FLAG_NOBLOCK); @@ -4406,24 +4429,11 @@ static void do_flush(switch_rtp_t *rtp_session, int force) } } + end: + READ_DEC(rtp_session); } -static int jb_valid(switch_rtp_t *rtp_session) -{ - if (rtp_session->ice.ice_user) { - if (!rtp_session->ice.ready && rtp_session->ice.rready) { - return 0; - } - } - - if (rtp_session->dtls && rtp_session->dtls->state != DS_READY) { - return 0; - } - - return 1; -} - static int check_recv_payload(switch_rtp_t *rtp_session) { int ok = 1; @@ -4803,10 +4813,12 @@ static switch_status_t read_rtp_packet(switch_rtp_t *rtp_session, switch_size_t } status = SWITCH_STATUS_FALSE; + *bytes = 0; + if (!return_jb_packet) { return status; } - *bytes = 0; + } if (rtp_session->jb && !rtp_session->pause_jb && jb_valid(rtp_session)) { @@ -5046,15 +5058,36 @@ static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_ bytes = 0; - if (rtp_session->flags[SWITCH_RTP_FLAG_USE_TIMER]) { - if ((rtp_session->flags[SWITCH_RTP_FLAG_AUTOFLUSH] || rtp_session->flags[SWITCH_RTP_FLAG_STICKY_FLUSH]) && - !rtp_session->flags[SWITCH_RTP_FLAG_PROXY_MEDIA] && - !rtp_session->flags[SWITCH_RTP_FLAG_VIDEO] && - !rtp_session->flags[SWITCH_RTP_FLAG_UDPTL] && - //!rtp_session->flags[SWITCH_RTP_FLAG_RTCP_MUX] && - //!rtp_session->dtls && - rtp_session->read_pollfd) { + if (rtp_session->flags[SWITCH_RTP_FLAG_USE_TIMER] && + !rtp_session->flags[SWITCH_RTP_FLAG_PROXY_MEDIA] && + !rtp_session->flags[SWITCH_RTP_FLAG_VIDEO] && + !rtp_session->flags[SWITCH_RTP_FLAG_UDPTL] && + rtp_session->read_pollfd) { + + if (rtp_session->jb && !rtp_session->pause_jb && jb_valid(rtp_session)) { + while (switch_poll(rtp_session->read_pollfd, 1, &fdr, 0) == SWITCH_STATUS_SUCCESS) { + status = read_rtp_packet(rtp_session, &bytes, flags, SWITCH_FALSE); + if (status == SWITCH_STATUS_GENERR) { + ret = -1; + goto end; + } + + if ((*flags & SFF_RTCP)) { + *flags &= ~SFF_RTCP; + has_rtcp = 1; + read_pretriggered = 0; + goto rtcp; + } + + if (status != SWITCH_STATUS_FALSE) { + read_pretriggered = 1; + break; + } + } + + } else if ((rtp_session->flags[SWITCH_RTP_FLAG_AUTOFLUSH] || rtp_session->flags[SWITCH_RTP_FLAG_STICKY_FLUSH])) { + if (switch_poll(rtp_session->read_pollfd, 1, &fdr, 0) == SWITCH_STATUS_SUCCESS) { status = read_rtp_packet(rtp_session, &bytes, flags, SWITCH_FALSE); if (status == SWITCH_STATUS_GENERR) { diff --git a/src/switch_time.c b/src/switch_time.c index 42c864d8da..ec4e9d48b7 100644 --- a/src/switch_time.c +++ b/src/switch_time.c @@ -1342,7 +1342,7 @@ void switch_load_timezones(switch_bool_t reload) memset(&TIMEZONES_LIST, 0, sizeof(TIMEZONES_LIST)); switch_core_new_memory_pool(&TIMEZONES_LIST.pool); - switch_core_hash_init(&TIMEZONES_LIST.hash, TIMEZONES_LIST.pool); + switch_core_hash_init(&TIMEZONES_LIST.hash); if ((xml = switch_xml_open_cfg("timezones.conf", &cfg, NULL))) { if ((x_lists = switch_xml_child(cfg, "timezones"))) { diff --git a/src/switch_utils.c b/src/switch_utils.c index 4e9ca5b8e0..a5c4b8f2f7 100644 --- a/src/switch_utils.c +++ b/src/switch_utils.c @@ -3121,7 +3121,7 @@ SWITCH_DECLARE(int) switch_split_user_domain(char *in, char **user, char **domai /* Remove URL scheme */ if (!strncasecmp(in, "sip:", 4)) in += 4; - if (!strncasecmp(in, "sips:", 5)) in += 5; + else if (!strncasecmp(in, "sips:", 5)) in += 5; /* Isolate the host part from the user part */ if ((h = in, p = strchr(h, '@'))) *p = '\0', u = in, h = p+1; diff --git a/src/switch_xml.c b/src/switch_xml.c index 9fcbd44eb2..c052cf9975 100644 --- a/src/switch_xml.c +++ b/src/switch_xml.c @@ -1960,15 +1960,15 @@ SWITCH_DECLARE(uint32_t) switch_xml_clear_user_cache(const char *key, const char } else { - while ((hi = switch_hash_first(NULL, CACHE_HASH))) { - switch_hash_this(hi, &var, NULL, &val); + while ((hi = switch_core_hash_first( CACHE_HASH))) { + switch_core_hash_this(hi, &var, NULL, &val); switch_xml_free(val); switch_core_hash_delete(CACHE_HASH, var); r++; } - while ((hi = switch_hash_first(NULL, CACHE_EXPIRES_HASH))) { - switch_hash_this(hi, &var, NULL, &val); + while ((hi = switch_core_hash_first( CACHE_EXPIRES_HASH))) { + switch_core_hash_this(hi, &var, NULL, &val); switch_safe_free(val); switch_core_hash_delete(CACHE_EXPIRES_HASH, var); } @@ -2352,8 +2352,8 @@ SWITCH_DECLARE(switch_status_t) switch_xml_init(switch_memory_pool_t *pool, cons switch_mutex_init(&REFLOCK, SWITCH_MUTEX_NESTED, XML_MEMORY_POOL); switch_mutex_init(&FILE_LOCK, SWITCH_MUTEX_NESTED, XML_MEMORY_POOL); switch_mutex_init(&XML_GEN_LOCK, SWITCH_MUTEX_NESTED, XML_MEMORY_POOL); - switch_core_hash_init(&CACHE_HASH, XML_MEMORY_POOL); - switch_core_hash_init(&CACHE_EXPIRES_HASH, XML_MEMORY_POOL); + switch_core_hash_init(&CACHE_HASH); + switch_core_hash_init(&CACHE_EXPIRES_HASH); switch_thread_rwlock_create(&B_RWLOCK, XML_MEMORY_POOL); diff --git a/support-d/.bashrc b/support-d/.bashrc index a8696c213a..3efd07f20e 100644 --- a/support-d/.bashrc +++ b/support-d/.bashrc @@ -34,6 +34,7 @@ alias mgit='git commit --author "Mike Jerris "' alias tgit='git commit --author "Anthony Minessale "' alias igit='git commit --author "Raymond Chandler "' alias dp='emacs /usr/local/freeswitch/conf/dialplan/default.xml' +alias go='/usr/local/freeswitch/bin/freeswitch -nonat' alias fstop='top -p `cat /usr/local/freeswitch/run/freeswitch.pid`' alias fsgdb='gdb /usr/local/freeswitch/bin/freeswitch `cat /usr/local/freeswitch/run/freeswitch.pid`' alias fscore='gdb /usr/local/freeswitch/bin/freeswitch `ls -rt core.* | tail -n1`' diff --git a/w32/Library/FreeSwitchCore.2010.vcxproj b/w32/Library/FreeSwitchCore.2010.vcxproj index 47f3da525f..df415faf80 100644 --- a/w32/Library/FreeSwitchCore.2010.vcxproj +++ b/w32/Library/FreeSwitchCore.2010.vcxproj @@ -401,6 +401,7 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs + @@ -739,6 +740,7 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs + diff --git a/w32/Library/FreeSwitchCore.2010.vcxproj.filters b/w32/Library/FreeSwitchCore.2010.vcxproj.filters index d5dadcf267..aa60693440 100644 --- a/w32/Library/FreeSwitchCore.2010.vcxproj.filters +++ b/w32/Library/FreeSwitchCore.2010.vcxproj.filters @@ -226,6 +226,9 @@ Source Files + + Source Files + @@ -354,6 +357,9 @@ Header Files + + Header Files + diff --git a/w32/Library/FreeSwitchCore.2012.vcxproj b/w32/Library/FreeSwitchCore.2012.vcxproj index 44f6608782..1f50fa2a25 100644 --- a/w32/Library/FreeSwitchCore.2012.vcxproj +++ b/w32/Library/FreeSwitchCore.2012.vcxproj @@ -414,6 +414,7 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs + @@ -762,6 +763,7 @@ if not exist "$(OutDir)htdocs" xcopy "$(SolutionDir)htdocs\*.*" "$(OutDir)htdocs + diff --git a/w32/Library/FreeSwitchCore.2012.vcxproj.filters b/w32/Library/FreeSwitchCore.2012.vcxproj.filters index e289c8289c..e4693dafea 100644 --- a/w32/Library/FreeSwitchCore.2012.vcxproj.filters +++ b/w32/Library/FreeSwitchCore.2012.vcxproj.filters @@ -1,4 +1,4 @@ - + @@ -226,6 +226,9 @@ Source Files + + Source Files + @@ -351,6 +354,9 @@ Header Files + + Header Files + @@ -381,4 +387,4 @@ Version Files - + \ No newline at end of file