ソースを参照

dmq_usrloc: fix indentation

Charles Chance 10 年 前
コミット
7b35791472
1 ファイル変更86 行追加86 行削除
  1. 86 86
      modules/dmq_usrloc/usrloc_sync.c

+ 86 - 86
modules/dmq_usrloc/usrloc_sync.c

@@ -118,7 +118,7 @@ static int delete_contact(str aor, ucontact_info_t* ci)
 
 
 void usrloc_get_all_ucontact(dmq_node_t* node)
 void usrloc_get_all_ucontact(dmq_node_t* node)
 {
 {
- 	int rval, len=0;
+	int rval, len=0;
 	void *buf, *cp;
 	void *buf, *cp;
 	str c, recv;
 	str c, recv;
 	str path;
 	str path;
@@ -130,16 +130,16 @@ void usrloc_get_all_ucontact(dmq_node_t* node)
 	len = 0;
 	len = 0;
 	buf = NULL;
 	buf = NULL;
 
 
-  str aor;
-  urecord_t* r;
-  udomain_t* _d;
-  ucontact_t* ptr = 0;
-  int res;
+	str aor;
+	urecord_t* r;
+	udomain_t* _d;
+	ucontact_t* ptr = 0;
+	int res;
 
 
-  if (dmq_ul.get_all_ucontacts == NULL){
-    LM_ERR("dmq_ul.get_all_ucontacts is NULL\n");
-    goto done;
-  }
+	if (dmq_ul.get_all_ucontacts == NULL){
+		LM_ERR("dmq_ul.get_all_ucontacts is NULL\n");
+		goto done;
+	}
 
 
 	if (dmq_ul.get_udomain("location", &_d) < 0) {
 	if (dmq_ul.get_udomain("location", &_d) < 0) {
 		LM_ERR("Failed to get domain\n");
 		LM_ERR("Failed to get domain\n");
@@ -168,46 +168,46 @@ void usrloc_get_all_ucontact(dmq_node_t* node)
 	}
 	}
 	if (buf == NULL)
 	if (buf == NULL)
 		goto done;
 		goto done;
-	  cp = buf;
-    while (1) {
-        memcpy(&(c.len), cp, sizeof(c.len));
-        if (c.len == 0)
-            break;
-        c.s = (char*)cp + sizeof(c.len);
-        cp =  (char*)cp + sizeof(c.len) + c.len;
-        memcpy(&(recv.len), cp, sizeof(recv.len));
-        recv.s = (char*)cp + sizeof(recv.len);
-        cp =  (char*)cp + sizeof(recv.len) + recv.len;
-        memcpy( &send_sock, cp, sizeof(send_sock));
-        cp = (char*)cp + sizeof(send_sock);
-        memcpy( &flags, cp, sizeof(flags));
-        cp = (char*)cp + sizeof(flags);
-        memcpy( &(path.len), cp, sizeof(path.len));
-        path.s = path.len ? ((char*)cp + sizeof(path.len)) : NULL ;
-        cp =  (char*)cp + sizeof(path.len) + path.len;
-        memcpy( &(ruid.len), cp, sizeof(ruid.len));
-        ruid.s = ruid.len ? ((char*)cp + sizeof(ruid.len)) : NULL ;
-        cp =  (char*)cp + sizeof(ruid.len) + ruid.len;
-        memcpy( &aorhash, cp, sizeof(aorhash));
-        cp = (char*)cp + sizeof(aorhash);
-
-        res = dmq_ul.get_urecord_by_ruid(_d, aorhash, &ruid, &r, &ptr);
-        aor = r->aor;
-        if (res > 0) {
-            LM_DBG("'%.*s' Not found in usrloc\n", aor.len, ZSW(aor.s));
-            dmq_ul.release_urecord(r);
-            dmq_ul.unlock_udomain(_d, &aor);
-            continue;
-        }
-        LM_DBG("- AoR: %.*s  AoRhash=%d  Flags=%d\n", aor.len, aor.s, aorhash, flags);
-
-        while (ptr) {
-            usrloc_dmq_send_contact(ptr, aor, DMQ_UPDATE, node);
-            ptr = ptr->next;
-        }
-        dmq_ul.release_urecord(r);
-        dmq_ul.unlock_udomain(_d, &aor);
-    }
+	cp = buf;
+	while (1) {
+		memcpy(&(c.len), cp, sizeof(c.len));
+		if (c.len == 0)
+			break;
+		c.s = (char*)cp + sizeof(c.len);
+		cp =  (char*)cp + sizeof(c.len) + c.len;
+		memcpy(&(recv.len), cp, sizeof(recv.len));
+		recv.s = (char*)cp + sizeof(recv.len);
+		cp =  (char*)cp + sizeof(recv.len) + recv.len;
+		memcpy( &send_sock, cp, sizeof(send_sock));
+		cp = (char*)cp + sizeof(send_sock);
+		memcpy( &flags, cp, sizeof(flags));
+		cp = (char*)cp + sizeof(flags);
+		memcpy( &(path.len), cp, sizeof(path.len));
+		path.s = path.len ? ((char*)cp + sizeof(path.len)) : NULL ;
+		cp =  (char*)cp + sizeof(path.len) + path.len;
+		memcpy( &(ruid.len), cp, sizeof(ruid.len));
+		ruid.s = ruid.len ? ((char*)cp + sizeof(ruid.len)) : NULL ;
+		cp =  (char*)cp + sizeof(ruid.len) + ruid.len;
+		memcpy( &aorhash, cp, sizeof(aorhash));
+		cp = (char*)cp + sizeof(aorhash);
+
+		res = dmq_ul.get_urecord_by_ruid(_d, aorhash, &ruid, &r, &ptr);
+		aor = r->aor;
+		if (res > 0) {
+			LM_DBG("'%.*s' Not found in usrloc\n", aor.len, ZSW(aor.s));
+			dmq_ul.release_urecord(r);
+			dmq_ul.unlock_udomain(_d, &aor);
+			continue;
+		}
+		LM_DBG("- AoR: %.*s  AoRhash=%d  Flags=%d\n", aor.len, aor.s, aorhash, flags);
+
+		while (ptr) {
+			usrloc_dmq_send_contact(ptr, aor, DMQ_UPDATE, node);
+			ptr = ptr->next;
+		}
+		dmq_ul.release_urecord(r);
+		dmq_ul.unlock_udomain(_d, &aor);
+	}
 	pkg_free(buf);
 	pkg_free(buf);
 
 
 done:
 done:
@@ -380,22 +380,22 @@ int usrloc_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t*
 
 
 	switch(action) {
 	switch(action) {
 		case DMQ_UPDATE:
 		case DMQ_UPDATE:
-						LM_DBG("Received DMQ_UPDATE. Update contact info...\n");
-						add_contact(aor, &ci);
-						break;
+			LM_DBG("Received DMQ_UPDATE. Update contact info...\n");
+			add_contact(aor, &ci);
+			break;
 		case DMQ_RM:
 		case DMQ_RM:
-						LM_DBG("Received DMQ_RM. Delete contact info...\n");
-						delete_contact(aor, &ci);
-						break;
+			LM_DBG("Received DMQ_RM. Delete contact info...\n");
+			delete_contact(aor, &ci);
+			break;
 		case DMQ_SYNC:
 		case DMQ_SYNC:
-						LM_DBG("Received DMQ_SYNC. Sending all contacts...\n");
-						usrloc_get_all_ucontact(node);
-						break;
+			LM_DBG("Received DMQ_SYNC. Sending all contacts...\n");
+			usrloc_get_all_ucontact(node);
+			break;
 		case DMQ_NONE:
 		case DMQ_NONE:
-						LM_DBG("Received DMQ_NONE. Not used...\n");
-						break;
-
-		default:  goto invalid;
+			LM_DBG("Received DMQ_NONE. Not used...\n");
+			break;
+		default:
+			goto invalid;
 	}
 	}
 
 
 	srjson_DestroyDoc(&jdoc);
 	srjson_DestroyDoc(&jdoc);
@@ -525,28 +525,28 @@ void dmq_ul_cb_contact(ucontact_t* ptr, int type, void* param)
 {
 {
 	str aor;
 	str aor;
 
 
-		LM_DBG("Callback from usrloc with type=%d\n", type);
-		aor.s = ptr->aor->s;
-		aor.len = ptr->aor->len;
-
-		if (!(ptr->flags & FL_RPL)) {
-
-			switch(type){
-				case UL_CONTACT_INSERT:
-											usrloc_dmq_send_contact(ptr, aor, DMQ_UPDATE, 0);
-										break;
-				case UL_CONTACT_UPDATE:
-											usrloc_dmq_send_contact(ptr, aor, DMQ_UPDATE, 0);
-										break;
-				case UL_CONTACT_DELETE:
-											usrloc_dmq_send_contact(ptr, aor, DMQ_RM, 0);
-										break;
-				case UL_CONTACT_EXPIRE:
-											//usrloc_dmq_send_contact(ptr, aor, DMQ_UPDATE);
-											LM_DBG("Contact <%.*s> expired\n", aor.len, aor.s);
-										break;
-			}
-		} else {
-			LM_DBG("Contact received from DMQ... skip\n");
+	LM_DBG("Callback from usrloc with type=%d\n", type);
+	aor.s = ptr->aor->s;
+	aor.len = ptr->aor->len;
+
+	if (!(ptr->flags & FL_RPL)) {
+
+		switch(type){
+			case UL_CONTACT_INSERT:
+				usrloc_dmq_send_contact(ptr, aor, DMQ_UPDATE, 0);
+				break;
+			case UL_CONTACT_UPDATE:
+				usrloc_dmq_send_contact(ptr, aor, DMQ_UPDATE, 0);
+				break;
+			case UL_CONTACT_DELETE:
+				usrloc_dmq_send_contact(ptr, aor, DMQ_RM, 0);
+				break;
+			case UL_CONTACT_EXPIRE:
+				//usrloc_dmq_send_contact(ptr, aor, DMQ_UPDATE);
+				LM_DBG("Contact <%.*s> expired\n", aor.len, aor.s);
+				break;
 		}
 		}
+	} else {
+		LM_DBG("Contact received from DMQ... skip\n");
+	}
 }
 }