[Pkg-voip-commits] r7269 - in /lcr/trunk/debian: control patches/chan_lcr_compiles_asterisk_1.6-2.patch patches/chan_lcr_compiles_asterisk_1.6-git.patch patches/chan_lcr_dtmf.patch patches/lcr_as_vbox.patch patches/pid.patch

maniac-guest at alioth.debian.org maniac-guest at alioth.debian.org
Tue May 26 07:54:42 UTC 2009 

Author: maniac-guest
Date: Tue May 26 07:54:42 2009
New Revision: 7269

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7269
Log:
Fix lintian warning. quilt refresh

Modified:
    lcr/trunk/debian/control
    lcr/trunk/debian/patches/chan_lcr_compiles_asterisk_1.6-2.patch
    lcr/trunk/debian/patches/chan_lcr_compiles_asterisk_1.6-git.patch
    lcr/trunk/debian/patches/chan_lcr_dtmf.patch
    lcr/trunk/debian/patches/lcr_as_vbox.patch
    lcr/trunk/debian/patches/pid.patch

Modified: lcr/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/lcr/trunk/debian/control?rev=7269&op=diff
==============================================================================
--- lcr/trunk/debian/control (original)
+++ lcr/trunk/debian/control Tue May 26 07:54:42 2009
@@ -14,11 +14,11 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: asterisk
 Description: LinuxCallRouter - an ISDN based PBX for Linux
-  Formerly known as "PBX4Linux", Linux-Call-Router is not only a router,
-  it is a real ISDN PBX which interconnects ISDN telephones and ISDN lines.
-  It is possible to connect telephones to a Linux box. It is a pure software
-  solution except for the ISDN cards and telephones. The great benefit is
-  the NT-mode that allows to connect telephones to an ISDN card. Special
-  cards are needed and a little bit of different cabeling. It supports lots
-  of features, that only expensive PBXs have. It include a channel driver
-  that can link LCR to Asterisk PBX.
+ Formerly known as "PBX4Linux", Linux-Call-Router is not only a router,
+ it is a real ISDN PBX which interconnects ISDN telephones and ISDN lines.
+ It is possible to connect telephones to a Linux box. It is a pure software
+ solution except for the ISDN cards and telephones. The great benefit is
+ the NT-mode that allows to connect telephones to an ISDN card. Special
+ cards are needed and a little bit of different cabeling. It supports lots
+ of features, that only expensive PBXs have. It include a channel driver
+ that can link LCR to Asterisk PBX.

Modified: lcr/trunk/debian/patches/chan_lcr_compiles_asterisk_1.6-2.patch
URL: http://svn.debian.org/wsvn/pkg-voip/lcr/trunk/debian/patches/chan_lcr_compiles_asterisk_1.6-2.patch?rev=7269&op=diff
==============================================================================
--- lcr/trunk/debian/patches/chan_lcr_compiles_asterisk_1.6-2.patch (original)
+++ lcr/trunk/debian/patches/chan_lcr_compiles_asterisk_1.6-2.patch Tue May 26 07:54:42 2009
@@ -1,6 +1,6 @@
---- chan_lcr.c.orig	2009-05-25 13:38:39.345375048 +0200
-+++ chan_lcr.c	2009-05-25 13:41:27.927698177 +0200
-@@ -1995,7 +1995,7 @@
+--- a/chan_lcr.c
++++ b/chan_lcr.c
+@@ -1995,7 +1995,7 @@ static int lcr_write(struct ast_channel 
  		return -1;
  	}
  	if (call->bchannel && f->samples)
@@ -9,9 +9,7 @@
  	ast_mutex_unlock(&chan_lock);
  	return 0;
  }
