X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=dss1.h;h=d3be055dd92fd8a694324d1dcde643ecdd465136;hp=49121fad81dcbf329179ebf06d6034e041f64fd7;hb=da21ec0158f0be010a75d42c058fdc8891498b2d;hpb=5ad4c41dc406a15beaa0a7b73d9dada1df74f939

diff --git a/dss1.h b/dss1.h
index 49121fa..d3be055 100644
--- a/dss1.h
+++ b/dss1.h
@@ -29,9 +29,28 @@ class Pdss1 : public PmISDN
 	int p_m_d_collect_location;
 
 	void new_state(int state);		/* set new state */
-	void isdn_show_send_message(unsigned long prim, msg_t *msg);
+//	void isdn_show_send_message(unsigned long prim, msg_t *msg);
 	int received_first_reply_to_setup(unsigned long prim, int channel, int exclusive);
 	int hunt_bchannel(int exclusive, int channel);
+#ifdef SOCKET_MISDN
+	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);
+	void setup_acknowledge_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m);
+	void proceeding_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m);
+	void alerting_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m);
+	void connect_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m);
+	void disconnect_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m);
+	void release_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m);
+	void release_complete_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m);
+	void disconnect_ind_i(unsigned int cmd, unsigned int pid, struct l3_msg *l3m);
+	void t312_timeout_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m);
+	void notify_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m);
+	void facility_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m);
+	void hold_ind(unsigned int cmd, unsigned int pid, struct l3_msg *l3m);
+	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
 	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);
@@ -42,13 +61,14 @@ class Pdss1 : public PmISDN
 	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(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);
@@ -61,6 +81,44 @@ 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);
+	void dec_ie_bearer(struct l3_msg *l3m, int *coding, int *capability, int *mode, int *rate, int *multi, int *user);
+	void enc_ie_call_id(struct l3_msg *l3m, unsigned char *callid, int callid_len);
+	void dec_ie_call_id(struct l3_msg *l3m, unsigned char *callid, int *callid_len);
+	void enc_ie_called_pn(struct l3_msg *l3m, int type, int plan, unsigned char *number);
+	void dec_ie_called_pn(struct l3_msg *l3m, int *type, int *plan, unsigned char *number, int number_len);
+	void enc_ie_calling_pn(struct l3_msg *l3m, int type, int plan, int present, int screen, unsigned char *number);
+	void dec_ie_calling_pn(struct l3_msg *l3m, int *type, int *plan, int *present, int *screen, unsigned char *number, int number_len);
+	void enc_ie_connected_pn(struct l3_msg *l3m, int type, int plan, int present, int screen, unsigned char *number);
+	void dec_ie_connected_pn(struct l3_msg *l3m, int *type, int *plan, int *present, int *screen, unsigned char *number, int number_len);
+	void enc_ie_cause(struct l3_msg *l3m, int location, int cause);
+	void dec_ie_cause(struct l3_msg *l3m, int *location, int *cause);
+	void enc_ie_channel_id(struct l3_msg *l3m, int exclusive, int channel);
+	void dec_ie_channel_id(struct l3_msg *l3m, int *exclusive, int *channel);
+	void enc_ie_date(struct l3_msg *l3m, time_t ti, int seconds);
+	void enc_ie_display(struct l3_msg *l3m, unsigned char *display);
+	void dec_ie_display(struct l3_msg *l3m, unsigned char *display, int display_len);
+	void enc_ie_keypad(struct l3_msg *l3m, unsigned char *keypad);
+	void dec_ie_keypad(struct l3_msg *l3m, unsigned char *keypad, int keypad_len);
+	void enc_ie_notify(struct l3_msg *l3m, int notify);
+	void dec_ie_notify(struct l3_msg *l3m, int *notify);
+	void enc_ie_progress(struct l3_msg *l3m, int coding, int location, int progress);
+	void dec_ie_progress(struct l3_msg *l3m, int *coding, int *location, int *progress);
+	void enc_ie_hlc(struct l3_msg *l3m, int coding, int interpretation, int presentation, int hlc, int exthlc);
+	void dec_ie_hlc(struct l3_msg *l3m, int *coding, int *interpretation, int *presentation, int *hlc, int *exthlc);
+	void enc_ie_redir_nr(struct l3_msg *l3m, int type, int plan, int present, int screen, int reason, unsigned char *number);
+	void dec_ie_redir_nr(struct l3_msg *l3m, int *type, int *plan, int *present, int *screen, int *reason, unsigned char *number, int number_len);
+	void enc_ie_redir_dn(struct l3_msg *l3m, int type, int plan, int present, unsigned char *number);
+	void dec_ie_redir_dn(struct l3_msg *l3m, int *type, int *plan, int *present, unsigned char *number, int number_len);
+	void enc_ie_facility(struct l3_msg *l3m, unsigned char *facility, int facility_len);
+	void dec_ie_facility(struct l3_msg *l3m, unsigned char *facility, int *facility_len);
+	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);
@@ -97,6 +155,7 @@ class Pdss1 : public PmISDN
 	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
 
 };