diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2013-05-21 18:00:22 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2013-05-21 18:00:22 +0000 |
| commit | 3d63833bd6c869b7efa383e8dea14be1a6eff998 (patch) | |
| tree | 34957dd051b8f67c7cc58a510e24ee3873a61ad4 /main/frame.c | |
| parent | e1e1cc2deefb92f8b43825f1f34e619354737842 (diff) | |
Merge in the bridge_construction branch to make the system use the Bridging API.
Breaks many things until they can be reworked. A partial list:
chan_agent
chan_dahdi, chan_misdn, chan_iax2 native bridging
app_queue
COLP updates
DTMF attended transfers
Protocol attended transfers
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@389378 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/frame.c')
| -rw-r--r-- | main/frame.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/main/frame.c b/main/frame.c index b559d552d..8822261f6 100644 --- a/main/frame.c +++ b/main/frame.c @@ -635,6 +635,10 @@ void ast_frame_subclass2str(struct ast_frame *f, char *subclass, size_t slen, ch /* Should never happen */ snprintf(subclass, slen, "IAX Frametype %d", f->subclass.integer); break; + case AST_FRAME_BRIDGE_ACTION: + /* Should never happen */ + snprintf(subclass, slen, "Bridge Frametype %d", f->subclass.integer); + break; case AST_FRAME_TEXT: ast_copy_string(subclass, "N/A", slen); if (moreinfo) { @@ -722,6 +726,10 @@ void ast_frame_type2str(enum ast_frame_type frame_type, char *ftype, size_t len) /* Should never happen */ ast_copy_string(ftype, "IAX Specific", len); break; + case AST_FRAME_BRIDGE_ACTION: + /* Should never happen */ + ast_copy_string(ftype, "Bridge Specific", len); + break; case AST_FRAME_TEXT: ast_copy_string(ftype, "Text", len); break; |