X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=apppbx.h;h=6eaf2dd844ad96e2f7131417754e21d3d858b5bb;hp=4afb1e844fa3fa8e10c1d3762648111ac70ee615;hb=b1ab2b9ac1cfc15d2a8f5850145dd69043cc3ef7;hpb=0efcf371b4a61fa1376e83d2b7404aeb47a36e26

diff --git a/apppbx.h b/apppbx.h
index 4afb1e8..6eaf2dd 100644
--- a/apppbx.h
+++ b/apppbx.h
@@ -64,7 +64,7 @@ class EndpointAppPBX : public EndpointApp
 	int			e_hold;			/* is this endpoint on hold ? */
 	char			e_tone[256];		/* save tone for resuming ports */
 
-	unsigned long		e_adminid;
+	unsigned int		e_adminid;
 
 	/* states */
 	int			e_state;		/* state of endpoint */
@@ -103,9 +103,9 @@ class EndpointAppPBX : public EndpointApp
 	int e_powercount;			/* power count */
 	int e_powerlimit;			/* power limit */
 	double e_callback;			/* time when callback (when idle reached) 0=off */
-	signed long e_cfnr_release;		/* time stamp when to do the release for call forward on no response */
-	signed long e_cfnr_call;		/* time stamp when to do the call for call forward on no response */
-	signed long e_password_timeout;		/* time stamp when to do the release for password timeout */
+	signed int e_cfnr_release;		/* time stamp when to do the release for call forward on no response */
+	signed int e_cfnr_call;		/* time stamp when to do the call for call forward on no response */
+	signed int e_password_timeout;		/* time stamp when to do the release for password timeout */
 
 	/* port relation */
 	int e_multipoint_cause;			/* cause value of disconnected multiport calls (highest priority) */
@@ -127,6 +127,7 @@ class EndpointAppPBX : public EndpointApp
 	/* read doc/keypad.txt for more information */
 	int e_dtmf_time;			/* time when the last key was received. */
 	int e_dtmf_last;			/* last dtmf key */
+	int e_enablekeypad;			/* remote app requests dtmf */
 
 	/* transmit and receive state */
 	int e_tx_state;				/* current endpoint's state */
@@ -163,8 +164,8 @@ class EndpointAppPBX : public EndpointApp
 	char e_crypt_info[33];			/* last information text */
 	int e_crypt_timeout_sec;		/* timer */
 	int e_crypt_timeout_usec;		/* timer */
-	unsigned long e_crypt_random;		/* current random number for ident */
-	unsigned long e_crypt_bogomips;		/* bogomips for ident */
+	unsigned int e_crypt_random;		/* current random number for ident */
+	unsigned int e_crypt_bogomips;		/* bogomips for ident */
 	unsigned char e_crypt_key[256];		/* the session key */
 	int e_crypt_key_len;
 	unsigned char e_crypt_ckey[256];	/* the encrypted session key */
@@ -190,7 +191,7 @@ class EndpointAppPBX : public EndpointApp
 
 	/* messages */
 	void hookflash(void);
-	void ea_message_port(unsigned long port_id, int message, union parameter *param);
+	void ea_message_port(unsigned int port_id, int message, union parameter *param);
 	void port_setup(struct port_list *portlist, int message_type, union parameter *param);
 	void port_information(struct port_list *portlist, int message_type, union parameter *param);
 	void port_dtmf(struct port_list *portlist, int message_type, union parameter *param);
@@ -205,7 +206,7 @@ class EndpointAppPBX : public EndpointApp
 	void port_facility(struct port_list *portlist, int message_type, union parameter *param);
 	void port_suspend(struct port_list *portlist, int message_type, union parameter *param);
 	void port_resume(struct port_list *portlist, int message_type, union parameter *param);
-	void ea_message_join(unsigned long join_id, int message, union parameter *param);
+	void ea_message_join(unsigned int join_id, int message, union parameter *param);
 	void join_crypt(struct port_list *portlist, int message_type, union parameter *param);
 	void join_mISDNsignal(struct port_list *portlist, int message_type, union parameter *param);
 	void join_setup(struct port_list *portlist, int message_type, union parameter *param);
@@ -249,7 +250,7 @@ class EndpointAppPBX : public EndpointApp
 	struct route_param *routeparam(struct route_action *action, unsigned long long id);
 
 	/* init / dialing / hangup */
-	void _action_init_call(char *remote);
+	int _action_init_call(char *remote);
 	void action_init_call(void);
 	void action_init_remote(void);
 	void action_dialing_internal(void);
@@ -345,7 +346,7 @@ class EndpointAppPBX : public EndpointApp
 	void cryptman_timeout(int secs);
 
 	void message_disconnect_port(struct port_list *portlist, int cause, int location, char *display);
-	void logmessage(int message_type, union parameter *param, unsigned long port_id, int dir);
+	void logmessage(int message_type, union parameter *param, unsigned int port_id, int dir);
 	void trace_header(char *name, int direction);
 };