Summary: | ASTERISK-07133: [patch] CallerID name sent over PRI to Panasonic DBS locks channel | ||
Reporter: | Steven BerkHolz (steveb) | Labels: | |
Date Opened: | 2006-06-09 08:00:39 | Date Closed: | 2010-04-27 14:03:05 |
Priority: | Minor | Regression? | No |
Status: | Closed/Complete | Components: | Core/General |
Versions: | Frequency of Occurrence | ||
Related Issues: | |||
Environment: | Attachments: | ( 0) hidecalleridnamepatchv3.txt ( 1) hidecalleridno-nocidname.txt ( 2) hidecalleridno-withcidname.txt ( 3) hidecalleridyes.txt | |
Description: | Panasonic DBS 576 was connected to telco PRI with no CallerID Name. Calls were recieved fine. Added asterisk between telco and Panasonic. asterisk is pri_net and timing source to Panasonic. If a call comes in from telco, we can forward it to Panasonic with no issues. (we are not recieving CallerID Name from telco yet) If a call is from an asterisk extension, or if we add CallerID Name info to pstn call, the channel hangs and rings indefinately when connecting to the Panasonic. I set hidecallerid=yes to avoid the problem for now, but I would like to get the CallerID number still. I tried hidecallerid=no, restrictcid=yes , but I do not see that restrictcid is doing anything at all. ****** ADDITIONAL INFORMATION ****** hidecalleridno-nocidname.txt hidecallerid=no call from telco with callerid number but no name. this is how we would like all calls to this group to go out. hidecalleridyes.txt hidecallerid=yes here for reference, I would rather still get the callerid number. hidecalleridno-withcidname.txt hidecallerid=no call from asterisk extension with callerid name I get similar debug from pstn call if I add callerid name info. | ||
Comments: | By: Steven BerkHolz (steveb) 2006-06-09 08:03:55 from zapata.conf: context=panasonic swichtype=national pridialplan=unknown prilocaldialplan=unknown signalling=pri_net usecallerid=yes facilityenable=no hidecallerid=yes ;fix for no answer restrictcid=yes usecallingpres=no echocancel=no echocancelwhenbridged=no group=2 channel => 25-47 By: Matthew Fredrickson (mattf) 2006-06-12 11:19:49 Are you sure that you have reported the correct version of your running code? I have checked the source and what you are suggesting does not appear to be possible with the version you are running as well as with the current version of trunk. By: Steven BerkHolz (steveb) 2006-06-12 12:46:09 Which is not possible, the way it appears to be functioning or a solution? I did get it to connect by adding this to my dialplan: exten => s,14,GotoIf($["${OUT_${ARG1}}" : "ZAP/g2"]?15:16) exten => s,15,Set(CALLERID(all)=<${CALLERID(number)}>) exten => s,16,Dial(${OUT_${ARG1}}/${OUTNUM},120,${TRUNK_OPTIONS}) ; Regular Trunk Dial This looks to see if I am dialing out ZAP/g2 and removes the callerID Name. The problem with this is that it also removes it from my CDR. Versions: libpri 1.2.3 zaptel 1.2.6 asterisk 1.2.9.1 All stable release versions. I will look closer in the code to see what "restrictcid" does. By: Steven BerkHolz (steveb) 2006-06-12 13:16:13 "restrictcid" does not appear to be used in chan_zap.c After seeing what hidecallerid does, one of these nights I will see if I can do the following. add a hidecalleridname flag. change: if (!p->hidecalleridname) { n = ast->cid.cid_name; } else { n = NULL; } if (!p->hidecallerid) { l = ast->cid.cid_num; n = ast->cid.cid_name; } else { l = NULL; n = NULL; } Hopefully this will only change it at the driver level and keep the calleridname in my CDR records. Hopefully, setting hidecalleridname will prevent the facility and display IEs that are freaking out my legacy pbx. By: Steven BerkHolz (steveb) 2006-06-12 16:44:22 I uploaded a patch. "hidecalleridnamepatch.txt" This successfully did what I wanted. zapata.conf new variable: hidecalleridname=yes This removes the calleridname from the sending switch. The CDR record still contain the callerid name. Please review. Edit: Please disregard "hidecalleridname.txt", I made the path file backwards. The patch is "hidecalleridnamepatch.txt". By: Serge Vecher (serge-v) 2006-06-13 09:04:53 steveb: as per CODING-GUIDELINES, there is no need for curly brackets in single line if/else constructs. Also, since this adds a new option, I think it will only go into trunk, not 1.2 By: Steven BerkHolz (steveb) 2006-06-13 11:41:40 vechers, Thanks for the input. I was emulating instead of writing, so I sufferred from cut and paste simplicity. I just uploaded "hidecalleridnamepatchv2.txt" By: Serge Vecher (serge-v) 2006-06-13 11:49:06 steveb: thanks for updating. Forgot one thing, since you are contributing code, can you please fax in on of the disclaimer forms from the bottom of this page to Digium http://bugs.digium.com/main_page.php ? Thanks By: Steven BerkHolz (steveb) 2006-06-13 12:24:05 I faxed it in yesterday. I also put a reference to username "steveb" on it for matching purposes. By: Steven BerkHolz (steveb) 2006-06-28 08:34:01 When do the other reviews take place? Is there another step I need to do to have this included in head? By: Matthew Fredrickson (mattf) 2006-07-06 16:58:27 Alright, I've looked over your patch and it generally looks good. The only problem is that is appears that you diff'd it by hand on the command line. The accepted way of submitting patches is to do an `svn diff` from the root of the checked out repository (in this case, you asterisk-trunk checkout directory). If you can give me that, I will put it in for you. By: Steven BerkHolz (steveb) 2006-07-19 10:12:12 Thanks for the info. I have resubmitted the patch as hidecalleridnamepatchv3.txt. It was run via svn diff against revision 37947. By: Jason Parker (jparker) 2006-07-19 13:01:27 I'm a bit late to this, but I'd like to make a suggestion.. Instead of adding an entirely new option, how about extending hidecallerid as follows hidecallerid=yes (exactly the same as currently) hidecallerid=no (don't hide it at all - same as current) hidecallerid=name (hide only the name) hidecallerid=num/number (hide only the number) After looking at this small patch, it doesn't seem like the above would be too difficult to implement instead. If nobody wants to do it, I can take a crack at it. By: Jason Parker (jparker) 2006-07-19 13:08:08 After looking at the patch a second time, I've realized that something is missing. :) If I'm looking at this right, it seems that it doesn't matter what you set hidecalleridname to, because it never actually sets p->hidecalleridname to anything... By: Steven BerkHolz (steveb) 2006-07-19 14:07:35 hidecalleridname is set to 0 by default hidecalleridname is set being set to 1 in zapata.conf via hidecalleridname = ast_true(v->value); If set, the callerID Name is erased prior to the call being initiated. This makes it act like the OLD ISDN Number only callerID. By: Jason Parker (jparker) 2006-07-19 14:12:07 That is incorrect. What you are setting, is the global variable. However, you are then reading the variable on the channel. tmp->hidecallerid (tmp is a zt_pvt) is being set in mkintf(), which is where you'll also need to set hidecalleridname on the zt_pvt Would you like to take a stab at creating a patch for the suggestion I made? By: Steven BerkHolz (steveb) 2006-07-19 14:29:10 Wow, I wonder why it works then. So, I need to put in?: tmp->hidecalleridname = hidecalleridname; As for your first suggestion of hidecallerid=name. My concern would be changing hidecallerid from a yes/no to a string. Wouldn't we have to put error checking in at every reference of p->hidecallerid to make sure that a string wouldn't break it. Or would we still use the hidecalleridname internally and set both variables when reading in hidecallerid? By: Jason Parker (jparker) 2006-07-19 14:42:08 Without thinking about it too deeply, I envisioned it as an enum or something. You would check ast_true (will catch 1, yes, true, etc), ast_false (0, no, false, etc), then check for "name" and "num"/"number", and probably a default case. It would set hidecallerid to a value between 0 and 3, which would then be checked everywhere it's currently checked, and only set the appropriate value(s). By: jmls (jmls) 2006-10-31 14:14:01.000-0600 steveb: any updates on your patch ? By: Matthew Fredrickson (mattf) 2006-11-10 13:36:44.000-0600 Applied to trunk. By: Matthew Fredrickson (mattf) 2006-11-10 14:25:53.000-0600 Applied to 1.4 as well By: Digium Subversion (svnbot) 2010-04-27 13:14:55 Repository: asterisk Revision: 259270 U branches/1.4/channels/chan_dahdi.c U branches/1.4/configs/chan_dahdi.conf.sample ------------------------------------------------------------------------ r259270 | rmudgett | 2010-04-27 13:14:55 -0500 (Tue, 27 Apr 2010) | 14 lines hidecalleridname parameter in chan_dahdi.conf Issue ASTERISK-7133 implements a new chan_dahdi configuration option. However, a change mentioned in the issue was never implemented. This is the change that will allow the feature to work. I added a note to chan_dahdi.conf.sample about the feature. (closes issue ASTERISK-15919) Reported by: djensen99 Patches: diff.txt uploaded by djensen99 (license NA) (One line change) Tested by: djensen99 ------------------------------------------------------------------------ http://svn.digium.com/view/asterisk?view=rev&revision=259270 By: Digium Subversion (svnbot) 2010-04-27 13:29:34 Repository: asterisk Revision: 259307 _U trunk/ U trunk/channels/chan_dahdi.c U trunk/configs/chan_dahdi.conf.sample ------------------------------------------------------------------------ r259307 | rmudgett | 2010-04-27 13:29:34 -0500 (Tue, 27 Apr 2010) | 21 lines Merged revisions 259270 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r259270 | rmudgett | 2010-04-27 13:14:54 -0500 (Tue, 27 Apr 2010) | 14 lines hidecalleridname parameter in chan_dahdi.conf Issue ASTERISK-7133 implements a new chan_dahdi configuration option. However, a change mentioned in the issue was never implemented. This is the change that will allow the feature to work. I added a note to chan_dahdi.conf.sample about the feature. (closes issue ASTERISK-15919) Reported by: djensen99 Patches: diff.txt uploaded by djensen99 (license NA) (One line change) Tested by: djensen99 ........ ------------------------------------------------------------------------ http://svn.digium.com/view/asterisk?view=rev&revision=259307 By: Digium Subversion (svnbot) 2010-04-27 13:41:39 Repository: asterisk Revision: 259308 _U branches/1.6.0/ U branches/1.6.0/channels/chan_dahdi.c U branches/1.6.0/configs/chan_dahdi.conf.sample ------------------------------------------------------------------------ r259308 | rmudgett | 2010-04-27 13:41:38 -0500 (Tue, 27 Apr 2010) | 28 lines Merged revisions 259307 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r259307 | rmudgett | 2010-04-27 13:29:33 -0500 (Tue, 27 Apr 2010) | 21 lines Merged revisions 259270 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r259270 | rmudgett | 2010-04-27 13:14:54 -0500 (Tue, 27 Apr 2010) | 14 lines hidecalleridname parameter in chan_dahdi.conf Issue ASTERISK-7133 implements a new chan_dahdi configuration option. However, a change mentioned in the issue was never implemented. This is the change that will allow the feature to work. I added a note to chan_dahdi.conf.sample about the feature. (closes issue ASTERISK-15919) Reported by: djensen99 Patches: diff.txt uploaded by djensen99 (license NA) (One line change) Tested by: djensen99 ........ ................ ------------------------------------------------------------------------ http://svn.digium.com/view/asterisk?view=rev&revision=259308 By: Digium Subversion (svnbot) 2010-04-27 13:53:18 Repository: asterisk Revision: 259309 _U branches/1.6.1/ U branches/1.6.1/channels/chan_dahdi.c U branches/1.6.1/configs/chan_dahdi.conf.sample ------------------------------------------------------------------------ r259309 | rmudgett | 2010-04-27 13:53:18 -0500 (Tue, 27 Apr 2010) | 28 lines Merged revisions 259307 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r259307 | rmudgett | 2010-04-27 13:29:33 -0500 (Tue, 27 Apr 2010) | 21 lines Merged revisions 259270 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r259270 | rmudgett | 2010-04-27 13:14:54 -0500 (Tue, 27 Apr 2010) | 14 lines hidecalleridname parameter in chan_dahdi.conf Issue ASTERISK-7133 implements a new chan_dahdi configuration option. However, a change mentioned in the issue was never implemented. This is the change that will allow the feature to work. I added a note to chan_dahdi.conf.sample about the feature. (closes issue ASTERISK-15919) Reported by: djensen99 Patches: diff.txt uploaded by djensen99 (license NA) (One line change) Tested by: djensen99 ........ ................ ------------------------------------------------------------------------ http://svn.digium.com/view/asterisk?view=rev&revision=259309 By: Digium Subversion (svnbot) 2010-04-27 14:03:05 Repository: asterisk Revision: 259310 _U branches/1.6.2/ U branches/1.6.2/channels/chan_dahdi.c U branches/1.6.2/configs/chan_dahdi.conf.sample ------------------------------------------------------------------------ r259310 | rmudgett | 2010-04-27 14:03:05 -0500 (Tue, 27 Apr 2010) | 28 lines Merged revisions 259307 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r259307 | rmudgett | 2010-04-27 13:29:33 -0500 (Tue, 27 Apr 2010) | 21 lines Merged revisions 259270 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r259270 | rmudgett | 2010-04-27 13:14:54 -0500 (Tue, 27 Apr 2010) | 14 lines hidecalleridname parameter in chan_dahdi.conf Issue ASTERISK-7133 implements a new chan_dahdi configuration option. However, a change mentioned in the issue was never implemented. This is the change that will allow the feature to work. I added a note to chan_dahdi.conf.sample about the feature. (closes issue ASTERISK-15919) Reported by: djensen99 Patches: diff.txt uploaded by djensen99 (license NA) (One line change) Tested by: djensen99 ........ ................ ------------------------------------------------------------------------ http://svn.digium.com/view/asterisk?view=rev&revision=259310 |