X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=action.cpp;h=5b332c9f0a437a6010abecfd3280254b74d15c34;hp=3fc644943f5b07c714e0aa9f289ed9794fe0a670;hb=00675eb48be1313f6a10f342beec023a677edd30;hpb=acaf278f7f616d264afe480e4f9c64768540941b

diff --git a/action.cpp b/action.cpp
index 3fc6449..5b332c9 100644
--- a/action.cpp
+++ b/action.cpp
@@ -1587,6 +1587,7 @@ void EndpointAppPBX::_action_goto_menu(int mode)
 	/* if the 'menu' was selected, we will flush all digits */
 	if (mode) {
 		e_dialinginfo.id[0] = 0;
+		e_dialinginfo.sending_complete = 0;
 		e_extdialing = e_dialinginfo.id;
 	} else {
 		/* remove digits that are required to match the rule */
@@ -2053,6 +2054,7 @@ void EndpointAppPBX::action_dialing_password_wr(void)
  */
 void EndpointAppPBX::action_init_pots_retrieve(void)
 {
+#ifdef ISDN_P_FXS_POTS
 	struct route_param *rparam;
 	struct port_list *portlist = ea_endpoint->ep_portlist;
 	class Port *port;
@@ -2102,13 +2104,11 @@ void EndpointAppPBX::action_init_pots_retrieve(void)
 		goto disconnect;
 	}
 
-#ifdef ISDN_P_FXS_POTS
 	/* release our call */
 	ourfxs->hangup_ind(0);
 
 	/* retrieve selected call */
 	fxs->retrieve_ind(0);
-#endif
 
 	/* split if selected call is member of a 3pty */
 	epoint = find_epoint_id(ACTIVE_EPOINT(fxs->p_epointlist));
@@ -2116,6 +2116,7 @@ void EndpointAppPBX::action_init_pots_retrieve(void)
 		PDEBUG(DEBUG_EPOINT, "EPOINT(%d) try spliting 3pty. this may fail because we don't have a 3pty.\n", epoint->ep_serial);
 		((class EndpointAppPBX *)epoint->ep_app)->split_3pty();
 	}
+#endif
 }
 
 
@@ -2123,6 +2124,7 @@ void EndpointAppPBX::action_init_pots_retrieve(void)
  */
 void EndpointAppPBX::action_init_pots_release(void)
 {
+#ifdef ISDN_P_FXS_POTS
 	struct route_param *rparam;
 	struct port_list *portlist = ea_endpoint->ep_portlist;
 	class Port *port;
@@ -2179,13 +2181,12 @@ void EndpointAppPBX::action_init_pots_release(void)
 	e_action = NULL;
 #endif
 
-#ifdef ISDN_P_FXS_POTS
 	/* release selected call */
 	fxs->hangup_ind(0);
-#endif
 
 	/* indicate timeout, so next action will be processed */
 	process_dialing(1);
+#endif
 }
 
 
@@ -2193,6 +2194,7 @@ void EndpointAppPBX::action_init_pots_release(void)
  */
 void EndpointAppPBX::action_init_pots_reject(void)
 {
+#ifdef ISDN_P_FXS_POTS
 	struct port_list *portlist = ea_endpoint->ep_portlist;
 	class Port *port;
 	class Pfxs *ourfxs, *fxs;
@@ -2230,13 +2232,12 @@ void EndpointAppPBX::action_init_pots_reject(void)
 		goto disconnect;
 	}
 
-#ifdef ISDN_P_FXS_POTS
 	/* reject alerting call */
 	fxs->reject_ind(0);
-#endif
 
 	/* indicate timeout, so next action will be processed */
 	process_dialing(1);
+#endif
 }
 
 
@@ -2244,6 +2245,7 @@ void EndpointAppPBX::action_init_pots_reject(void)
  */
 void EndpointAppPBX::action_init_pots_answer(void)
 {
+#ifdef ISDN_P_FXS_POTS
 	struct port_list *portlist = ea_endpoint->ep_portlist;
 	class Port *port;
 	class Pfxs *ourfxs, *fxs;
@@ -2281,7 +2283,6 @@ void EndpointAppPBX::action_init_pots_answer(void)
 		goto disconnect;
 	}
 
-#ifdef ISDN_P_FXS_POTS
 	/* release our call */
 	ourfxs->hangup_ind(0);
 
@@ -2295,6 +2296,7 @@ void EndpointAppPBX::action_init_pots_answer(void)
  */
 void EndpointAppPBX::action_init_pots_3pty(void)
 {
+#ifdef ISDN_P_FXS_POTS
 	struct port_list *portlist = ea_endpoint->ep_portlist;
 	class Port *port;
 	class Pfxs *ourfxs, *fxs, *fxs1 = NULL, *fxs2 = NULL;
@@ -2337,12 +2339,9 @@ void EndpointAppPBX::action_init_pots_3pty(void)
 		goto disconnect;
 	}
 
-#ifdef ISDN_P_FXS_POTS
 	/* release our call */
 	ourfxs->hangup_ind(0);
-#endif
 
-#ifdef ISDN_P_FXS_POTS
 	/* retrieve latest active call */
 	if (fxs2->p_m_fxs_age > fxs1->p_m_fxs_age) {
 		fxs2->retrieve_ind(0);
@@ -2351,9 +2350,6 @@ void EndpointAppPBX::action_init_pots_3pty(void)
 		fxs1->retrieve_ind(0);
 		epoint = find_epoint_id(ACTIVE_EPOINT(fxs2->p_epointlist));
 	}
-#else
-	epoint = NULL;
-#endif
 
 	if (!epoint) {
 		trace_header("ACTION pots-3pty (interal error: no endpoint)", DIRECTION_NONE);
@@ -2373,12 +2369,14 @@ void EndpointAppPBX::action_init_pots_3pty(void)
 		end_trace();
 		return;
 	}
+#endif
 }
 
 /* process pots-transfer
  */
 void EndpointAppPBX::action_init_pots_transfer(void)
 {
+#ifdef ISDN_P_FXS_POTS
 	struct route_param *rparam;
 	struct port_list *portlist = ea_endpoint->ep_portlist;
 	class Port *port;
@@ -2429,15 +2427,14 @@ void EndpointAppPBX::action_init_pots_transfer(void)
 		goto disconnect;
 	}
 
-#ifdef ISDN_P_FXS_POTS
 	/* retrieve call */
 	if (fxs2->p_m_fxs_age > fxs1->p_m_fxs_age)
 		fxs2->retrieve_ind(0);
 	else
 		fxs1->retrieve_ind(0);
-#endif
 	/* bridge calls */
 	join_join_fxs();
+#endif
 }