Changeset 960:f39fa6cd86e0 in freeDiameter for contrib

Timestamp:

Mar 6, 2013, 6:52:35 AM (11 years ago)

Author:

Thomas Klausner <tk@giga.or.at>

Branch:

default

Phase:

public

Message:

Include vendor name in enumerated type name.

File:

• contrib/tools/org_to_fd.pl (modified) (3 diffs)

contrib/tools/org_to_fd.pl

@@ -3 +3 @@
 use Getopt::Std;
 
-our ($opt_v);
+our ($opt_V, $opt_v);
+
+# default to 3GPP
+my ($vendor) = 10415;
+my ($vendor_name) = "3GPP";
 
 sub convert_must_to_flags($) {
@@ -37 +41 @@
     } elsif ($type =~ m/Enumerated/) {
         print "\t\tstruct dict_object           *type;\n";
-        print "\t\tstruct dict_type_data         tdata = { AVP_TYPE_INTEGER32, \"Enumerated($name)\", NULL, NULL, NULL };\n";
+        print "\t\tstruct dict_type_data         tdata = { AVP_TYPE_INTEGER32, \"" . ($vendor_name ? "$vendor_name/" : "") ."Enumerated($name)\", NULL, NULL, NULL };\n";
         # XXX: add enumerated values
         print "\t\tCHECK_dict_new(DICT_TYPE, &tdata, NULL, &type);\n";
@@ -48 +52 @@
 }
 
-getopts("v:") || die("usage: org_to_fd.pl [-v vendor] [file ...]\n");
+sub usage($) {
+    die("usage: org_to_fd.pl [-V vendor_name -v vendor] [file ...]\n");
+    exit(@_);
+}
 
-# default to 3GPP
-my ($vendor) = 10415;
+getopts("V:v:") || usage(1);
+
 if (defined($opt_v)) {
     $vendor = $opt_v;
+    if (!defined($opt_V)) {
+        usage(1);
+    }
+    $vendor_name = $opt_V;
 }