---- chan_lcr.c.orig	2009-05-22 21:40:01.385550322 +0200
-+++ chan_lcr.c	2009-05-22 21:40:56.015582883 +0200
-@@ -2035,7 +2035,7 @@
+@@ -2035,7 +2035,7 @@ static struct ast_frame *lcr_read(struct
  	call->read_fr.datalen = len;
  	call->read_fr.samples = len;
  	call->read_fr.delivery = ast_tv(0,0);

Modified: lcr/trunk/debian/patches/chan_lcr_compiles_asterisk_1.6-git.patch
URL: http://svn.debian.org/wsvn/pkg-voip/lcr/trunk/debian/patches/chan_lcr_compiles_asterisk_1.6-git.patch?rev=7269&op=diff
==============================================================================
--- lcr/trunk/debian/patches/chan_lcr_compiles_asterisk_1.6-git.patch (original)
+++ lcr/trunk/debian/patches/chan_lcr_compiles_asterisk_1.6-git.patch Tue May 26 07:54:42 2009
@@ -19,8 +19,6 @@
 	modified:   interface.h
 ---
 
-diff --git a/README b/README
-index 0bf0618..da23ec5 100644
 --- a/README
 +++ b/README
 @@ -454,8 +454,14 @@ Changes in Version 1.2
@@ -39,11 +37,9 @@
 +  -> Multiple messages are sent to dial full string.
  
  
-diff --git a/chan_lcr.c b/chan_lcr.c
-index f6ff27c..c1d3745 100644
 --- a/chan_lcr.c
 +++ b/chan_lcr.c
-@@ -1995,7 +1995,7 @@ static int lcr_write(struct ast_channel *ast, struct ast_frame *f)
+@@ -1995,7 +1995,7 @@ static int lcr_write(struct ast_channel 
  		return -1;
  	}
  	if (call->bchannel && f->samples)
@@ -52,7 +48,7 @@
  	ast_mutex_unlock(&chan_lock);
  	return 0;
  }
