dlgs: tags operations and counting functions

src/modules/dlgs/dlgs_mod.c

@@ -252,6 +252,10 @@ static int ki_dlgs_count(sip_msg_t *msg, str *vfield, str *vop, str *vdata)
 {
 	LM_DBG("counting by: [%.*s] [%.*s] [%.*s]\n", vfield->len, vfield->s,
 			vop->len, vop->s, vdata->len, vdata->s);
+	if(dlgs_count(msg, vfield, vop, vdata) < 0) {
+		return -1;
+	}
+
 	return 1;
 }
 
@@ -304,11 +308,39 @@ static int w_dlgs_tags_add(sip_msg_t *msg, char *ptags, char *p2)
 	return ki_dlgs_tags_add(msg, &vtags);
 }
 
+/**
+ *
+ */
+static int ki_dlgs_tags_rm(sip_msg_t *msg, str *vtags)
+{
+	if(dlgs_tags_rm(msg, vtags)<0) {
+		return -1;
+	}
+	return 1;
+}
+
 /**
  *
  */
 static int w_dlgs_tags_rm(sip_msg_t *msg, char *ptags, char *p2)
 {
+	str vtags = STR_NULL;
+
+	if(fixup_get_svalue(msg, (gparam_t*)ptags, &vtags) < 0) {
+		LM_ERR("failed to get p1\n");
+		return -1;
+	}
+	return ki_dlgs_tags_rm(msg, &vtags);
+}
+
+/**
+ *
+ */
+static int ki_dlgs_tags_count(sip_msg_t *msg, str *vtags)
+{
+	if(dlgs_tags_count(msg, vtags)<0) {
+		return -1;
+	}
 	return 1;
 }
 
@@ -317,7 +349,13 @@ static int w_dlgs_tags_rm(sip_msg_t *msg, char *ptags, char *p2)
  */
 static int w_dlgs_tags_count(sip_msg_t *msg, char *ptags, char *p2)
 {
-	return 1;
+	str vtags = STR_NULL;
+
+	if(fixup_get_svalue(msg, (gparam_t*)ptags, &vtags) < 0) {
+		LM_ERR("failed to get p1\n");
+		return -1;
+	}
+	return ki_dlgs_tags_count(msg, &vtags);
 }
 
 /**
@@ -356,6 +394,16 @@ static sr_kemi_t sr_kemi_dlgs_exports[] = {
 		{ SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,
 			SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE }
 	},
+	{ str_init("dlgs"), str_init("dlgs_tags_rm"),
+		SR_KEMIP_INT, ki_dlgs_tags_rm,
+		{ SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,
+			SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE }
+	},
+	{ str_init("dlgs"), str_init("dlgs_tags_count"),
+		SR_KEMIP_INT, ki_dlgs_tags_count,
+		{ SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,
+			SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE }
+	},
 
 	{ {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } }
 };

src/modules/dlgs/dlgs_records.c

@@ -479,6 +479,107 @@ int dlgs_del_item(sip_msg_t *msg)
 	return 0;
 }
 
+int dlgs_count(sip_msg_t *msg, str *vfield, str *vop, str *vdata)
+{
+	int i;
+	int n;
+	dlgs_item_t *it;
+	int tfield = 0;
+	int top = 0;
+	str mval;
+
+	if(_dlgs_htb == NULL) {
+		return -1;
+	}
+	if(vfield == NULL || vop == NULL || vdata ==NULL) {
+		return -1;
+	}
+	if(vfield->len==3 && strncasecmp(vfield->s, "any", 3)==0) {
+		tfield = 0;
+	} else if(vfield->len==3 && strncasecmp(vfield->s, "src", 3)==0) {
+		tfield = 1;
+	} else if(vfield->len==3 && strncasecmp(vfield->s, "dst", 3)==0) {
+		tfield = 2;
+	} else if(vfield->len==4 && strncasecmp(vfield->s, "data", 4)==0) {
+		tfield = 3;
+	} else {
+		LM_ERR("unknown field: %.*s\n", vfield->len, vfield->s);
+		return -1;
+	}
+	if(vop->len==2 && strncasecmp(vop->s, "eq", 2)==0) {
+		top = 0;
+	} else if(vop->len==2 && strncasecmp(vop->s, "ne", 2)==0) {
+		top = 1;
+	} else if(vop->len==2 && strncasecmp(vop->s, "re", 2)==0) {
+		top = 2;
+	} else if(vop->len==2 && strncasecmp(vop->s, "sw", 2)==0) {
+		top = 3;
+	} else if(vop->len==2 && strncasecmp(vop->s, "fm", 2)==0) {
+		top = 4;
+	} else {
+		LM_ERR("unknown operator: %.*s\n", vop->len, vop->s);
+		return -1;
+	}
+
+	n = 0;
+	if(tfield == 0) {
+		/* count 'any' dialog not-yet-finished */
+		for(i=0; i<_dlgs_htb->htsize; i++) {
+			n += _dlgs_htb->slots[i].astats.c_init;
+			n += _dlgs_htb->slots[i].astats.c_progress;
+			n += _dlgs_htb->slots[i].astats.c_answered;
+			n += _dlgs_htb->slots[i].astats.c_confirmed;
+		}
+		return n;
+	}
+
+	for(i = 0; i < _dlgs_htb->htsize; i++) {
+		lock_get(&_dlgs_htb->slots[i].lock);
+		for(it = _dlgs_htb->slots[i].first; it != NULL; it=it->next) {
+			if(it->state != DLGS_STATE_TERMINATED
+					&& it->state != DLGS_STATE_NOTANSWERED) {
+				switch(tfield) {
+					case 1:
+						mval = it->src;
+						break;
+					case 2:
+						mval = it->dst;
+						break;
+					case 3:
+						mval = it->data;
+						break;
+					default:
+						mval = it->src;
+						break;
+				}
+				switch(top) {
+					case 0:
+						if(mval.len == vdata->len
+								&& strncmp(mval.s, vdata->s, mval.len)==0) {
+							n++;
+						}
+					break;
+					case 1:
+						if(mval.len != vdata->len
+								|| strncmp(mval.s, vdata->s, mval.len)!=0) {
+							n++;
+						}
+					break;
+					case 3:
+						if(mval.len >= vdata->len
+								&& strncmp(mval.s, vdata->s, vdata->len)==0) {
+							n++;
+						}
+					break;
+				}
+			}
+		}
+		lock_release(&_dlgs_htb->slots[i].lock);
+	}
+
+	return n;
+}
+
 /**
  *
  */
