瀏覽代碼

carrierroute: proper str pointer when adding fields to rpc structure

Daniel-Constantin Mierla 8 年之前
父節點
當前提交
a05f582420
共有 1 個文件被更改,包括 5 次插入3 次删除
  1. 5 3
      src/modules/carrierroute/cr_fifo.c

+ 5 - 3
src/modules/carrierroute/cr_fifo.c

@@ -1185,11 +1185,13 @@ void cr_rpc_dump_routes(rpc_t* rpc, void* ctx)
 				goto error;
 				goto error;
 			}
 			}
 			tmp_str = (rd->carriers[i] ? rd->carriers[i]->name : &empty_str);
 			tmp_str = (rd->carriers[i] ? rd->carriers[i]->name : &empty_str);
-			if(rpc->struct_add(dh, "Sd[", "carrier", &tmp_str,
+			if(rpc->struct_add(dh, "Sd[", "carrier", tmp_str,
 						"id", (rd->carriers[i] ? rd->carriers[i]->id : 0),
 						"id", (rd->carriers[i] ? rd->carriers[i]->id : 0),
 						"domains",  &eh)<0)
 						"domains",  &eh)<0)
 			{
 			{
-				LM_ERR("add carrier structure failure at count %d\n", i);
+				LM_ERR("add carrier structure failure at count %d"
+						" (carrier: %d/%.*s)\n",
+						i, tmp_str->len, tmp_str->len, tmp_str->s);
 				rpc->fault(ctx, 500, "Internal error - carrier structure");
 				rpc->fault(ctx, 500, "Internal error - carrier structure");
 				goto error;
 				goto error;
 			}
 			}
@@ -1202,7 +1204,7 @@ void cr_rpc_dump_routes(rpc_t* rpc, void* ctx)
 						goto error;
 						goto error;
 					}
 					}
 					tmp_str = (rd->carriers[i]->domains[j] ? rd->carriers[i]->domains[j]->name : &empty_str);
 					tmp_str = (rd->carriers[i]->domains[j] ? rd->carriers[i]->domains[j]->name : &empty_str);
-					if(rpc->struct_add(fh, "Sd[", "domain", &tmp_str,
+					if(rpc->struct_add(fh, "Sd[", "domain", tmp_str,
 							"id", rd->carriers[i]->domains[j]->id,
 							"id", rd->carriers[i]->domains[j]->id,
 							"data",  &gh)<0)
 							"data",  &gh)<0)
 					{
 					{