-@@ -2035,7 +2035,7 @@ static struct ast_frame *lcr_read(struct ast_channel *ast)
+@@ -2035,7 +2035,7 @@ static struct ast_frame *lcr_read(struct
  	call->read_fr.datalen = len;
  	call->read_fr.samples = len;
  	call->read_fr.delivery = ast_tv(0,0);
@@ -61,8 +57,6 @@
  	ast_mutex_unlock(&chan_lock);
  
  	return &call->read_fr;
-diff --git a/default/interface.conf b/default/interface.conf
-index 5ee81be..51cc036 100644
 --- a/default/interface.conf
 +++ b/default/interface.conf
 @@ -128,6 +128,14 @@
@@ -80,11 +74,9 @@
  # Hint: Enter "lcr interface" for quick help on interface options.
  
  
-diff --git a/dss1.cpp b/dss1.cpp
-index 3b14332..707cfc2 100644
 --- a/dss1.cpp
 +++ b/dss1.cpp
-@@ -30,7 +30,7 @@ Pdss1::Pdss1(int type, struct mISDNport *mISDNport, char *portname, struct port_
+@@ -30,7 +30,7 @@ Pdss1::Pdss1(int type, struct mISDNport 
  	p_m_d_tespecial = mISDNport->tespecial;
  	p_m_d_l3id = 0;
  	p_m_d_ces = -1;
@@ -93,7 +85,7 @@
  	p_m_d_notify_pending = NULL;
  	p_m_d_collect_cause = 0;
  	p_m_d_collect_location = 0;
-@@ -45,9 +45,6 @@ Pdss1::Pdss1(int type, struct mISDNport *mISDNport, char *portname, struct port_
+@@ -45,9 +45,6 @@ Pdss1::Pdss1(int type, struct mISDNport 
  Pdss1::~Pdss1()
  {
  	/* remove queued message */
@@ -103,7 +95,7 @@
  	if (p_m_d_notify_pending)
  		message_free(p_m_d_notify_pending);
  }
-@@ -821,6 +818,9 @@ void Pdss1::setup_acknowledge_ind(unsigned int cmd, unsigned int pid, struct l3_
+@@ -821,6 +818,9 @@ void Pdss1::setup_acknowledge_ind(unsign
  	int coding, location, progress;
  	int ret;
  	struct lcr_msg *message;
@@ -113,7 +105,7 @@
  
  	l1l2l3_trace_header(p_m_mISDNport, this, L3_SETUP_ACKNOWLEDGE_IND, DIRECTION_IN);
  	dec_ie_channel_id(l3m, &exclusive, &channel);
-@@ -844,6 +844,21 @@ void Pdss1::setup_acknowledge_ind(unsigned int cmd, unsigned int pid, struct l3_
+@@ -844,6 +844,21 @@ void Pdss1::setup_acknowledge_ind(unsign
  	message_put(message);
  
  	new_state(PORT_STATE_OUT_OVERLAP);
@@ -139,13 +131,15 @@
  void Pdss1::message_information(unsigned int epoint_id, int message_id, union parameter *param)
  {
  	l3_msg *l3m;
+-
+-	if (param->information.id[0]) /* only if we have something to dial */
+-	{
 +	char *display = param->information.display;
 +	char *number = param->information.id;
 +	int max = p_m_mISDNport->ifport->dialmax;
- 
--	if (param->information.id[0]) /* only if we have something to dial */
++
 +	while (number[0]) /* as long we have something to dial */
- 	{
++	{
 +		if (max > strlen(number) || max == 0)
 +			max = strlen(number);
 +      
@@ -165,7 +159,7 @@
  	}
  	new_state(p_state);
  }
-@@ -1954,6 +1978,7 @@ void Pdss1::message_setup(unsigned int epoint_id, int message_id, union paramete
+@@ -1954,6 +1978,7 @@ void Pdss1::message_setup(unsigned int e
  	int capability, mode, rate, coding, user, presentation, interpretation, hlc, exthlc;
  	int channel, exclusive;
  	struct epoint_list *epointlist;
@@ -173,7 +167,7 @@
  
  	/* release if port is blocked */
  	if (p_m_mISDNport->ifport->block)
-@@ -2140,7 +2165,10 @@ void Pdss1::message_setup(unsigned int epoint_id, int message_id, union paramete
+@@ -2140,7 +2165,10 @@ void Pdss1::message_setup(unsigned int e
  	/* dialing information */
  	if (p_dialinginfo.id[0]) /* only if we have something to dial */
  	{
@@ -185,7 +179,7 @@
  	}
  	/* sending complete */
  	if (p_dialinginfo.sending_complete)
-@@ -3028,56 +3056,6 @@ int stack2manager(struct mISDNport *mISDNport, unsigned int cmd, unsigned int pi
+@@ -3028,56 +3056,6 @@ int stack2manager(struct mISDNport *mISD
  }
  
  
@@ -242,8 +236,6 @@
  
  
  
-diff --git a/dss1.h b/dss1.h
-index cb31b3b..168a56b 100644
 --- a/dss1.h
 +++ b/dss1.h
 @@ -23,7 +23,7 @@ class Pdss1 : public PmISDN
@@ -264,11 +256,9 @@
  	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, int type2, int plan2, int present2, int screen2, unsigned char *number2);
  	void dec_ie_calling_pn(struct l3_msg *l3m, int *type, int *plan, int *present, int *screen, unsigned char *number, int number_len, int *type2, int *plan2, int *present2, int *screen2, unsigned char *number2, int number_len2);
-diff --git a/ie.cpp b/ie.cpp
-index c4033c4..1e18b77 100644
 --- a/ie.cpp
 +++ b/ie.cpp
-@@ -314,7 +314,7 @@ void Pdss1::dec_ie_call_id(struct l3_msg *l3m, unsigned char *callid, int *calli
+@@ -314,7 +314,7 @@ void Pdss1::dec_ie_call_id(struct l3_msg
  
  
  /* IE_CALLED_PN */
@@ -277,7 +267,7 @@
  {
  	unsigned char p[256];
  	int l;
-@@ -337,13 +337,15 @@ void Pdss1::enc_ie_called_pn(struct l3_msg *l3m, int type, int plan, unsigned ch
+@@ -337,13 +337,15 @@ void Pdss1::enc_ie_called_pn(struct l3_m
  
  	add_trace("called_pn", "type", "%d", type);
  	add_trace("called_pn", "plan", "%d", plan);
@@ -296,11 +286,9 @@
  	add_layer3_ie(l3m, p[0], p[1], p+2);
  }
  
-diff --git a/interface.c b/interface.c
-index 5549654..1e4bc66 100644
 --- a/interface.c
 +++ b/interface.c
-@@ -898,6 +898,23 @@ static int inter_filter(struct interface *interface, char *filename, int line, c
+@@ -898,6 +898,23 @@ static int inter_filter(struct interface
  	}
  	return(0);
  }
@@ -324,7 +312,7 @@
  
  
  /*
-@@ -1008,6 +1025,9 @@ struct interface_param interface_param[] = {
+@@ -1008,6 +1025,9 @@ struct interface_param interface_param[]
  	"pipeline <string> - Sets echo cancelation pipeline.\n"
  	"blowfish <key> - Adds encryption. Key must be 4-56 bytes (8-112 hex characters."},
  
@@ -334,8 +322,6 @@
  	{NULL, NULL, NULL, NULL}
  };
  
-diff --git a/interface.h b/interface.h
-index 09e0778..46671a4 100644
 --- a/interface.h
 +++ b/interface.h
 @@ -62,6 +62,7 @@ struct interface_port {

Modified: lcr/trunk/debian/patches/chan_lcr_dtmf.patch
URL: http://svn.debian.org/wsvn/pkg-voip/lcr/trunk/debian/patches/chan_lcr_dtmf.patch?rev=7269&op=diff
==============================================================================
--- lcr/trunk/debian/patches/chan_lcr_dtmf.patch (original)
+++ lcr/trunk/debian/patches/chan_lcr_dtmf.patch Tue May 26 07:54:42 2009
@@ -1,8 +1,8 @@
 Author: <joerg at Redstar.dorchain.net>
 Description: recognize DTMF A-D in chan lcr
---- a/chan_lcr.c.orig	2009-01-07 15:30:59.000000000 +0100
-+++ b/chan_lcr.c	2009-02-25 17:38:07.000000000 +0100
-@@ -890,7 +890,7 @@
+--- a/chan_lcr.c
++++ b/chan_lcr.c
+@@ -890,7 +890,7 @@ static void lcr_in_connect(struct chan_c
  	memcpy(&call->connectinfo, &param->connectinfo, sizeof(struct connect_info));
  	/* queue event to asterisk */
  	if (call->ast && call->pbx_started)
@@ -11,7 +11,7 @@
  }
  
  /*
-@@ -1507,7 +1507,7 @@
+@@ -1507,7 +1507,7 @@ static int queue_send(void)
  						ast_queue_control(ast, AST_CONTROL_RINGING);
  						ast_setstate(ast, AST_STATE_RINGING);
  						break;
@@ -20,7 +20,7 @@
  						CDEBUG(call, ast, "Sending queued ANSWER to Asterisk.\n");
  						ast_queue_control(ast, AST_CONTROL_ANSWER);
  						break;
-@@ -1515,10 +1515,10 @@
+@@ -1515,10 +1515,10 @@ static int queue_send(void)
  						CDEBUG(call, ast, "Sending queued HANGUP to Asterisk.\n");
  						ast_queue_hangup(ast);
  						break;
@@ -35,7 +35,7 @@
  						CDEBUG(call, ast, "Sending queued digit '%c' to Asterisk.\n", *p);
  						/* send digit to asterisk */
  						memset(&fr, 0, sizeof(fr));
-@@ -1530,7 +1530,7 @@
+@@ -1530,7 +1530,7 @@ static int queue_send(void)
  						ast_queue_frame(ast, &fr);
  						break;
  					default:
@@ -44,13 +44,3 @@
  					}
  					p++;
  				}
-
--- 
-Ralf Schlatterbeck
-email: ralf at zoo.priv.at FAX: +43/2243/26465/23
-
-_______________________________________________
-isdn4linux mailing list
-isdn4linux at listserv.isdn4linux.de
-https://www.isdn4linux.de/mailman/listinfo/isdn4linux
-

Modified: lcr/trunk/debian/patches/lcr_as_vbox.patch
URL: http://svn.debian.org/wsvn/pkg-voip/lcr/trunk/debian/patches/lcr_as_vbox.patch?rev=7269&op=diff
==============================================================================
--- lcr/trunk/debian/patches/lcr_as_vbox.patch (original)
+++ lcr/trunk/debian/patches/lcr_as_vbox.patch Tue May 26 07:54:42 2009
@@ -1,52 +1,13 @@
 Author: <joerg at Redstar.dorchain.net>
 Description: Use LCR as voicebox
-*** lcr.git/route.c	2009-01-06 18:44:41.000000000 +0100
---- lcr.git-bodo/route.c	2009-02-03 17:01:53.000000000 +0100
-***************
-*** 326,332 ****
-  //	  "Caller calls the timer."},
-  	{ ACTION_GOTO,
-  	  "goto",	NULL, &EndpointAppPBX::action_dialing_goto, NULL,
-! 	  PARAM_CONNECT | PARAM_RULESET | PARAM_STRIP | PARAM_SAMPLE,
-  	  "Jump to given ruleset and optionally play sample. Dialed digits are not flushed."},
-  	{ ACTION_MENU,
-  	  "menu",	NULL, &EndpointAppPBX::action_dialing_menu, NULL,
---- 326,332 ----
-  //	  "Caller calls the timer."},
-  	{ ACTION_GOTO,
-  	  "goto",	NULL, &EndpointAppPBX::action_dialing_goto, NULL,
-! 	  PARAM_CONNECT | PARAM_ALERTING | PARAM_RULESET | PARAM_STRIP | PARAM_SAMPLE,
-  	  "Jump to given ruleset and optionally play sample. Dialed digits are not flushed."},
-  	{ ACTION_MENU,
-  	  "menu",	NULL, &EndpointAppPBX::action_dialing_menu, NULL,
-
-Bodo.
-
-Am Freitag, den 23.01.2009, 10:46 +0100 schrieb Bodo Pfelzer:
-> Hi,
-> 
-> is it possible to use lcr as a classical voice-box without a phone
-> connected to the internal interface.
-> 
-> When I set 
-> 
-> cfnr            vbox
-> cfnr_delay      20
-> 
-> lcr seems to drop the call when it recognizes that no phone is
-> connected.
-> 
-> Setting
-> 
-> cfu vbox
-> 
-> works, but is not excatly what I want.
-> 
-> Bodo.
-
-
-_______________________________________________
-isdn4linux mailing list
-isdn4linux at listserv.isdn4linux.de
-https://www.isdn4linux.de/mailman/listinfo/isdn4linux
-
+--- a/route.c
++++ b/route.c
+@@ -326,7 +326,7 @@ struct action_defs action_defs[] = {
+ //	  "Caller calls the timer."},
+ 	{ ACTION_GOTO,
+ 	  "goto",	NULL, &EndpointAppPBX::action_dialing_goto, NULL,
+-	  PARAM_CONNECT | PARAM_RULESET | PARAM_STRIP | PARAM_SAMPLE,
++	  PARAM_CONNECT | PARAM_ALERTING | PARAM_RULESET | PARAM_STRIP | PARAM_SAMPLE,
+ 	  "Jump to given ruleset and optionally play sample. Dialed digits are not flushed."},
+ 	{ ACTION_MENU,
+ 	  "menu",	NULL, &EndpointAppPBX::action_dialing_menu, NULL,

Modified: lcr/trunk/debian/patches/pid.patch
URL: http://svn.debian.org/wsvn/pkg-voip/lcr/trunk/debian/patches/pid.patch?rev=7269&op=diff
==============================================================================
--- lcr/trunk/debian/patches/pid.patch (original)
+++ lcr/trunk/debian/patches/pid.patch Tue May 26 07:54:42 2009
@@ -1,6 +1,6 @@
---- main.c.orig	2009-03-08 15:21:03.472860024 +0100
-+++ main.c	2009-03-08 15:24:56.797047971 +0100
-@@ -314,6 +314,7 @@
+--- a/main.c
++++ b/main.c
+@@ -314,6 +314,7 @@ int main(int argc, char *argv[])
  	if (!(strcasecmp(argv[1],"fork")))
  	{
  		pid_t pid;
@@ -8,7 +8,7 @@
  
  		/* do daemon fork */
  		pid = fork();
-@@ -344,6 +345,11 @@
+@@ -344,6 +345,11 @@ int main(int argc, char *argv[])
  			exit(0);
  		}
  		nooutput = 1;

More information about the Pkg-voip-commits mailing list