freeDiameter: extensions/dbg_dict_dump_json/dbg_dict_dump

annotate extensions/dbg_dict_dump_json/dbg_dict_dump_json.cc @ 1457:da5e5b9c9623

dbg_dict_dump_json: fix ERROR warnings in log fd_dict_search(TYPE_OF_AVP) matches NULL when the AVP is not derived, so don't call fd_dict_getval() in that case. Fixes the ERROR logs from dbg_dict_dump_json.

author	Luke Mewburn <luke@mewburn.net>
date	Fri, 28 Feb 2020 11:05:24 +1100
parents	8627338e36ab
children

rev	line source
1452 159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	1 /**********************************************************************************************************
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	2 * Software License Agreement (BSD License) *
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	3 * Author: Thomas Klausner <tk@giga.or.at> *
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	4 * *
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	5 * Copyright (c) 2020 Thomas Klausner *
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	6 * All rights reserved. *
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	7 * *
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	8 * Written under contract by nfotex IT GmbH, http://nfotex.com/ *
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	9 * *
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	10 * Redistribution and use of this software in source and binary forms, with or without modification, are *
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	11 * permitted provided that the following conditions are met: *
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	12 * *
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	13 * * Redistributions of source code must retain the above *
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	14 * copyright notice, this list of conditions and the *
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	15 * following disclaimer. *
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	16 * *
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	17 * * Redistributions in binary form must reproduce the above *
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	18 * copyright notice, this list of conditions and the *
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	19 * following disclaimer in the documentation and/or other *
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	20 * materials provided with the distribution. *
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	21 * *
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	22 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED *
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	23 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A *
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	24 * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR *
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	25 * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT *
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	26 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS *
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	27 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR *
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	28 * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF *
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	29 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	30 **********************************************************************************************************/
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	31
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	32
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	33 /*
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	34 * Dump Diameter dictionary to JSON file.
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	35 */
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	36
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	37 #include <freeDiameter/extension.h>
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	38 #include "dictionary-internal.h"
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	39 #include <json/json.h>
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	40 #include <sys/stat.h>
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	41
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	42 #include <iomanip>
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	43 #include <sstream>
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	44
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	45
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	46 void
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	47 dump_vendor(dict_object self, struct dict_vendor_data data, struct dict_object *parent, int depth, Json::Value &main)
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	48 {
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	49 Json::Value vendor;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	50
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	51 vendor["Code"] = Json::Value(data->vendor_id);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	52 vendor["Name"] = Json::Value(data->vendor_name);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	53 main["Vendors"].append(vendor);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	54 }
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	55
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	56 void
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	57 dump_application(dict_object self, struct dict_application_data data, struct dict_object *parent, int depth, Json::Value &main)
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	58 {
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	59 Json::Value application;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	60
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	61 application["Code"] = Json::Value(data->application_id);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	62 application["Name"] = Json::Value(data->application_name);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	63 main["Applications"].append(application);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	64 }
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	65
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	66 void
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	67 dump_enumval(dict_object self, struct dict_enumval_data data, struct dict_object *parent, int depth, Json::Value &main)
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	68 {
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	69 enum dict_avp_basetype type;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	70 struct dict_type_data type_data;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	71 Json::Value enumval;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	72 bool is_printable;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	73
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	74 type = parent->data.type.type_base;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	75
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	76 /* Standard only allows Integer32 Enumerated values, but freeDiameter is more permissive */
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	77 switch (type) {
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	78 case AVP_TYPE_OCTETSTRING:
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	79 is_printable = true;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	80 for (size_t i = 0; i < data->enum_value.os.len; i++) {
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	81 if (isprint(data->enum_value.os.data[i]) == 0) {
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	82 is_printable = false;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	83 break;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	84 }
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	85 }
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	86 if (is_printable) {
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	87 std::string output((const char*)data->enum_value.os.data, (size_t)data->enum_value.os.len);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	88 enumval["Code"] = Json::Value(output);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	89 } else {
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	90 std::stringstream quoted_string;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	91 quoted_string << "<";
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	92 for (size_t i = 0; i < data->enum_value.os.len; i++) {
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	93 quoted_string << std::hex << std::setfill('0') << std::setw(2) << (int)data->enum_value.os.data[i];
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	94 }
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	95 quoted_string << ">";
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	96 enumval["Code"] = Json::Value(quoted_string.str());
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	97 }
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	98 break;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	99
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	100 case AVP_TYPE_INTEGER32:
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	101 enumval["Code"] = Json::Value(data->enum_value.i32);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	102 break;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	103
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	104 case AVP_TYPE_INTEGER64:
1456 8627338e36ab fix dbg_dict_dump_json build Luke Mewburn <luke@mewburn.net> parents: 1452 diff changeset	105 enumval["Code"] = Json::Value(static_cast<Json::Int64>(data->enum_value.i64));
1452 159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	106 break;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	107
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	108 case AVP_TYPE_UNSIGNED32:
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	109 enumval["Code"] = Json::Value(data->enum_value.u32);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	110 break;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	111
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	112 case AVP_TYPE_UNSIGNED64:
1456 8627338e36ab fix dbg_dict_dump_json build Luke Mewburn <luke@mewburn.net> parents: 1452 diff changeset	113 enumval["Code"] = Json::Value(static_cast<Json::UInt64>(data->enum_value.u64));
1452 159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	114 break;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	115
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	116 case AVP_TYPE_FLOAT32:
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	117 enumval["Code"] = Json::Value(data->enum_value.f32);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	118 break;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	119
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	120 case AVP_TYPE_FLOAT64:
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	121 enumval["Code"] = Json::Value(data->enum_value.f64);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	122 break;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	123
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	124 default:
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	125 printf("??? (ERROR unknown type %d)", type);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	126 break;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	127 }
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	128 if (fd_dict_getval(parent, &type_data) != 0) {
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	129 /* TODO: fd_dict_getval error */
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	130 return;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	131 }
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	132 if (!main.isMember("Types") \|\| !main["Types"].isMember(type_data.type_name)) {
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	133 /* TODO: missing type error */
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	134 return;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	135 }
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	136
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	137 enumval["Name"] = Json::Value(data->enum_name);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	138 main["Types"][type_data.type_name]["EnumValues"].append(enumval);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	139 }
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	140
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	141 void
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	142 dump_type(dict_object self, struct dict_type_data data, struct dict_object *parent, int depth, Json::Value &main)
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	143 {
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	144 Json::Value type;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	145
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	146 type["Name"] = Json::Value(data->type_name);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	147 type["Base"] = Json::Value(type_base_name[data->type_base]);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	148 main["Types"][data->type_name] = type;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	149 }
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	150
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	151 #define AVPFL_str "%s%s"
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	152 #define AVPFL_val(_val) (_val & AVP_FLAG_VENDOR)?"V":"" , (_val & AVP_FLAG_MANDATORY)?"M":""
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	153
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	154 void
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	155 dump_avp(dict_object self, struct dict_avp_data data, struct dict_object *parent, int depth, Json::Value &main)
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	156 {
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	157 struct dict_object *type = NULL;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	158 struct dict_type_data type_data;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	159 Json::Value avp;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	160 char flags[10];
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	161
1457 da5e5b9c9623 dbg_dict_dump_json: fix ERROR warnings in log Luke Mewburn <luke@mewburn.net> parents: 1456 diff changeset	162 if (fd_dict_search(fd_g_config->cnf_dict, DICT_TYPE, TYPE_OF_AVP, self, &type, 0) != 0) {
da5e5b9c9623 dbg_dict_dump_json: fix ERROR warnings in log Luke Mewburn <luke@mewburn.net> parents: 1456 diff changeset	163 /* TODO: fd_dict_search error */
da5e5b9c9623 dbg_dict_dump_json: fix ERROR warnings in log Luke Mewburn <luke@mewburn.net> parents: 1456 diff changeset	164 return;
da5e5b9c9623 dbg_dict_dump_json: fix ERROR warnings in log Luke Mewburn <luke@mewburn.net> parents: 1456 diff changeset	165 }
da5e5b9c9623 dbg_dict_dump_json: fix ERROR warnings in log Luke Mewburn <luke@mewburn.net> parents: 1456 diff changeset	166
da5e5b9c9623 dbg_dict_dump_json: fix ERROR warnings in log Luke Mewburn <luke@mewburn.net> parents: 1456 diff changeset	167 if ((type == NULL) \|\| (fd_dict_getval(type, &type_data) != 0)) {
1452 159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	168 avp["Type"] = Json::Value(type_base_name[data->avp_basetype]);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	169 } else {
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	170 if (strstr(type_data.type_name, "Enumerated") != 0) {
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	171 if (data->avp_basetype == AVP_TYPE_INTEGER32) {
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	172 avp["Type"] = "Enumerated";
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	173 } else {
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	174 /* freeDiameter allows enumerated types not based on integer32;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	175 * write those out with their basic type for dict_json */
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	176 avp["Type"] = Json::Value(type_base_name[data->avp_basetype]);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	177 }
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	178 } else {
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	179 avp["Type"] = Json::Value(type_data.type_name);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	180 }
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	181 if (main["Types"].isMember(type_data.type_name) && main["Types"][type_data.type_name].isMember("EnumValues")) {
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	182 avp["EnumValues"] = main["Types"][type_data.type_name]["EnumValues"];
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	183 }
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	184 }
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	185
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	186 avp["Code"] = Json::Value(data->avp_code);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	187 if (data->avp_vendor != 0) {
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	188 avp["Vendor"] = Json::Value(data->avp_vendor);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	189 }
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	190 avp["Name"] = Json::Value(data->avp_name);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	191 snprintf(flags, sizeof(flags), AVPFL_str, AVPFL_val(data->avp_flag_val));
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	192 avp["Flags"]["Must"] = Json::Value(flags);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	193 snprintf(flags, sizeof(flags), AVPFL_str, AVPFL_val(data->avp_flag_mask & ~data->avp_flag_val));
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	194 avp["Flags"]["MustNot"] = Json::Value(flags);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	195
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	196 main["AVPs"].append(avp);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	197 }
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	198
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	199 #define CMDFL_str "%s%s%s%s"
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	200 #define CMDFL_val(_val) (_val & CMD_FLAG_REQUEST)?"R":"" , (_val & CMD_FLAG_PROXIABLE)?"P":"" , (_val & CMD_FLAG_ERROR)?"E":"" , (_val & CMD_FLAG_RETRANSMIT)?"T":""
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	201
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	202 void
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	203 dump_command(dict_object self, struct dict_cmd_data data, struct dict_object *parent, int depth, Json::Value &main)
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	204 {
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	205 Json::Value command;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	206 char flags[10];
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	207
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	208 command["Code"] = Json::Value(data->cmd_code);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	209 command["Name"] = Json::Value(data->cmd_name);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	210 snprintf(flags, sizeof(flags), CMDFL_str, CMDFL_val(data->cmd_flag_val));
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	211 command["Flags"]["Must"] = Json::Value(flags);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	212 snprintf(flags, sizeof(flags), CMDFL_str, CMDFL_val(data->cmd_flag_mask & ~data->cmd_flag_val));
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	213 command["Flags"]["MustNot"] = Json::Value(flags);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	214 main["Commands"].append(command);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	215 }
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	216
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	217 bool dump_object(dict_object *self, int depth, Json::Value &main);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	218
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	219 void
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	220 dump_rule(dict_object self, struct dict_rule_data data, struct dict_object *parent, int depth, Json::Value &main)
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	221 {
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	222 Json::Value avp_rule;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	223 struct dict_avp_data avp_data;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	224 const char slot, entry, *parent_avp_name;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	225 vendor_id_t parent_avp_vendor;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	226 unsigned int i;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	227 bool found = false;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	228 enum dict_object_type parent_type;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	229
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	230 if (fd_dict_getval(data->rule_avp, &avp_data) != 0) {
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	231 /* TODO: fd_dict_getval error */
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	232 return;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	233 }
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	234
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	235 if (avp_data.avp_vendor != 0) {
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	236 avp_rule["Vendor"] = Json::Value(avp_data.avp_vendor);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	237 }
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	238 avp_rule["AVP"] = Json::Value(avp_data.avp_name);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	239 /* TODO is this correct? what does rule_order specify? */
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	240 if (data->rule_position == RULE_FIXED_HEAD) {
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	241 avp_rule["First"] = Json::Value(true);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	242 }
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	243 /* TODO: insert "unbounded" for -1? */
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	244 if (data->rule_min != -1) {
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	245 avp_rule["Min"] = Json::Value(data->rule_min);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	246 }
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	247 if (data->rule_max != -1) {
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	248 avp_rule["Max"] = Json::Value(data->rule_max);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	249 }
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	250
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	251 int ret = fd_dict_gettype(parent, &parent_type);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	252 if (ret != 0) {
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	253 /* TODO: fd_dict_gettype error */
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	254 return;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	255 }
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	256
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	257 if (parent_type == DICT_AVP) {
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	258 struct dict_avp_data parent_data;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	259
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	260 slot = "AVPRules";
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	261 entry = "AVP";
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	262 if (fd_dict_getval(parent, &parent_data) != 0) {
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	263 /* TODO: fd_dict_getval error */
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	264 return;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	265 }
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	266 parent_avp_name = parent_data.avp_name;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	267 parent_avp_vendor = parent_data.avp_vendor;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	268 } else if (parent_type == DICT_COMMAND) {
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	269 struct dict_cmd_data parent_data;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	270
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	271 slot = "CommandRules";
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	272 entry = "Command";
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	273 if (fd_dict_getval(parent, &parent_data) != 0) {
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	274 /* TODO: fd_dict_getval error */
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	275 return;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	276 }
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	277 parent_avp_name = parent_data.cmd_name;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	278 parent_avp_vendor = 0;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	279 } else {
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	280 /* TODO: error, unknown case */
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	281 return;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	282 }
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	283
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	284 for (i=0; i<main[slot].size(); i++) {
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	285 if (main[slot][i][entry] == parent_avp_name
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	286 && (parent_avp_vendor == 0 \|\| !main[slot][i].isMember("Vendor") \|\| parent_avp_vendor == main[slot][i]["Vendor"].asUInt())) {
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	287 found = true;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	288 main[slot][i]["Content"].append(avp_rule);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	289 break;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	290 }
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	291 }
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	292 if (!found) {
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	293 Json::Value parent_avp;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	294 parent_avp[entry] = parent_avp_name;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	295 if (parent_avp_vendor != 0) {
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	296 parent_avp["Vendor"] = Json::Value(parent_avp_vendor);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	297 }
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	298 parent_avp["Content"].append(avp_rule);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	299 main[slot].append(parent_avp);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	300 }
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	301
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	302 }
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	303
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	304 bool
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	305 dump_list(struct fd_list list, const char type, int depth, Json::Value &main) {
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	306 fd_list *li;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	307 for (li = list->next; li != list; li = li->next) {
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	308 if (!dump_object((dict_object *)li->o, depth, main)) {
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	309 LOG_E("error dumping %s", type);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	310 return false;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	311 }
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	312 }
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	313 return true;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	314 }
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	315
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	316 bool
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	317 dump_object(dict_object *self, int depth, Json::Value &main)
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	318 {
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	319 enum dict_object_type t;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	320 int ret = fd_dict_gettype (self, &t);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	321 if (ret != 0) {
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	322 return false;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	323 }
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	324
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	325 switch (t) {
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	326 #define DUMP_OBJECT_CASE(TYPE, STRUCT, DUMP_FUNCTION) \
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	327 case TYPE: { \
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	328 struct STRUCT * data = NULL; \
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	329 int i; \
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	330 data = (struct STRUCT *)malloc(sizeof(struct STRUCT)); \
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	331 if (!data) { \
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	332 /* TODO: malloc error */ \
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	333 return false; \
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	334 } \
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	335 ret = fd_dict_getval(self, data); \
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	336 if (ret != 0) { \
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	337 /* TODO: fd_dict_getval error */ \
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	338 free(data); \
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	339 return false; \
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	340 } \
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	341 DUMP_FUNCTION(self, data, self->parent, depth, main); \
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	342 if (depth > 0) { \
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	343 for (i=0; i<NB_LISTS_PER_OBJ; i++) { \
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	344 if ((self->list[i].o == NULL) && (self->list[i].next != &self->list[i])) { \
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	345 dump_list(&self->list[i], 0, depth-1, main); \
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	346 break; \
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	347 } \
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	348 } \
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	349 } \
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	350 } \
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	351 break;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	352
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	353 DUMP_OBJECT_CASE(DICT_VENDOR, dict_vendor_data, dump_vendor);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	354 DUMP_OBJECT_CASE(DICT_APPLICATION, dict_application_data, dump_application);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	355 DUMP_OBJECT_CASE(DICT_TYPE, dict_type_data, dump_type);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	356 DUMP_OBJECT_CASE(DICT_ENUMVAL, dict_enumval_data, dump_enumval);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	357 DUMP_OBJECT_CASE(DICT_AVP, dict_avp_data, dump_avp);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	358 DUMP_OBJECT_CASE(DICT_COMMAND, dict_cmd_data, dump_command);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	359 DUMP_OBJECT_CASE(DICT_RULE, dict_rule_data, dump_rule);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	360 default:
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	361 /* TODO: unhandled type error */
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	362 return false;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	363 }
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	364 return true;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	365 }
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	366
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	367 bool
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	368 dump_dictionary_to_json(dictionary *dict, Json::Value &main)
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	369 {
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	370 if (dict == NULL) {
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	371 return false;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	372 }
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	373
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	374 if (pthread_rwlock_rdlock(&dict->dict_lock) != 0) {
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	375 return false;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	376 }
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	377
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	378 dump_list(&(dict->dict_types), "types", 2, main);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	379 dump_object(&(dict->dict_vendors), 3, main);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	380 dump_list(&(dict->dict_vendors.list[0]), "vendors", 3, main);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	381 dump_object(&(dict->dict_applications), 1, main);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	382 dump_list(&(dict->dict_applications.list[0]), "applications", 1, main);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	383 dump_list(&(dict->dict_cmd_code), "commands", 1, main);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	384
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	385 if (pthread_rwlock_unlock( &dict->dict_lock) != 0) {
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	386 return false;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	387 }
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	388
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	389 return true;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	390 }
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	391
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	392
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	393 static int
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	394 dbg_dict_dump_json_entry(char * conffile)
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	395 {
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	396 TRACE_ENTRY("%p", conffile);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	397 Json::Value main;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	398 Json::Value types = Json::Value::null;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	399 Json::StyledWriter writer;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	400 FILE *out = stdout;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	401
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	402 if (conffile) {
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	403 if ((out=fopen(conffile, "w")) == NULL) {
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	404 LOG_E("cannot open output file '%s' for writing", conffile);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	405 return EINVAL;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	406 }
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	407 }
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	408
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	409 /* get main dictionary */
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	410 struct dictionary * dict = fd_g_config->cnf_dict;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	411 if (!dump_dictionary_to_json(dict, main)) {
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	412 LOG_E("error dumping dictionary to JSON");
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	413 return EINVAL;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	414 }
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	415 /* remove enumerated types before dumping, they are in AVPs */
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	416 /* convert remaining ones to array */
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	417 Json::Value::Members members = main["Types"].getMemberNames();
1456 8627338e36ab fix dbg_dict_dump_json build Luke Mewburn <luke@mewburn.net> parents: 1452 diff changeset	418 for (Json::Value::Members::const_iterator it = members.begin() ; it != members.end(); ++it) {
1452 159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	419 if (strncmp("Enumerated", main["Types"][*it]["Name"].asCString(), strlen("Enumerated")) == 0) {
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	420 main["Types"].removeMember(*it);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	421 } else {
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	422 types.append(main["Types"][*it]);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	423 }
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	424 }
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	425 main.removeMember("Types");
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	426 main["Types"] = types;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	427
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	428 std::string value_str = writer.write(main);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	429 fprintf(out, "%s\n", value_str.c_str());
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	430
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	431 if (conffile) {
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	432 fclose(out);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	433 }
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	434
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	435 LOG_N("Extension 'Dump dictionaries to JSON' initialized");
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	436 return 0;
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	437 }
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	438
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	439 extern "C" {
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	440 EXTENSION_ENTRY("dbg_dict_dump_json", dbg_dict_dump_json_entry);
159d80986d85 Add dbg_dict_dump_json extension. Thomas Klausner <tk@giga.or.at> parents: diff changeset	441 }

Mercurial > hg > freeDiameter

annotate extensions/dbg_dict_dump_json/dbg_dict_dump_json.cc @ 1457:da5e5b9c9623