← Back to branch summary

~damg/ubuntu/quantal/asterisk/LP1097687

« back to all changes in this revision

Viewing changes to main/pbx.c

  • Committer: Bazaar Package Importer
  • Author(s): Lorenzo De Liso
  • Date: 2010-10-15 22:24:34 UTC
  • mfrom: (1.2.8 upstream) (8.3.8 sid)
  • Revision ID: james.westby@ubuntu.com-20101015222434-iy328q8in3lajzlv
Tags: 1:1.6.2.9-2ubuntu1
* Merge from debian unstable, remaining changes:
  - debian/control:
    + Build-depend on hardening-wrapper
    + Change Maintainer
    + Removed Uploaders field.
    + Removed Debian Vcs-Svn entry and replaced with ubuntu-voip Vcs-Bzr,
      to reflect divergence in packages.
  - debian/rules: Make use of hardening-wrapper
  - debian/asterisk.init: chown /dev/dahdi
  - debian/backports/hardy: add file
  - debian/backports/asterisk.init.hardy: add file
 

Show diffs side-by-side

added added

removed removed

Lines of Context:
main/pbx.c
24
24
 */
25
25
#include "asterisk.h"
26
26
 
27
 
ASTERISK_FILE_VERSION(__FILE__, "$Revision: 243490 $")
 
27
ASTERISK_FILE_VERSION(__FILE__, "$Revision: 264783 $")
28
28
 
29
29
#include "asterisk/_private.h"
30
30
#include "asterisk/paths.h"     /* use ast_config_AST_SYSTEM_NAME */
3837
3837
                return -1;                   /* No hint, return -1 */
3838
3838
        }
3839
3839
 
 
3840
        if (e->exten[0] == '_') {
 
3841
                /* Create this hint on-the-fly */
 
3842
                ast_add_extension(e->parent->name, 0, exten, e->priority, e->label,
 
3843
                        e->matchcid ? e->cidmatch : NULL, e->app, ast_strdup(e->data), ast_free_ptr,
 
3844
                        e->registrar);
 
3845
                if (!(e = ast_hint_extension(c, context, exten))) {
 
3846
                        /* Improbable, but not impossible */
 
3847
                        return -1;
 
3848
                }
 
3849
        }
 
3850
 
3840
3851
        return ast_extension_state2(e);  /* Check all devices in the hint */
3841
3852
}
3842
3853