X-Git-Url: http://pilppa.org/gitweb/?p=libplpbus.git;a=blobdiff_plain;f=src_test%2Ftest_server.cc;fp=src_test%2Ftest_server.cc;h=ae00f4fa8087abfddfbe6d37fa173fee3e970e0f;hp=5c2677604f88deceeea1f3e0eb307bf98217d5ba;hb=827ba77fe55e4587ef605068ab092216cfffad2c;hpb=14952f0047c37298f20c5c084c60a8be344cb446

diff --git a/src_test/test_server.cc b/src_test/test_server.cc
index 5c26776..ae00f4f 100644
--- a/src_test/test_server.cc
+++ b/src_test/test_server.cc
@@ -13,26 +13,26 @@ class ServerListenerImpl : public IServerListener
 	public:
 		inline ServerListenerImpl() {}
 		virtual ~ServerListenerImpl() {}
-		virtual int request_received(const char *msg_req, char **msg_rsp);
-		virtual int request_received(const BusMessage *msg_req, BusMessage **msg_rsp);
+		virtual int request_received(const char *msg_req, const char **msg_rsp);
+		virtual int request_received(const BusMessage *msg_req, const BusMessage *msg_rsp);
 };
 
-int ServerListenerImpl::request_received(const char *msg_req_param, char **msg_rsp_param) {
+int ServerListenerImpl::request_received(const char *msg_req_param, const char **msg_rsp_param) {
 	log_debug("request_received(), request_param: %s\n", msg_req_param);
-	*msg_rsp_param = strdup("jee");
+	*msg_rsp_param	= "jee";
 	log_debug("request_received(), response param set: %s\n", *msg_rsp_param);
 	return 0;
 }
 
-int ServerListenerImpl::request_received(const BusMessage *msg_req_param, BusMessage **msg_rsp_param) {
+int ServerListenerImpl::request_received(const BusMessage *msg_req_param, const BusMessage *msg_rsp_param) {
 	long	type;
 	int	err_flg;
 
 	type	= ((BusMessage *)msg_req_param)->get_type(&err_flg);
 	log_debug("request_received, msg type: %ld\n", type);
-	*msg_rsp_param = new BusMessage(MSG_ID_HELLO);
+	//*msg_rsp_param = new BusMessage(MSG_ID_HELLO);
 	double dbl = (double)1.0;
-	(*msg_rsp_param)->add_double_parameter("rsp_param_double", dbl);
+	((BusMessage *)msg_rsp_param)->add_double_parameter("rsp_param_double", dbl);
 	return 0;
 }
 
@@ -43,10 +43,16 @@ int main(int argc, char** argv) {
 	if (argc >= 2) {
 		log_info("starting server\n");
 		server		= new BusServer();
-		server->init();
-		listener	= new ServerListenerImpl();
-		server->add_server_listener(listener);
-		server->launch(argv[1]);
+		if (server != NULL) {
+			server->init();
+			listener	= new ServerListenerImpl();
+			if (listener != NULL) {
+				server->add_server_listener(listener);
+				server->launch(argv[1]);
+			}
+			delete(server);
+			delete(listener);
+		}
 	}
 	else {
 		log_info("usage: give server name as a parameter\n");