@@ -694,6 +795,82 @@ int dlgs_tags_add(sip_msg_t *msg, str *vtags)
 	return 0;
 }
 
+/**
+ *
+ */
+int dlgs_tags_rm(sip_msg_t *msg, str *vtags)
+{
+	dlgs_item_t *dit = NULL;
+	dlgs_tag_t *dtag = NULL;
+
+	if(vtags==NULL || vtags->len<=0) {
+		LM_DBG("no tags content\n");
+		return -1;
+	}
+
+	dit = dlgs_get_item(msg);
+	if(dit == NULL) {
+		return -1;
+	}
+	for(dtag=dit->tags; dtag!=NULL; dtag=dtag->next) {
+		if(dtag->tname.len == vtags->len
+				&& strncmp(dtag->tname.s, vtags->s, vtags->len) == 0) {
+			break;
+		}
+	}
+	if(dtag == NULL) {
+		dlgs_unlock_item(msg);
+		return 0;
+	}
+	if(dtag->next) {
+		dtag->next->prev = dtag->prev;
+	}
+	if(dtag->prev) {
+		dtag->prev->next = dtag->next;
+	}
+	if(dtag == dit->tags) {
+		dit->tags = dtag->next;
+	}
+	dlgs_unlock_item(msg);
+
+	shm_free(dtag);
+	return 0;
+}
+
+/**
+ *
+ */
+int dlgs_tags_count(sip_msg_t *msg, str *vtags)
+{
+	int i;
+	int n;
+	dlgs_item_t *it;
+	dlgs_tag_t *dtag = NULL;
+
+	if(_dlgs_htb == NULL) {
+		return -1;
+	}
+
+	n = 0;
+	for(i = 0; i < _dlgs_htb->htsize; i++) {
+		lock_get(&_dlgs_htb->slots[i].lock);
+		for(it = _dlgs_htb->slots[i].first; it != NULL; it=it->next) {
+			if(it->state != DLGS_STATE_TERMINATED
+					&& it->state != DLGS_STATE_NOTANSWERED) {
+				for(dtag=it->tags; dtag!=NULL; dtag=dtag->next) {
+					if(dtag->tname.len == vtags->len
+							&& strncmp(dtag->tname.s, vtags->s, vtags->len) == 0) {
+						n++;
+					}
+				}
+			}
+		}
+		lock_release(&_dlgs_htb->slots[i].lock);
+	}
+
+	return n;
+}
+
 /**
  *
  */

src/modules/dlgs/dlgs_records.h

@@ -102,6 +102,8 @@ dlgs_ht_t *dlgs_ht_init(void);
 int dlgs_ht_destroy(void);
 int dlgs_add_item(sip_msg_t *msg, str *src, str *dst, str *data);
 int dlgs_del_item(sip_msg_t *msg);
+int dlgs_count(sip_msg_t *msg, str *vfield, str *vop, str *vdata);
+
 dlgs_item_t *dlgs_get_item(sip_msg_t *msg);
 int dlgs_unlock_item(sip_msg_t *msg);
 
@@ -116,5 +118,7 @@ int dlgs_rpc_init(void);
 int dlgs_update_item(sip_msg_t *msg);
 
 int dlgs_tags_add(sip_msg_t *msg, str *vtags);
+int dlgs_tags_rm(sip_msg_t *msg, str *vtags);
+int dlgs_tags_count(sip_msg_t *msg, str *vtags);
 
 #endif