[prev in list] [next in list] [prev in thread] [next in thread]
List: sr-dev
Subject: [sr-dev] git:master:97de3d8a: sipjson: link root object to json structure
From: Daniel-Constantin Mierla <miconda () gmail ! com>
Date: 2018-08-29 10:09:59
Message-ID: E1fuxQF-0002cV-9j () www ! kamailio ! org
[Download RAW message or body]
Module: kamailio
Branch: master
Commit: 97de3d8aef8cf1e8475b42d3b81cf20d31f99f4d
URL: https://github.com/kamailio/kamailio/commit/97de3d8aef8cf1e8475b42d3b81cf20d31f99f4d
Author: Daniel-Constantin Mierla <miconda@gmail.com>
Committer: Daniel-Constantin Mierla <miconda@gmail.com>
Date: 2018-08-29T12:08:18+02:00
sipjson: link root object to json structure
---
Modified: src/modules/sipjson/sipjson_mod.c
---
Diff: https://github.com/kamailio/kamailio/commit/97de3d8aef8cf1e8475b42d3b81cf20d31f99f4d.diff
Patch: https://github.com/kamailio/kamailio/commit/97de3d8aef8cf1e8475b42d3b81cf20d31f99f4d.patch
---
diff --git a/src/modules/sipjson/sipjson_mod.c b/src/modules/sipjson/sipjson_mod.c
index f1dad02dfc..1dc82eb777 100644
--- a/src/modules/sipjson/sipjson_mod.c
+++ b/src/modules/sipjson/sipjson_mod.c
@@ -80,24 +80,19 @@ static int ki_sj_serialize_helper(sip_msg_t* msg, str* smode, pv_spec_t *pvs)
return -1;
}
+ LM_DBG("sip to json serialization...\n");
srjson_InitDoc(&jdoc, NULL);
if(sj_serialize_data(msg, &jdoc, smode)<0) {
+ LM_ERR("json serialization failure\n");
goto error;
}
- if(jdoc.buf.s != NULL) {
- jdoc.free_fn(jdoc.buf.s);
- jdoc.buf.s = NULL;
- jdoc.buf.len = 0;
- }
jdoc.buf.s = srjson_PrintUnformatted(&jdoc, jdoc.root);
- if(jdoc.buf.s!=NULL){
- jdoc.buf.len = strlen(jdoc.buf.s);
- }
memset(&val, 0, sizeof(pv_value_t));
if(jdoc.buf.s!=NULL) {
+ jdoc.buf.len = strlen(jdoc.buf.s);
val.flags = PV_VAL_STR;
val.rs = jdoc.buf;
@@ -115,6 +110,7 @@ static int ki_sj_serialize_helper(sip_msg_t* msg, str* smode, pv_spec_t *pvs)
}
}
srjson_DestroyDoc(&jdoc);
+ LM_DBG("sip to json serialization done...\n");
return 1;
@@ -225,6 +221,7 @@ static int sj_serialize_data(sip_msg_t* msg, srjson_doc_t *jdoc, str* smode)
LM_ERR("cannot create json root obj\n");
goto error;
}
+ jdoc->root = jr;
if(parse_headers(msg, HDR_EOH_F, 0) < 0) {
LM_ERR("failed to parse headers\n");
@@ -345,10 +342,10 @@ static int sj_serialize_data(sip_msg_t* msg, srjson_doc_t *jdoc, str* smode)
break;
}
}
-
return 1;
error:
+ LM_ERR("failed to build the json serialization document\n");
return -1;
}
_______________________________________________
Kamailio (SER) - Development Mailing List
sr-dev@lists.kamailio.org
https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic