Mercurial > hg > freeDiameter

comparison libfdproto/messages.c @ 1095:647c7e7015af

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Ported the fd_msg_dump_full function to the new mechanism
author Sebastien Decugis <sdecugis@freediameter.net>
date Mon, 06 May 2013 17:57:05 +0800
parents 44f3e48dfe27
children 97a257c80de0
comparison
equal deleted inserted replaced
1094:eab8cad30b4c 1095:647c7e7015af
720 /***************************************************************************************************************/ 720 /***************************************************************************************************************/
721 /* Debug functions: dumping */ 721 /* Debug functions: dumping */
722 722
723 /* messages and AVP formatters */ 723 /* messages and AVP formatters */
724 typedef DECLARE_FD_DUMP_PROTOTYPE( (*msg_dump_formatter_msg), struct msg * msg ); 724 typedef DECLARE_FD_DUMP_PROTOTYPE( (*msg_dump_formatter_msg), struct msg * msg );
725 typedef DECLARE_FD_DUMP_PROTOTYPE( (*msg_dump_formatter_avp), struct avp * avp, int level ); 725 typedef DECLARE_FD_DUMP_PROTOTYPE( (*msg_dump_formatter_avp), struct avp * avp, int level, int first, int last );
726 726
727 /* Core function to process the dumping */ 727 /* Core function to process the dumping */
728 static DECLARE_FD_DUMP_PROTOTYPE( msg_dump_process, msg_dump_formatter_msg msg_format, msg_dump_formatter_avp avp_format, msg_or_avp *obj, struct dictionary *dict, int force_parsing, int recurse ) 728 static DECLARE_FD_DUMP_PROTOTYPE( msg_dump_process, msg_dump_formatter_msg msg_format, msg_dump_formatter_avp avp_format, msg_or_avp *obj, struct dictionary *dict, int force_parsing, int recurse )
729 { 729 {
730 FD_DUMP_HANDLE_OFFSET(); 730 FD_DUMP_HANDLE_OFFSET();
733 (void) fd_msg_parse_dict(obj, dict, NULL); 733 (void) fd_msg_parse_dict(obj, dict, NULL);
734 } 734 }
735 735
736 switch (_C(obj)->type) { 736 switch (_C(obj)->type) {
737 case MSG_AVP: 737 case MSG_AVP:
738 CHECK_MALLOC_DO( (*avp_format)(FD_DUMP_STD_PARAMS, (struct avp *)obj, 0), return NULL); 738 CHECK_MALLOC_DO( (*avp_format)(FD_DUMP_STD_PARAMS, (struct avp *)obj, 0, 1, 1), return NULL);
739 break; 739 break;
740 740
741 case MSG_MSG: 741 case MSG_MSG:
742 CHECK_MALLOC_DO( (*msg_format)(FD_DUMP_STD_PARAMS, (struct msg *)obj), return NULL); 742 CHECK_MALLOC_DO( (*msg_format)(FD_DUMP_STD_PARAMS, (struct msg *)obj), return NULL);
743 break; 743 break;
746 ASSERT(0); 746 ASSERT(0);
747 } 747 }
748 748
749 if (recurse) { 749 if (recurse) {
750 struct avp * avp = NULL; 750 struct avp * avp = NULL;
751 int first = 1;
751 CHECK_FCT_DO( fd_msg_browse ( obj, MSG_BRW_FIRST_CHILD, &avp, NULL ), avp = NULL ); 752 CHECK_FCT_DO( fd_msg_browse ( obj, MSG_BRW_FIRST_CHILD, &avp, NULL ), avp = NULL );
752 while (avp) { 753 while (avp) {
753 CHECK_MALLOC_DO( (*avp_format)(FD_DUMP_STD_PARAMS, avp, 1), return NULL); 754 struct avp * nextavp = NULL;
754 CHECK_FCT_DO( fd_msg_browse ( avp, MSG_BRW_NEXT, &avp, NULL ), avp = NULL ); 755 CHECK_FCT_DO( fd_msg_browse ( avp, MSG_BRW_NEXT, &nextavp, NULL ), nextavp = NULL );
756 CHECK_MALLOC_DO( (*avp_format)(FD_DUMP_STD_PARAMS, avp, 1, first, nextavp ? 0 : 1), return NULL);
757 avp = nextavp;
758 first = 0;
755 }; 759 };
756 } 760 }
757
758 /* we remove the final \n if any */
759 FD_DUMP_HANDLE_TRAIL();
760 761
761 return *buf; 762 return *buf;
762 } 763 }
763 764
764 /* 765 /*
765 * Tree View message dump 766 * Tree View message dump
766 */ 767 */
767
768 static DECLARE_FD_DUMP_PROTOTYPE( msg_format_treeview, struct msg * msg ) 768 static DECLARE_FD_DUMP_PROTOTYPE( msg_format_treeview, struct msg * msg )
769 { 769 {
770 if (!CHECK_MSG(msg)) { 770 if (!CHECK_MSG(msg)) {
771 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "{message}(@%p): INVALID\n", msg), return NULL); 771 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "{message}(@%p): INVALID", msg), return NULL);
772 return *buf; 772 return *buf;
773 } 773 }
774 774
775 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "{message}(@%p): ", msg), return NULL); 775 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "{message}(@%p): ", msg), return NULL);
776 if (!msg->msg_model) { 776 if (!msg->msg_model) {
796 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, " Flags: 0x%02hhX (" DUMP_CMDFL_str ")\n", msg->msg_public.msg_flags, DUMP_CMDFL_val(msg->msg_public.msg_flags)), return NULL); 796 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, " Flags: 0x%02hhX (" DUMP_CMDFL_str ")\n", msg->msg_public.msg_flags, DUMP_CMDFL_val(msg->msg_public.msg_flags)), return NULL);
797 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, " Command Code: %u\n", msg->msg_public.msg_code), return NULL); 797 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, " Command Code: %u\n", msg->msg_public.msg_code), return NULL);
798 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, " ApplicationId: %d\n", msg->msg_public.msg_appl), return NULL); 798 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, " ApplicationId: %d\n", msg->msg_public.msg_appl), return NULL);
799 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, " Hop-by-Hop Identifier: 0x%8X\n", msg->msg_public.msg_hbhid), return NULL); 799 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, " Hop-by-Hop Identifier: 0x%8X\n", msg->msg_public.msg_hbhid), return NULL);
800 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, " End-to-End Identifier: 0x%8X\n", msg->msg_public.msg_eteid), return NULL); 800 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, " End-to-End Identifier: 0x%8X\n", msg->msg_public.msg_eteid), return NULL);
801 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, " {debug data}: src:%s(%zd) rwb:%p rt:%d cb:%p,%p(%p) qry:%p asso:%d sess:%p\n", msg->msg_src_id?:"(nil)", msg->msg_src_id_len, msg->msg_rawbuffer, msg->msg_routable, msg->msg_cb.anscb, msg->msg_cb.expirecb, msg->msg_cb.data, msg->msg_query, msg->msg_associated, msg->msg_sess), return NULL); 801 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, " {debug data}: src:%s(%zd) rwb:%p rt:%d cb:%p,%p(%p) qry:%p asso:%d sess:%p", msg->msg_src_id?:"(nil)", msg->msg_src_id_len, msg->msg_rawbuffer, msg->msg_routable, msg->msg_cb.anscb, msg->msg_cb.expirecb, msg->msg_cb.data, msg->msg_query, msg->msg_associated, msg->msg_sess), return NULL);
802 802
803 return *buf; 803 return *buf;
804 } 804 }
805 805
806 static DECLARE_FD_DUMP_PROTOTYPE( avp_format_treeview, struct avp * avp, int level ) 806 static DECLARE_FD_DUMP_PROTOTYPE( avp_format_treeview, struct avp * avp, int level, int first, int last )
807 { 807 {
808 char * name; 808 char * name;
809 struct dict_avp_data dictdata; 809 struct dict_avp_data dictdata;
810 struct dict_avp_data *dictinfo = NULL; 810 struct dict_avp_data *dictinfo = NULL;
811 struct dict_vendor_data vendordata; 811 struct dict_vendor_data vendordata;
812 struct dict_vendor_data *vendorinfo = NULL; 812 struct dict_vendor_data *vendorinfo = NULL;
813
814 if (level) {
815 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "\n"), return NULL);
816 }
817
813 if (!CHECK_AVP(avp)) { 818 if (!CHECK_AVP(avp)) {
814 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "{avp}(@%p): INVALID\n", avp), return NULL); 819 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "{avp}(@%p): INVALID", avp), return NULL);
815 return *buf; 820 return *buf;
816 } 821 }
817 822
818 if (!level) { 823 if (!level) {
819 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "{avp}(@%p): ", avp), return NULL); 824 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "{avp}(@%p): ", avp), return NULL);
863 } 868 }
864 869
865 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, " l=%d f=" DUMP_AVPFL_str " val=", avp->avp_public.avp_len, DUMP_AVPFL_val(avp->avp_public.avp_flags)), return NULL); 870 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, " l=%d f=" DUMP_AVPFL_str " val=", avp->avp_public.avp_len, DUMP_AVPFL_val(avp->avp_public.avp_flags)), return NULL);
866 871
867 if (dictinfo && (dictinfo->avp_basetype == AVP_TYPE_GROUPED)) { 872 if (dictinfo && (dictinfo->avp_basetype == AVP_TYPE_GROUPED)) {
868 struct avp * inavp = NULL; 873 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "(grouped)"), return NULL);
869 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "(grouped)\n"), return NULL); 874 if (level) {
870 CHECK_FCT_DO( fd_msg_browse ( avp, MSG_BRW_FIRST_CHILD, &inavp, NULL ), inavp = NULL ); 875 struct avp * inavp = NULL;
871 while (inavp) { 876 int first = 1;
872 CHECK_MALLOC_DO( avp_format_treeview(FD_DUMP_STD_PARAMS, inavp, level + 1), return NULL); 877 CHECK_FCT_DO( fd_msg_browse ( avp, MSG_BRW_FIRST_CHILD, &inavp, NULL ), inavp = NULL );
873 CHECK_FCT_DO( fd_msg_browse ( inavp, MSG_BRW_NEXT, &inavp, NULL ), inavp = NULL ); 878 while (inavp) {
874 }; 879 struct avp * nextavp = NULL;
880 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "\n"), return NULL);
881 CHECK_FCT_DO( fd_msg_browse ( inavp, MSG_BRW_NEXT, &nextavp, NULL ), inavp = NULL );
882 CHECK_MALLOC_DO( avp_format_treeview(FD_DUMP_STD_PARAMS, inavp, level + 1, first, nextavp ? 0 : 1), return NULL);
883 inavp = nextavp;
884 first = 0;
885 };
886 }
875 } else { 887 } else {
876 if (avp->avp_public.avp_value) { 888 if (avp->avp_public.avp_value) {
877 CHECK_MALLOC_DO( fd_dict_dump_avp_value(FD_DUMP_STD_PARAMS, avp->avp_public.avp_value, avp->avp_model, 0, 0), return NULL); 889 CHECK_MALLOC_DO( fd_dict_dump_avp_value(FD_DUMP_STD_PARAMS, avp->avp_public.avp_value, avp->avp_model, 0, 0), return NULL);
878 } else if (avp->avp_rawdata) { 890 } else if (avp->avp_rawdata) {
879 CHECK_MALLOC_DO( fd_dump_extend_hexdump(FD_DUMP_STD_PARAMS, avp->avp_rawdata, avp->avp_rawlen, 0, 0), return NULL); 891 CHECK_MALLOC_DO( fd_dump_extend_hexdump(FD_DUMP_STD_PARAMS, avp->avp_rawdata, avp->avp_rawlen, 0, 0), return NULL);
880 } else { 892 } else {
881 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "(not set)"), return NULL); 893 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "(not set)"), return NULL);
882 } 894 }
883 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "\n"), return NULL);
884 } 895 }
885 896
886 return *buf; 897 return *buf;
887 } 898 }
888 899
891 { 902 {
892 return msg_dump_process(FD_DUMP_STD_PARAMS, msg_format_treeview, avp_format_treeview, obj, dict, force_parsing, recurse); 903 return msg_dump_process(FD_DUMP_STD_PARAMS, msg_format_treeview, avp_format_treeview, obj, dict, force_parsing, recurse);
893 } 904 }
894 905
895 906
896 #warning "todo" 907 /*
908 * One-line dumper for compact but complete traces
909 */
910 static DECLARE_FD_DUMP_PROTOTYPE( msg_format_full, struct msg * msg )
911 {
912 int success = 0;
913 struct dict_cmd_data dictdata;
914
915 if (!CHECK_MSG(msg)) {
916 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "INVALID MESSAGE", msg), return NULL);
917 return *buf;
918 }
919
920 if (!msg->msg_model) {
921 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "(no model) "), return NULL);
922 } else {
923 enum dict_object_type dicttype=0;
924 if (fd_dict_gettype(msg->msg_model, &dicttype) || (dicttype != DICT_COMMAND)) {
925 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "(invalid model %d) ", dicttype), return NULL);
926 } else if (fd_dict_getval(msg->msg_model, &dictdata)) {
927 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "(error getting model data) "), return NULL);
928 } else {
929 success = 1;
930 }
931 }
932 if (msg->msg_public.msg_appl) {
933 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS,
934 "%s(%u/%u)[" DUMP_CMDFL_str "], Length=%u, Hop-By-Hop-Id=0x%08x, End-to-End=0x%08x",
935 success ? dictdata.cmd_name : "unknown", msg->msg_public.msg_appl, msg->msg_public.msg_code, DUMP_CMDFL_val(msg->msg_public.msg_flags),
936 msg->msg_public.msg_length, msg->msg_public.msg_hbhid, msg->msg_public.msg_eteid), return NULL);
937 } else {
938 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS,
939 "%s(%u)[" DUMP_CMDFL_str "], Length=%u, Hop-By-Hop-Id=0x%08x, End-to-End=0x%08x",
940 success ? dictdata.cmd_name : "unknown", msg->msg_public.msg_code, DUMP_CMDFL_val(msg->msg_public.msg_flags),
941 msg->msg_public.msg_length, msg->msg_public.msg_hbhid, msg->msg_public.msg_eteid), return NULL);
942 }
943 return *buf;
944 }
945
946 static DECLARE_FD_DUMP_PROTOTYPE( avp_format_full, struct avp * avp, int level, int first, int last )
947 {
948 int success = 0;
949 struct dict_avp_data dictdata;
950 struct dict_vendor_data vendordata;
951 struct dict_vendor_data *vendorinfo = NULL;
952
953
954 if (level) {
955 if ((first) && ((*buf)[*offset - 1] == '=')) {
956 /* We are first AVP of a grouped AVP */
957 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "{ "), return NULL);
958 } else {
959 /* We follow another AVP, or a message header */
960 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, ", { "), return NULL);
961 }
962 }
963
964 if (!CHECK_AVP(avp)) {
965 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "INVALID AVP"), return NULL);
966 goto end;
967 }
968
969
970 if (avp->avp_model) {
971 enum dict_object_type dicttype;
972 if (fd_dict_gettype(avp->avp_model, &dicttype) || (dicttype != DICT_AVP)) {
973 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "(invalid model: %d) ", dicttype), return NULL);
974 } else if (fd_dict_getval(avp->avp_model, &dictdata)) {
975 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "(error getting model data) "), return NULL);
976 } else {
977 success = 1;
978 }
979 }
980
981 if (avp->avp_public.avp_flags & AVP_FLAG_VENDOR) {
982 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "%s(%u/%u)[" DUMP_AVPFL_str "]=",
983 success ? dictdata.avp_name : "unknown", avp->avp_public.avp_vendor, avp->avp_public.avp_code, DUMP_AVPFL_val(avp->avp_public.avp_flags)), return NULL);
984 } else {
985 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "%s(%u)[" DUMP_AVPFL_str "]=",
986 success ? dictdata.avp_name : "unknown", avp->avp_public.avp_code, DUMP_AVPFL_val(avp->avp_public.avp_flags)), return NULL);
987 }
988
989
990 if (success && (dictdata.avp_basetype == AVP_TYPE_GROUPED)) {
991 if (level) {
992 struct avp * inavp = NULL;
993 int first = 1;
994 CHECK_FCT_DO( fd_msg_browse ( avp, MSG_BRW_FIRST_CHILD, &inavp, NULL ), inavp = NULL );
995 while (inavp) {
996 struct avp * nextavp = NULL;
997 CHECK_FCT_DO( fd_msg_browse ( inavp, MSG_BRW_NEXT, &nextavp, NULL ), inavp = NULL );
998 CHECK_MALLOC_DO( avp_format_full(FD_DUMP_STD_PARAMS, inavp, level + 1, first, nextavp ? 0 : 1), return NULL);
999 inavp = nextavp;
1000 first = 0;
1001 };
1002 }
1003 } else {
1004 if (avp->avp_public.avp_value) {
1005 CHECK_MALLOC_DO( fd_dict_dump_avp_value(FD_DUMP_STD_PARAMS, avp->avp_public.avp_value, avp->avp_model, 0, 0), return NULL);
1006 } else if (avp->avp_rawdata) {
1007 CHECK_MALLOC_DO( fd_dump_extend_hexdump(FD_DUMP_STD_PARAMS, avp->avp_rawdata, avp->avp_rawlen, 0, 0), return NULL);
1008 } else {
1009 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "(not set)"), return NULL);
1010 }
1011 }
1012
1013 end:
1014 if (level) {
1015 CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, " }"), return NULL);
1016 }
1017
1018 return *buf;
1019 }
897 /* one-line dump with all the contents of the message */ 1020 /* one-line dump with all the contents of the message */
898 DECLARE_FD_DUMP_PROTOTYPE( fd_msg_dump_full, msg_or_avp *obj, struct dictionary *dict, int force_parsing, int recurse ) 1021 DECLARE_FD_DUMP_PROTOTYPE( fd_msg_dump_full, msg_or_avp *obj, struct dictionary *dict, int force_parsing, int recurse )
899 { 1022 {
900 return NULL; 1023 return msg_dump_process(FD_DUMP_STD_PARAMS, msg_format_full, avp_format_full, obj, dict, force_parsing, recurse);
901 } 1024 }
1025
1026 #warning "todo"
902 1027
903 /* This one only prints a short display, does not go into the complete tree */ 1028 /* This one only prints a short display, does not go into the complete tree */
904 DECLARE_FD_DUMP_PROTOTYPE( fd_msg_dump_summary, msg_or_avp *obj, struct dictionary *dict, int force_parsing, int recurse ) 1029 DECLARE_FD_DUMP_PROTOTYPE( fd_msg_dump_summary, msg_or_avp *obj, struct dictionary *dict, int force_parsing, int recurse )
905 { 1030 {
906 return NULL; 1031 return NULL;
"Welcome to our mercurial repository"