X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=apppbx.h;h=c3d2d68ed73412f36fd3a481647777c2215a44de;hp=b10a11903c442f90670a0555610c6c15a69925f5;hb=d6866316df3f8f9456304af57999d03b9d762268;hpb=b0bd74e35e935aa976b68c594def4e8d2c22ef95

diff --git a/apppbx.h b/apppbx.h
index b10a119..c3d2d68 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,15 @@ 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_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,15 +227,15 @@ 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);
-	void release(int release, int joinlocation, int joincause, int portlocation, int portcause);
+	void release(int release, int joinlocation, int joincause, int portlocation, int portcause, int force);
 	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);
 
@@ -288,6 +294,7 @@ class EndpointAppPBX : public EndpointApp
 	void action_dialing_goto(void);
 	void action_dialing_menu(void);
 	void action_dialing_disconnect(void);
+	void action_dialing_release(void);
 	void action_dialing_help(void);
 	void action_dialing_deflect(void);
 	void action_dialing_setforward(void);