Skip to content

GCC Fixes, Add scons compilation + fixes for RedHat. #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dsully wants to merge 2 commits into
base: master
Choose a base branch
from
Open

GCC Fixes, Add scons compilation + fixes for RedHat. #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f304f9
Cleanup GCC warnings.
Nov 27, 2012
3c8114f
Build RPM via Scons.
Nov 27, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 37 additions & 5 deletions SConstruct
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
import os

env = Environment()
env = Environment(tools=['default', 'packaging'])

debug = ARGUMENTS.get("debug", 0)

if os.path.exists('/usr/bin/rpmbuild'):
BUILD_RPM = True
else:
BUILD_RPM = False

if env["PLATFORM"] == "win32":
apachedir = "C:/Program Files/Apache Software Foundation/Apache2.2"

Expand Down Expand Up @@ -36,19 +41,46 @@ else:
SHLINKFLAGS = "-undefined dynamic_lookup")
modulesdir = "/usr/libexec/apache2"
else:
env.Append(CPPDEFINES = ["LINUX=2", "_FORTIFY_SOURCE=2", "_GNU_SOURCE", "_LARGEFILE64_SOURCE", "_REENTRANT"],
CPPPATH = ["/usr/include/apache2", "/usr/include/apr-1.0"])
modulesdir = "/usr/lib/apache2/modules"
if os.path.exists('/etc/redhat-release'):
includes = [ '/usr/include/httpd', '/usr/include/apr-1', os.getcwd() ]
modulesdir = '/usr/lib64/httpd/modules'
else:
includes = [ '/usr/include/apache2', '/usr/include/apr-1.0', os.getcwd() ]
modulesdir = '/usr/lib/apache2/modules'

env.Append(CPPDEFINES = ["LINUX=2", "_FORTIFY_SOURCE=2", "_GNU_SOURCE", "_LARGEFILE64_SOURCE", "_REENTRANT"], CPPPATH = includes)

mod_websocket = env.SharedLibrary(source=["mod_websocket.c"],
SHLIBPREFIX="",
SHLIBSUFFIX=".so")
mod_websocket_draft76 = env.SharedLibrary(source=["mod_websocket_draft76.c"],
SHLIBPREFIX="",
SHLIBSUFFIX=".so")
mod_websocket_vnc_proxy = env.SharedLibrary(source=["vncproxy/mod_websocket_vnc_proxy.c"],
SHLIBPREFIX="",
SHLIBSUFFIX=".so")

env.File('validate_utf8.h')
env.File('websocket_plugin.h')

env.Install(dir=modulesdir, source=[mod_websocket, mod_websocket_draft76])
files = env.Install(dir=modulesdir, source=[mod_websocket, mod_websocket_draft76, mod_websocket_vnc_proxy])

# Install

env.Alias("install", modulesdir)

# Package
env.Tag(files, INSTALL_LOCATION = '/usr/lib64/httpd/modules/')

if BUILD_RPM:
env.Package(
source = files,
NAME = 'httpd-mod-websocket',
VERSION = '1.0.0',
PACKAGEVERSION = 0,
PACKAGETYPE = 'rpm',
LICENSE = 'apache',
SUMMARY = 'Apache Websocket module.',
DESCRIPTION = 'Apache Websocket module.',
X_RPM_GROUP = 'System Environment/Daemons',
)
12 changes: 5 additions & 7 deletions vncproxy/mod_websocket_vnc_proxy.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@
*/

#include <stdio.h>
#include <ctype.h>
#include <unistd.h>

#include "httpd.h"
#include "http_config.h"
Expand Down Expand Up @@ -188,7 +190,6 @@ static apr_status_t tcp_proxy_query_key (request_rec * r, TcpProxyData * tpd, ap
/* Check we have a config and a datbase connection */

apr_status_t rv;
const char *dbd_password = NULL;
apr_dbd_prepared_t *statement = NULL;
apr_dbd_results_t *res = NULL;
apr_dbd_row_t *row = NULL;
Expand Down Expand Up @@ -487,7 +488,7 @@ static apr_status_t tcp_proxy_send_initial_data(request_rec * r,

ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, "tcp_proxy_send_initial_data: Data to hash is '%s'", tohash);

char hashdata[32];
unsigned char hashdata[32];
apr_crypto_hash_t *h = apr_crypto_sha256_new(mp);
h->init(h);
h->add(h, tohash, strlen(tohash));
Expand Down Expand Up @@ -636,15 +637,12 @@ void guacdump (apr_pool_t * p, char * msg, char * buf, size_t start, size_t end)

void *APR_THREAD_FUNC tcp_proxy_run(apr_thread_t * thread, void *data)
{
char buffer[64];
apr_status_t rv;
TcpProxyData *tpd = (TcpProxyData *) data;

if (!tpd)
return NULL;

request_rec *r = (tpd->server)->request(tpd->server);

apr_interval_time_t timeout = APR_USEC_PER_SEC * ((tpd->timeout)?tpd->timeout:30);
apr_pollset_t * recvpollset = NULL;

Expand Down Expand Up @@ -1092,7 +1090,7 @@ static size_t CALLBACK tcp_proxy_on_message(void *plugin_private,
* means we have to copy it
*/
towrite = NULL;
unsigned char *ztbuf = calloc(1, len + 1);
char *ztbuf = calloc(1, len + 1);
if (!ztbuf)
goto fail;
towrite = calloc(1, len + 1);
Expand Down Expand Up @@ -1138,7 +1136,7 @@ static size_t CALLBACK tcp_proxy_on_message(void *plugin_private,

if (num>0) {
apr_size_t lw = l;
rv = apr_socket_send(tpd->tcpsocket, p, &lw);
rv = apr_socket_send(tpd->tcpsocket, (char *)p, &lw);

/* move past data written */
l -= lw;
Expand Down