ast_mutex_lock(&pkt->owner->lock);
}
if (pkt->owner->owner) {
+ pkt->owner->alreadygone=1;
ast_queue_hangup(pkt->owner->owner);
ast_mutex_unlock(&pkt->owner->owner->lock);
} else {
*/
-#define REALTIME_COMMON \
+#define REALTIME_COMMON(mode) \
char *buf; \
char *opts; \
const char *cxt; \
char *table; \
int res=-1; \
- struct ast_variable *var; \
+ struct ast_variable *var=NULL; \
buf = ast_strdupa(data); \
if (buf) { \
opts = strchr(buf, '/'); \
cxt = context;\
if (!table || ast_strlen_zero(table)) \
table = "extensions"; \
- var = realtime_switch_common(table, cxt, exten, priority); \
+ var = realtime_switch_common(table, cxt, exten, priority, mode); \
} else \
- return -1;
+ res = -1;
static struct ast_variable *realtime_switch_common(const char *table, const char *context, const char *exten, int priority)
{
if (var) ast_destroy_realtime(var);
if (var)
res = 1;
- return res;
+ return res > 0 ? res : 0;
}
static int realtime_exec(struct ast_channel *chan, const char *context, const char *exten, int priority, const char *callerid, int newstack, const char *data)
appdata = ast_strdupa(v->value);
v = v->next;
}
+ ast_destroy_realtime(var);
if (!ast_strlen_zero(app)) {
a = pbx_findapp(app);
if (a) {
} else
ast_log(LOG_NOTICE, "No such application '%s' for extension '%s' in context '%s'\n", app, exten, context);
}
- ast_destroy_realtime(var);
}
return res;
}
{
REALTIME_COMMON;
if (var) ast_destroy_realtime(var);
- return res;
+ return res > 0 ? res : 0;
}
static struct ast_switch realtime_switch =
LOCAL_USER_DECL;
+static void parseop(char *newp, int newplen, char **opo, const char *newparam)
+{
+ char *op;
+ strncpy(newp, newparam, newplen - 1);
+ op = strchr(newp, ' ');
+ if (op) {
+ *op = '\0';
+ op++;
+ } else
+ op = "=";
+ *opo = op;
+}
+
static struct ast_variable *realtime_odbc(const char *database, const char *table, va_list ap)
{
odbc_obj *obj;
SQLHSTMT stmt;
- char sql[256];
+ char sql[1024];
char coltitle[256];
char rowdata[2048];
+ char newp[256];
+ char *op;
const char *newparam, *newval;
char *stringp;
char *chunk;
return NULL;
}
newval = va_arg(aq, const char *);
-
- snprintf(sql, sizeof(sql), "SELECT * FROM %s WHERE %s=?", table, newparam);
+ parseop(newp, sizeof(newp), &op, newparam);
+ snprintf(sql, sizeof(sql), "SELECT * FROM %s WHERE %s %s ?", table, newp, op);
while((newparam = va_arg(aq, const char *))) {
- snprintf(sql + strlen(sql), sizeof(sql) - strlen(sql), " AND %s=?", newparam);
+ parseop(newp, sizeof(newp), &op, newparam);
+ snprintf(sql + strlen(sql), sizeof(sql) - strlen(sql), " AND %s %s ?", newparam, op);
newval = va_arg(aq, const char *);
}
va_end(aq);