X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=apppbx.h;h=1bbe8bab1355dca28a1bc18be05a51313d8001bb;hp=8d2cb07d9d224bebb4b4faecfdc6aa326c346261;hb=04fc928a2c5f0262e85c09cced1ef20a9fd15f3d;hpb=8bb49ccb7b3eba0a3f20d3b097541304b3580f70

diff --git a/apppbx.h b/apppbx.h
index 8d2cb07..1bbe8ba 100644
--- a/apppbx.h
+++ b/apppbx.h
@@ -73,8 +73,9 @@ class EndpointAppPBX : public EndpointApp
 	struct caller_info	e_callerinfo;		/* information about the caller */
 	struct dialing_info	e_dialinginfo;		/* information about dialing */
 	struct connect_info	e_connectinfo;		/* information about connected line */
-	struct redir_info	e_redirinfo;		/* info on redirection (to the calling user) */
-	struct capa_info	e_capainfo;		/* info on l3,l2 capacity */
+	struct redir_info	e_redirinfo;		/* info about redirection (to the calling user) */
+	struct capa_info	e_capainfo;		/* info about l3,l2 capacity */
+	struct rtp_info		e_rtpinfo;		/* info about rtp port forwarding and payload type */
 	time_t			e_start, e_stop;	/* time */
 	int			e_origin;		/* origin of call 0=incoming 1=outgoing */
 	struct route_ruleset	*e_ruleset;		/* current ruleset pointer (NULL=no ruleset) */
@@ -159,7 +160,8 @@ class EndpointAppPBX : public EndpointApp
 	/* efi */
 	int e_efi_state;			/* current spoken sample */
 	int e_efi_digit;			/* current spoken digit */
-	
+
+#ifdef WITH_CRYPT
 	/* crypt states and vars */
 	int e_crypt;				/* current user level crypt state */
 	int e_crypt_state;			/* current crypt manager state */
@@ -191,6 +193,7 @@ class EndpointAppPBX : public EndpointApp
 	int e_crypt_keyengine_busy;		/* current job and busy state */
 	int e_crypt_keyengine_return;		/* return */
 	struct lcr_timer e_crypt_handler; /* poll timer for crypt events */
+#endif
 
 	/* messages */
 	void hookflash(void);
@@ -206,12 +209,16 @@ class EndpointAppPBX : public EndpointApp
 	void port_disconnect_release(struct port_list *portlist, int message_type, union parameter *param);
 	void port_timeout(struct port_list *portlist, int message_type, union parameter *param);
 	void port_notify(struct port_list *portlist, int message_type, union parameter *param);
+	void port_progress(struct port_list *portlist, int message_type, union parameter *param);
 	void port_facility(struct port_list *portlist, int message_type, union parameter *param);
+	void port_3pty(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 port_enablekeypad(struct port_list *portlist, int message_type, 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_bridge(struct port_list *portlist, int message_type, union parameter *param);
 	void join_setup(struct port_list *portlist, int message_type, union parameter *param);
 	void join_information(struct port_list *portlist, int message_type, union parameter *param);
 	void join_overlap(struct port_list *portlist, int message_type, union parameter *param);
@@ -221,6 +228,7 @@ class EndpointAppPBX : public EndpointApp
 	void join_disconnect_release(int message_type, union parameter *param);
 	void join_notify(struct port_list *portlist, int message_type, union parameter *param);
 	void join_facility(struct port_list *portlist, int message_type, union parameter *param);
+	void join_dtmf(struct port_list *portlist, int message_type, union parameter *param);
 
 	/* epoint */
 	void new_state(int state);
@@ -228,8 +236,7 @@ class EndpointAppPBX : public EndpointApp
 	void notify_active(void);
 	void keypad_function(char digit);
 	void set_tone(struct port_list *portlist, const char *tone);
-	void out_setup(void);
-	struct mISDNport *hunt_port(char *ifname, int *channel);
+	void out_setup(int cfnr);
 	char *apply_callerid_display(const char *id, int itype, int ntype, int present, int screen, const char *extension, const char *name);
 	void auth(int job, int bit_num);
 
@@ -252,13 +259,10 @@ class EndpointAppPBX : public EndpointApp
 	struct route_param *routeparam(struct route_action *action, unsigned long long id);
 
 	/* init / dialing / hangup */
-	int _action_init_call(char *remote);
 	void action_init_call(void);
-	void action_init_remote(void);
 	void action_dialing_internal(void);
 	void action_dialing_external(void);
 	void action_dialing_h323(void);
-	void action_dialing_remote(void);
 	void action_dialing_vbox_record(void);
 	void action_init_partyline(void);
 	void action_hangup_call(void);
@@ -304,7 +308,9 @@ class EndpointAppPBX : public EndpointApp
 
 	/* facility function */
 	void pick_join(char *extension);
-	void join_join(void);
+	int join_join(void);
+	int join_3pty(void);
+	int split_3pty(void);
 	void encrypt_shared(void);
 	void encrypt_keyex(void);
 	void encrypt_off(void);