From 026b04fc75011a144285f399b82890803b4315bd Mon Sep 17 00:00:00 2001 From: Super User Date: Sun, 1 Jun 2008 18:52:10 +0200 Subject: LCR is now uses socket based mISDN V2 API *** chan_lcr, the Asterisk interface works (not complete yet). -> LCR can be used as Asterisk channel driver. modified: Makefile modified: Makefile.am modified: README modified: action.cpp modified: apppbx.cpp modified: bchannel.c modified: bchannel.h modified: callerid.c modified: cause.c modified: chan_lcr.c modified: chan_lcr.h modified: configure.ac modified: default/routing.conf modified: dss1.cpp modified: dss1.h modified: genrc.c modified: ie.cpp modified: interface.c modified: lcradmin.c modified: mISDN.cpp modified: mISDN.h modified: main.c modified: main.h modified: message.h modified: myisdn.h modified: route.c modified: socket_server.c modified: trace.h --- dss1.h | 65 ----------------------------------------------------------------- 1 file changed, 65 deletions(-) (limited to 'dss1.h') diff --git a/dss1.h b/dss1.h index ead3c27..f552547 100644 --- a/dss1.h +++ b/dss1.h @@ -15,13 +15,8 @@ class Pdss1 : public PmISDN public: Pdss1(int type, struct mISDNport *mISDNport, char *portname, struct port_settings *settings, int channel, int exclusive); ~Pdss1(); -#ifdef SOCKET_MISDN unsigned int p_m_d_l3id; /* current l3 process id */ void message_isdn(unsigned int cmd, unsigned int pid, struct l3_msg *l3m); -#else - int p_m_d_l3id; /* current l3 process id */ - void message_isdn(unsigned long prim, unsigned long dinfo, void *data); -#endif int p_m_d_ces; /* ntmode: tei&sapi */ int handler(void); int message_epoint(unsigned long epoint_id, int message, union parameter *param); @@ -36,7 +31,6 @@ class Pdss1 : public PmISDN void new_state(int state); /* set new state */ // void isdn_show_send_message(unsigned long prim, msg_t *msg); int hunt_bchannel(int exclusive, int channel); -#ifdef SOCKET_MISDN int received_first_reply_to_setup(unsigned long cmd, int channel, int exclusive); void information_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m); void setup_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m); @@ -55,26 +49,6 @@ class Pdss1 : public PmISDN void retrieve_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m); void suspend_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m); void resume_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m); -#else - int received_first_reply_to_setup(unsigned long prim, int channel, int exclusive); - void information_ind(unsigned long prim, unsigned long dinfo, void *data); - void setup_ind(unsigned long prim, unsigned long dinfo, void *data); - void setup_acknowledge_ind(unsigned long prim, unsigned long dinfo, void *data); - void proceeding_ind(unsigned long prim, unsigned long dinfo, void *data); - void alerting_ind(unsigned long prim, unsigned long dinfo, void *data); - void connect_ind(unsigned long prim, unsigned long dinfo, void *data); - void disconnect_ind(unsigned long prim, unsigned long dinfo, void *data); - void release_ind(unsigned long prim, unsigned long dinfo, void *data); - void release_complete_ind(unsigned long prim, unsigned long dinfo, void *data); - void disconnect_ind_i(unsigned long prim, unsigned long dinfo, void *data); - void t312_timeout_ind(unsigned long prim, unsigned long dinfo, void *data); - void notify_ind(unsigned long prim, unsigned long dinfo, void *data); - void facility_ind(unsigned long prim, unsigned long dinfo, void *data); - void hold_ind(unsigned long prim, unsigned long dinfo, void *data); - void retrieve_ind(unsigned long prim, unsigned long dinfo, void *data); - void suspend_ind(unsigned long prim, unsigned long dinfo, void *data); - void resume_ind(unsigned long prim, unsigned long dinfo, void *data); -#endif void message_information(unsigned long epoint_id, int message_id, union parameter *param); void message_setup(unsigned long epoint_id, int message_id, union parameter *param); void message_notify(unsigned long epoint_id, int message_id, union parameter *param); @@ -87,7 +61,6 @@ class Pdss1 : public PmISDN void message_release(unsigned long epoint_id, int message_id, union parameter *param); /* IE conversion */ -#ifdef SOCKET_MISDN void enc_ie_complete(struct l3_msg *l3m, int complete); void dec_ie_complete(struct l3_msg *l3m, int *complete); void enc_ie_bearer(struct l3_msg *l3m, int coding, int capability, int mode, int rate, int multi, int user); @@ -124,44 +97,6 @@ class Pdss1 : public PmISDN void dec_facility_centrex(struct l3_msg *l3m, unsigned char *cnip, int cnip_len); void enc_ie_useruser(struct l3_msg *l3m, int protocol, unsigned char *user, int user_len); void dec_ie_useruser(struct l3_msg *l3m, int *protocol, unsigned char *user, int *user_len); -#else - void enc_ie_complete(unsigned char **ntmode, msg_t *msg, int complete); - void dec_ie_complete(unsigned char *p, Q931_info_t *qi, int *complete); - void enc_ie_bearer(unsigned char **ntmode, msg_t *msg, int coding, int capability, int mode, int rate, int multi, int user); - void dec_ie_bearer(unsigned char *p, Q931_info_t *qi, int *coding, int *capability, int *mode, int *rate, int *multi, int *user); - void enc_ie_call_id(unsigned char **ntmode, msg_t *msg, unsigned char *callid, int callid_len); - void dec_ie_call_id(unsigned char *p, Q931_info_t *qi, unsigned char *callid, int *callid_len); - void enc_ie_called_pn(unsigned char **ntmode, msg_t *msg, int type, int plan, unsigned char *number); - void dec_ie_called_pn(unsigned char *p, Q931_info_t *qi, int *type, int *plan, unsigned char *number, int number_len); - void enc_ie_calling_pn(unsigned char **ntmode, msg_t *msg, int type, int plan, int present, int screen, unsigned char *number); - void dec_ie_calling_pn(unsigned char *p, Q931_info_t *qi, int *type, int *plan, int *present, int *screen, unsigned char *number, int number_len); - void enc_ie_connected_pn(unsigned char **ntmode, msg_t *msg, int type, int plan, int present, int screen, unsigned char *number); - void dec_ie_connected_pn(unsigned char *p, Q931_info_t *qi, int *type, int *plan, int *present, int *screen, unsigned char *number, int number_len); - void enc_ie_cause(unsigned char **ntmode, msg_t *msg, int location, int cause); - void dec_ie_cause(unsigned char *p, Q931_info_t *qi, int *location, int *cause); - void enc_ie_channel_id(unsigned char **ntmode, msg_t *msg, int exclusive, int channel); - void dec_ie_channel_id(unsigned char *p, Q931_info_t *qi, int *exclusive, int *channel); - void enc_ie_date(unsigned char **ntmode, msg_t *msg, time_t ti, int seconds); - void enc_ie_display(unsigned char **ntmode, msg_t *msg, unsigned char *display); - void dec_ie_display(unsigned char *p, Q931_info_t *qi, unsigned char *display, int display_len); - void enc_ie_keypad(unsigned char **ntmode, msg_t *msg, unsigned char *keypad); - void dec_ie_keypad(unsigned char *p, Q931_info_t *qi, unsigned char *keypad, int keypad_len); - void enc_ie_notify(unsigned char **ntmode, msg_t *msg, int notify); - void dec_ie_notify(unsigned char *p, Q931_info_t *qi, int *notify); - void enc_ie_progress(unsigned char **ntmode, msg_t *msg, int coding, int location, int progress); - void dec_ie_progress(unsigned char *p, Q931_info_t *qi, int *coding, int *location, int *progress); - void enc_ie_hlc(unsigned char **ntmode, msg_t *msg, int coding, int interpretation, int presentation, int hlc, int exthlc); - void dec_ie_hlc(unsigned char *p, Q931_info_t *qi, int *coding, int *interpretation, int *presentation, int *hlc, int *exthlc); - void enc_ie_redir_nr(unsigned char **ntmode, msg_t *msg, int type, int plan, int present, int screen, int reason, unsigned char *number); - void dec_ie_redir_nr(unsigned char *p, Q931_info_t *qi, int *type, int *plan, int *present, int *screen, int *reason, unsigned char *number, int number_len); - void enc_ie_redir_dn(unsigned char **ntmode, msg_t *msg, int type, int plan, int present, unsigned char *number); - void dec_ie_redir_dn(unsigned char *p, Q931_info_t *qi, int *type, int *plan, int *present, unsigned char *number, int number_len); - void enc_ie_facility(unsigned char **ntmode, msg_t *msg, unsigned char *facility, int facility_len); - void dec_ie_facility(unsigned char *p, Q931_info_t *qi, unsigned char *facility, int *facility_len); - void dec_facility_centrex(unsigned char *p, Q931_info_t *qi, unsigned char *cnip, int cnip_len); - void enc_ie_useruser(unsigned char **ntmode, msg_t *msg, int protocol, unsigned char *user, int user_len); - void dec_ie_useruser(unsigned char *p, Q931_info_t *qi, int *protocol, unsigned char *user, int *user_len); -#endif }; -- cgit v1.2.3-55-g7522