up

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@12117 d0543943-73ff-0310-b7d9-9358b9ac24b2

libs/esl/ESL.i

@@ -3,6 +3,46 @@
 #include "esl_oop.h"
 %}
 
-%include esl_oop.h
+class ESLevent {
+ public:
+	esl_event_t *event;
+	char *serialized_string;
+	int mine;
+	ESLevent(const char *type, const char *subclass_name = NULL);
+	virtual ~ESLevent();
+	const char *serialize(const char *format = NULL);
+	bool setPriority(esl_priority_t priority = ESL_PRIORITY_NORMAL);
+	const char *getHeader(char *header_name);
+	char *getBody(void);
+	const char *getType(void);
+	bool addBody(const char *value);
+	bool addHeader(const char *header_name, const char *value);
+	bool delHeader(const char *header_name);
+};
 
 
+
+class ESLconnection {
+ private:
+	esl_handle_t handle;
+	ESLevent *last_event_obj;
+ public:
+	ESLconnection(const char *host, const char *port, const char *password);
+	ESLconnection(int socket);
+	virtual ~ESLconnection();
+	int connected();
+	ESLevent *getInfo();
+	esl_status_t send(const char *cmd);
+	ESLevent *sendRecv(const char *cmd);
+	esl_status_t sendEvent(ESLevent *send_me);
+	ESLevent *recvEvent();
+	ESLevent *recvEventTimed(int ms);
+	esl_status_t filter(const char *header, const char *value);
+	esl_status_t events(const char *etype, const char *value);
+	esl_status_t execute(const char *app, const char *arg = NULL, const char *uuid = NULL);
+	int setBlockingExecute(const char *val);
+	int setEventLock(const char *val);
+};
+
+void eslSetLogLevel(int level);
+

libs/esl/Makefile

@@ -75,4 +75,7 @@ rubymod: $(MYLIB)
 	make MYLIB="../$(MYLIB)" SOLINK="$(SOLINK)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CXX_CFLAGS="$(CXX_CFLAGS)" -C ruby
 
 
+phpmod-install:
+	make -C php install
+
 everymod: perlmod phpmod luamod pymod rubymod

libs/esl/php/ESL.php

@@ -52,10 +52,10 @@ class ESLevent {
 		return null;
 	}
 
-	function __construct($type_or_wrap_me,$subclass_name_or_free_me=null) {
+	function __construct($type,$subclass_name=null) {
 		switch (func_num_args()) {
-		case 1: $r=new_ESLevent($type_or_wrap_me); break;
-		default: $r=new_ESLevent($type_or_wrap_me,$subclass_name_or_free_me);
+		case 1: $r=new_ESLevent($type); break;
+		default: $r=new_ESLevent($type,$subclass_name);
 		}
 		$this->_cPtr=$r;
 	}

libs/esl/php/Makefile

@@ -16,7 +16,10 @@ clean:
 	rm -f *.o *.so *~
 
 swigclean:
-	rm -f esl_wrap.* ESL.so php_ESL.*
+	rm -f esl_wrap.* ESL.so php_ESL.* ESL.php
 
 reswig:	swigclean esl_wrap.cpp
 
+install:
+	cp ESL.so $(shell php-config --extension-dir)
+	cp ESL.php $(shell php -r 'phpinfo();' | grep include_path | cut -d: -f2)

libs/esl/php/test.php

+<?php
+require_once('ESL.php');
+
+$esl = new eslConnection('127.0.0.1', '8021', 'ClueCon');
+echo $esl->sendRecv("api status");

libs/esl/src/include/esl_oop.h

@@ -44,7 +44,6 @@ EXTERN_C
 
 
 class ESLevent {
- protected:
  public:
 	esl_event_t *event;
 	char *serialized_string;