includes token in output, fixes makefile

This commit is contained in:
Peter Thorson
2012-03-05 09:24:02 -06:00
parent 86eeba1124
commit 827f8b657f
4 changed files with 14 additions and 4 deletions

2
.gitignore vendored
View File

@@ -42,3 +42,5 @@ examples/echo_server_tls/echo_server_tls
examples/concurrent_server/concurrent_server
examples/fuzzing_server_tls/fuzzing_server
examples/wsperf/wsperf

View File

@@ -9,10 +9,18 @@ LDFLAGS = -L$(BOOST_LIB_PATH)
CXX ?= c++
SHARED ?= "1"
ifeq ($(SHARED), 1)
LDFLAGS := $(LDFLAGS) -lwebsocketpp -lpthread -lboost_system -lboost_thread -lboost_random -lboost_regex -lboost_date_time -boost_chrono
OS=$(shell uname)
ifeq ($(OS), Darwin)
darwinlibs =
else
LDFLAGS := $(LDFLAGS) $(WEBSOCKETPP_PATH)/libwebsocketpp.a $(BOOST_LIB_PATH)/libboost_system.a $(BOOST_LIB_PATH)/libboost_date_time.a $(BOOST_LIB_PATH)/libboost_regex.a $(BOOST_LIB_PATH)/libboost_thread.a $(BOOST_LIB_PATH)/libboost_random.a $(BOOST_LIB_PATH)/libboost_chrono.a -lpthread
darwinlibs = -lrt -lpthread
endif
ifeq ($(SHARED), 1)
LDFLAGS := $(LDFLAGS) -lwebsocketpp $(darwinlibs) -lboost_system -lboost_thread -lboost_random -lboost_regex -lboost_date_time -boost_chrono
else
LDFLAGS := $(LDFLAGS) $(WEBSOCKETPP_PATH)/libwebsocketpp.a $(BOOST_LIB_PATH)/libboost_system.a $(BOOST_LIB_PATH)/libboost_date_time.a $(BOOST_LIB_PATH)/libboost_regex.a $(BOOST_LIB_PATH)/libboost_thread.a $(BOOST_LIB_PATH)/libboost_random.a $(BOOST_LIB_PATH)/libboost_chrono.a $(darwinlibs)
endif
wsperf: wsperf.o

Binary file not shown.

View File

@@ -140,7 +140,7 @@ struct request {
json.str("");*/
json << "{\"type\":\"test_data\",\"target\":\"" << uri << "\",\"data\":" << tests[i]->get_data() << "}";
json << "{\"type\":\"test_data\",\"uri\":\"" << uri << "\",\"token\":\"" << token << "\",\"data\":" << tests[i]->get_data() << "}";
con->send(json.str());
}