-
Notifications
You must be signed in to change notification settings - Fork 989
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
sig_analog: Allow immediate fake ring to be suppressed. #119
sig_analog: Allow immediate fake ring to be suppressed. #119
Conversation
cherry-pick-to: 20 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No merger commits please.
Please squash.
Whoops, I was attempting to fix a merge conflict but I guess that didn't work out. Rebasing like with Gerrit doesn't seem to get anywhere. Is there a good way of squashing offline? I know the "Squash and merge" on GitHub somehow does it magically but attempts to squash via Alternately, rather than wrestling with this, is it fine if I just submit a new PR (same content, but base branch updated properly first) or will that mess things up? |
When immediate=yes on an FXS channel, sig_analog will start fake audible ringback that continues until the channel is answered. Even if it answers immediately, the ringback is still audible for a brief moment. This can be disruptive and unwanted behavior. This adds an option to disable this behavior, though the default behavior remains unchanged. ASTERISK-30003 #close Resolves: asterisk#118 UserNote: The immediatering option can now be set to no to suppress the fake audible ringback provided when immediate=yes on FXS channels.
037b432
to
7cc2238
Compare
1b894e6
to
32fd0fb
Compare
@gtjoseph I'm not sure if you were trying to update something on this PR (I don't see that on other PRs) but I'm now seeing a notice that the branch is out of date, do I need to rebase or is it good as is? Don't want to just click the magic button, as I'm sure that might screw something up again. |
"Out of date" is OK. It just means that something else was merged into "master" since you last updated the PR. You can rebase off of current master if you want, but it's not necessary. You should do it locally then force push the PR rather than using the "Update branch" button. If it ever says "Merge conflict" then something went in that will make your PR fail to merge. You'll need to locally rebase your PR branch from master, resolve any conflicts and force push your PR back up again. |
Okay, thanks for clarifying. Still a little confused, since it says you've requested changes, but I don't see what the branch being out of date would have to do with that otherwise, is there something else I need to do? I addressed the rebase issue, but it sounds like there's another issue? |
The only change I requested was the squash. Not sure why it didn't dismiss automatically when you re-submitted. |
Successfully merged to branch master and cherry-picked to ["20","18"] |
When immediate=yes on an FXS channel, sig_analog will start fake audible ringback that continues until the channel is answered. Even if it answers immediately, the ringback is still audible for a brief moment.
This can be disruptive and unwanted behavior.
This adds an option to disable this behavior, though the default behavior remains unchanged.
Resolves: #118
ASTERISK-30003
Imported from: https://gerrit.asterisk.org/c/asterisk/+/19715
UserNote: The immediatering option can now be set to no to suppress the fake audible ringback provided
when immediate=yes on FXS channels.