root/contributed_modules/modules/capturegroups/asterisk-1.4-pickupbycallid.patch

channels/chan_sip.c

@@ -508 +508 @@
-#define DEFAULT_ALLOW_EXT_DOM TRUE
-#define DEFAULT_REALM   "asterisk"
-#define DEFAULT_NOTIFYRINGING TRUE
+#define DEFAULT_SENDCALLINFO  TRUE
-#define DEFAULT_PEDANTIC  FALSE
-#define DEFAULT_AUTOCREATEPEER  FALSE
-#define DEFAULT_QUALIFY   FALSE
@@ -539 +540 @@
-static int global_limitonpeers;   /*!< Match call limit on peers only */
-static int global_rtautoclear;
-static int global_notifyringing;  /*!< Send notifications on ringing */
+static int global_sendcallinfo;   /*!< Send info about called and calling party */
-static int global_notifyhold;   /*!< Send notifications on hold */
-static int global_alwaysauthreject; /*!< Send 401 Unauthorized for all failing requests */
-static int srvlookup;     /*!< SRV Lookup on or off. Default is on */
@@ -7225 +7227 @@
-  size_t maxbytes = sizeof(tmp);
-  struct sip_request req;
-  char hint[AST_MAX_EXTENSION];
+  char hint3[AST_MAX_EXTENSION] ;
-  char *statestring = "terminated";
-  const struct cfsubscription_types *subscriptiontype;
-  enum state { NOTIFY_OPEN, NOTIFY_INUSE, NOTIFY_CLOSED } local_state = NOTIFY_OPEN;
@@ -7284 +7287 @@
-  if (ast_get_hint(hint, sizeof(hint), NULL, 0, NULL, p->context, p->exten)) {
-    char *hint2 = hint, *individual_hint = NULL;
-    int hint_count = 0, unavailable_count = 0;
+    
+    ast_get_hint(hint3, sizeof(hint3), NULL, 0, NULL, p->context, p->exten);
-
-    while ((individual_hint = strsep(&hint2, "&"))) {
-      hint_count++;
@@ -7373 +7378 @@
-  case DIALOG_INFO_XML: /* SNOM subscribes in this format */
-    ast_build_string(&t, &maxbytes, "<?xml version=\"1.0\"?>\n");
-    ast_build_string(&t, &maxbytes, "<dialog-info xmlns=\"urn:ietf:params:xml:ns:dialog-info\" version=\"%d\" state=\"%s\" entity=\"%s\">\n", p->dialogver++, full ? "full":"partial", mto);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    else
-      ast_build_string(&t, &maxbytes, "<dialog id=\"%s\">\n", p->exten);
-    ast_build_string(&t, &maxbytes, "<state>%s</state>\n", statestring);
@@ -17385 +17431 @@
-  global_regcontext[0] = '\0';
-  expiry = DEFAULT_EXPIRY;
-  global_notifyringing = DEFAULT_NOTIFYRINGING;
+  global_sendcallinfo = DEFAULT_SENDCALLINFO;
-  global_limitonpeers = FALSE;
-  global_directrtpsetup = FALSE;    /* Experimental feature, disabled by default */
-  global_notifyhold = FALSE;
@@ -17521 +17568 @@
-      global_directrtpsetup = ast_true(v->value);
-    } else if (!strcasecmp(v->name, "notifyringing")) {
-      global_notifyringing = ast_true(v->value);
+    } else if (!strcasecmp(v->name, "sendcallinfo")) {
+      global_sendcallinfo = ast_true(v->value);
-    } else if (!strcasecmp(v->name, "notifyhold")) {
-      global_notifyhold = ast_true(v->value);
-    } else if (!strcasecmp(v->name, "alwaysauthreject")) {