X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=action_efi.cpp;h=b0f3cadaa92f96474edd6a8abc0634c53654dead;hp=76c902fe5f91769d3bc890ce2296a9ab747b3037;hb=034d3a91404addedc1c7a3494862c79532b0b878;hpb=8038fd190f3c0b451c07253190ec1d7de9ea822a

diff --git a/action_efi.cpp b/action_efi.cpp
index 76c902f..b0f3cad 100644
--- a/action_efi.cpp
+++ b/action_efi.cpp
@@ -9,13 +9,6 @@
 **                                                                           **
 \*****************************************************************************/ 
 
-#include <stdio.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-#include <unistd.h>
 #include "main.h"
 
 enum {
@@ -37,8 +30,7 @@ void EndpointAppPBX::action_init_efi(void)
 	struct port_list	*portlist = ea_endpoint->ep_portlist;
 
 	/* if no caller id */
-	if (e_callerinfo.id[0] == '\0')
-	{
+	if (e_callerinfo.id[0] == '\0') {
 		/* facility rejected */
 		message = message_create(ea_endpoint->ep_serial, portlist->port_id, EPOINT_TO_PORT, MESSAGE_DISCONNECT);
 		message->param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL;
@@ -75,23 +67,20 @@ void EndpointAppPBX::efi_message_eof(void)
 
 	PDEBUG(DEBUG_EPOINT, "EPOINT(%d) terminal %s end of file during state: %d\n", ea_endpoint->ep_serial, e_ext.number, e_vbox_state);
 
-	switch(e_efi_state)
-	{
+	switch(e_efi_state) {
 		case EFI_STATE_HELLO:
 		e_efi_state = EFI_STATE_DIE;
 		set_tone_efi("die");
 		break;
 		case EFI_STATE_DIE:
-		if (e_callerinfo.screen==INFO_SCREEN_USER)
-		{
+		if (e_callerinfo.screen==INFO_SCREEN_USER) {
 			e_efi_state = EFI_STATE_BENUTZERDEFINIERTE;
 			set_tone_efi("benutzerdefinierte");
 			break;
 		}
 		// fall through
 		case EFI_STATE_BENUTZERDEFINIERTE:
-		if (e_callerinfo.present==INFO_PRESENT_RESTRICTED)
-		{
+		if (e_callerinfo.present==INFO_PRESENT_RESTRICTED) {
 			e_efi_state = EFI_STATE_UNTERDRUECKTE;
 			set_tone_efi("unterdrueckte");
 			break;
@@ -107,13 +96,11 @@ void EndpointAppPBX::efi_message_eof(void)
 		e_efi_digit = 0;
 		// fall through
 		case EFI_STATE_DIGIT:
-		digit[8] = numberrize_callerinfo(e_callerinfo.id,e_callerinfo.ntype)[e_efi_digit];
-		if (digit[8])
-		{
+		digit[8] = numberrize_callerinfo(e_callerinfo.id,e_callerinfo.ntype, options.national, options.international)[e_efi_digit];
+		if (digit[8]) {
 			set_tone_efi(digit);
 			e_efi_digit++;
-		} else
-		{
+		} else {
 //			e_efi_state = EFI_STATE_STOP;
 			e_efi_state = EFI_STATE_ICH_WIEDERHOLE;
 //			message = message_create(ea_endpoint->ep_serial, portlist->port_id, EPOINT_TO_PORT, MESSAGE_DISCONNECT);
@@ -146,15 +133,14 @@ void EndpointAppPBX::efi_message_eof(void)
  * set the given vbox-tone with full path (without appending)
  * the tone is played and after eof, a message is received
  */
-void EndpointAppPBX::set_tone_efi(char *tone)
+void EndpointAppPBX::set_tone_efi(const char *tone)
 {
 	struct lcr_msg *message;
 
 	if (tone == NULL)
 		tone = "";
 
-	if (!ea_endpoint->ep_portlist)
-	{
+	if (!ea_endpoint->ep_portlist) {
 		PERROR("EPOINT(%d) no portlist\n", ea_endpoint->ep_serial);
 	}
 	message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_portlist->port_id, EPOINT_TO_PORT, MESSAGE_VBOX_TONE);