[asterisk-dev] [Code Review] Merge Called party identification changes into trunk.

[Olle E. Johansson]

This is what reviewboard tells me about this patch:

/O

----------------

The patch to '/trunk/CHANGES' didn't apply cleanly. The temporary  
files have been left in '/tmp/reviewboard.tazkyS' for debugging  
purposes. `patch` returned: patching file /tmp/reviewboard.tazkyS/ 
tmpYia7j2 patch: **** malformed patch at line 73:

Traceback (most recent call last): File "/usr/lib/python2.5/site- 
packages/ReviewBoard-0.9.dev_20081126-py2.5.egg/reviewboard/diffviewer/ 
views.py", line 86, in view_diff files = get_diff_files(diffset, None,  
interdiffset, highlighting) File "/usr/lib/python2.5/site-packages/ 
ReviewBoard-0.9.dev_20081126-py2.5.egg/reviewboard/diffviewer/ 
diffutils.py", line 654, in get_diff_files enable_syntax_highlighting)  
File "/usr/lib/python2.5/site-packages/ReviewBoard-0.9.dev_20081126- 
py2.5.egg/reviewboard/diffviewer/diffutils.py", line 573, in  
generate_files large_data=True) File "/usr/lib/python2.5/site-packages/ 
Djblets-0.4.dev_20081126-py2.5.egg/djblets/util/misc.py", line 142, in  
cache_memoize data = lookup_callable() File "/usr/lib/python2.5/site- 
packages/ReviewBoard-0.9.dev_20081126-py2.5.egg/reviewboard/diffviewer/ 
diffutils.py", line 572, in <lambda> enable_syntax_highlighting), File  
"/usr/lib/python2.5/site-packages/ReviewBoard-0.9.dev_20081126- 
py2.5.egg/reviewboard/diffviewer/diffutils.py", line 339, in  
get_chunks new = get_patched_file(old, filediff) File "/usr/lib/ 
python2.5/site-packages/ReviewBoard-0.9.dev_20081126-py2.5.egg/ 
reviewboard/diffviewer/diffutils.py", line 255, in get_patched_file  
return patch(filediff.diff, buffer, filediff.dest_file) File "/usr/lib/ 
python2.5/site-packages/ReviewBoard-0.9.dev_20081126-py2.5.egg/ 
reviewboard/diffviewer/diffutils.py", line 125, in patch (filename,  
tempdir, patch_output)) Exception: The patch to '/trunk/CHANGES'  
didn't apply cleanly. The temporary files have been left in '/tmp/ 
reviewboard.tazkyS' for debugging purposes. `patch` returned: patching  
file /tmp/reviewboard.tazkyS/tmpYia7j2 patch: **** malformed patch at  
line 73:
17 mar 2009 kl. 22.59 skrev Mark Michelson:

>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> http://reviewboard.digium.com/r/201/
> -----------------------------------------------------------
>
> (Updated 2009-03-17 16:59:54.517596)
>
>
> Review request for Asterisk Developers.
>
>
> Changes
> -------
>
> I realized that the newly-added func_connectedline.c and  
> func_redirecting.c were not in the diff here.
>
> I also added a note to CHANGES about chan_skinny supporting the  
> transmission of remote party identification information. Thanks  
> mvanbaak!
>
>
> Summary
> -------
>
> This diff encompasses the changes between the issue8824 branch and  
> Asterisk trunk. These changes include all the changes necessary to  
> allow for the transmission and reception of remote called party  
> identification (COLP/CONP).
>
>
> This addresses bug 8824.
>    http://bugs.digium.com/view.php?id=8824
>
>
> Diffs (updated)
> -----
>
>  /trunk/apps/app_dial.c 182763
>  /trunk/CHANGES 182763
>  /trunk/apps/app_directed_pickup.c 182763
>  /trunk/apps/app_queue.c 182763
>  /trunk/channels/chan_agent.c 182763
>  /trunk/channels/chan_dahdi.c 182763
>  /trunk/channels/chan_h323.c 182763
>  /trunk/channels/chan_iax2.c 182763
>  /trunk/channels/chan_local.c 182763
>  /trunk/channels/chan_mgcp.c 182763
>  /trunk/channels/chan_misdn.c 182763
>  /trunk/channels/chan_phone.c 182763
>  /trunk/channels/chan_sip.c 182763
>  /trunk/channels/chan_skinny.c 182763
>  /trunk/channels/chan_unistim.c 182763
>  /trunk/channels/misdn/chan_misdn_config.h 182763
>  /trunk/channels/misdn/isdn_lib.h 182763
>  /trunk/channels/misdn/isdn_lib.c 182763
>  /trunk/channels/misdn/isdn_lib_intern.h 182763
>  /trunk/channels/misdn/isdn_msg_parser.c 182763
>  /trunk/channels/misdn_config.c 182763
>  /trunk/configs/misdn.conf.sample 182763
>  /trunk/configs/sip.conf.sample 182763
>  /trunk/funcs/func_connectedline.c PRE-CREATION
>  /trunk/funcs/func_redirecting.c PRE-CREATION
>  /trunk/include/asterisk/callerid.h 182763
>  /trunk/include/asterisk/channel.h 182763
>  /trunk/include/asterisk/frame.h 182763
>  /trunk/main/callerid.c 182763
>  /trunk/main/channel.c 182763
>  /trunk/main/dial.c 182763
>  /trunk/main/features.c 182763
>  /trunk/main/rtp.c 182763
>
> Diff: http://reviewboard.digium.com/r/201/diff
>
>
> Testing
> -------
>
> Digium's Product Quality department has extensively tested a  
> remarkably similar version of these enhancements. In addition, we  
> know of a customer who has been using this branch for some months  
> now in a production environment. I would also be willing to bet that  
> some of those who have been monitoring issue 8824 have also done  
> some testing as well.
>
>
> Thanks,
>
> Mark
>
>
> _______________________________________________
> --Bandwidth and Colocation Provided by http://www.api-digital.com--
>
> asterisk-dev mailing list
> To UNSUBSCRIBE or update options visit:
>   http://lists.digium.com/mailman/listinfo/asterisk-dev

---
* Olle E Johansson - oej at edvina.net
* Cell phone +46 70 593 68 51, Office +46 8 96 40 20, Sweden