[Pkg-voip-commits] r5797 - in /asterisk/trunk/debian: changelog patches/bristuff/ast-send-message patches/bristuff/zapata-gsm

[paravoid at alioth.debian.org]

Author: paravoid
Date: Mon May 26 00:39:29 2008
New Revision: 5797

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5797
Log:
Comment-out the only use of ast-send-message (in GSM) to avoid an ABI
change. We are not shipping GSM, hence this is not a feature regression.

Modified:
    asterisk/trunk/debian/changelog
    asterisk/trunk/debian/patches/bristuff/ast-send-message
    asterisk/trunk/debian/patches/bristuff/zapata-gsm

Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=5797&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Mon May 26 00:39:29 2008
@@ -30,8 +30,10 @@
     - Merge ast-send-message with ast-send-message-users, following upstream
       split.
     - Other minor and cosmetic fixes.
-
- -- Faidon Liambotis <paravoid at debian.org>  Sun, 25 May 2008 23:35:28 +0300
+    - Comment-out the only use of ast-send-message (in GSM) to avoid an ABI
+      change. We are not shipping GSM, hence this is not a feature regression.
+
+ -- Faidon Liambotis <paravoid at debian.org>  Mon, 26 May 2008 03:36:46 +0300
 
 asterisk (1:1.4.19.1~dfsg-1) unstable; urgency=low
 

Modified: asterisk/trunk/debian/patches/bristuff/ast-send-message
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/ast-send-message?rev=5797&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/ast-send-message (original)
+++ asterisk/trunk/debian/patches/bristuff/ast-send-message Mon May 26 00:39:29 2008
@@ -1,14 +1,17 @@
-Change the API of ast_sendtext and chan->sendtext to add dest and ispdu
-parameters, used by ast_send_message which is also introduced by this patch.
+Change the ABI of ast_channel_tech to add a new function, send_message that is
+to be used by channels wanting to send text messages with a destination number
+(mainly GSM).
 
 --- a/include/asterisk/channel.h
 +++ b/include/asterisk/channel.h
-@@ -247,6 +247,9 @@ struct ast_channel_tech {
+@@ -247,6 +247,11 @@ struct ast_channel_tech {
  	/*! \brief Display or transmit text */
  	int (* const send_text)(struct ast_channel *chan, const char *text);
  
++#if 0 /* we (Debian) disable that addition because of ABI breakage */
 +	/*! \brief send a message */
 +	int (* const send_message)(struct ast_channel *chan, const char *dest, const char *text, int ispdu);
++#endif
 +
  	/*! \brief Display or send an image */
  	int (* const send_image)(struct ast_channel *chan, struct ast_frame *frame);
@@ -49,7 +52,7 @@
   * \param timeout timeout in milliseconds (0 for infinite wait)
 --- a/main/channel.c
 +++ b/main/channel.c
-@@ -2448,6 +2448,19 @@ int ast_sendtext(struct ast_channel *cha
+@@ -2448,6 +2448,21 @@ int ast_sendtext(struct ast_channel *cha
  	return res;
  }
  
@@ -60,8 +63,10 @@
 +	if (ast_test_flag(chan, AST_FLAG_ZOMBIE) || ast_check_hangup(chan))
 +		return -1;
 +	CHECK_BLOCKING(chan);
++#if 0 /* we (Debian) disable that addition because of ABI breakage */
 +	if (chan->tech->send_message)
 +		res = chan->tech->send_message(chan, dest, text, ispdu);
++#endif
 +	ast_clear_flag(chan, AST_FLAG_BLOCKING);
 +	return res;
 +}

Modified: asterisk/trunk/debian/patches/bristuff/zapata-gsm
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/zapata-gsm?rev=5797&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/zapata-gsm (original)
+++ asterisk/trunk/debian/patches/bristuff/zapata-gsm Mon May 26 00:39:29 2008
@@ -82,11 +82,13 @@
  static int zt_call(struct ast_channel *ast, char *rdest, int timeout);
  static int zt_hangup(struct ast_channel *ast);
  static int zt_answer(struct ast_channel *ast);
-@@ -732,6 +756,7 @@ static const struct ast_channel_tech zap
+@@ -732,6 +756,9 @@ static const struct ast_channel_tech zap
  	.send_digit_begin = zt_digit_begin,
  	.send_digit_end = zt_digit_end,
  	.send_text = zt_sendtext,
++#if 0 /* we (Debian) disable that addition because of ABI breakage */
 +	.send_message = zt_sendmessage,
++#endif
  	.call = zt_call,
  	.hangup = zt_hangup,
  	.answer = zt_answer,