Permalink
Browse files

Set name/prefix at compilation, not in dictionaries

To avoid inappropriate defaults if the dictionaries are reused.
  • Loading branch information...
Anders Svensson
Anders Svensson committed Dec 16, 2011
1 parent a1fe4bf commit d486873f661e8e22b355c9f12edb726a6832d84d
@@ -444,19 +444,31 @@ standards(Config) ->
[D || D <- ?STANDARDS, _ <- [standards(?S(D), Data)]].
standards(Dict, Dir) ->
+ {Name, Pre} = make_name(Dict),
ok = diameter_make:codec(filename:join([Dir, Dict ++ ".dia"]),
- [{name, Dict} | opts(Dict)]),
- {ok, _, _} = compile:file(Dict ++ ".erl", [return]).
+ [{name, Name},
+ {prefix, Pre},
+ inherits("rfc3588_base")
+ | opts(Dict)]),
+ {ok, _, _} = compile:file(Name ++ ".erl", [return]).
opts(M)
when M == "rfc4006_cc";
M == "rfc4072_eap" ->
- [{inherits, "diameter_gen_nas_rfc4005/rfc4005_nas"}];
+ [inherits("rfc4005_nas")];
opts("rfc4740_sip") ->
- [{inherits, "diameter_gen_digest_rfc4590/rfc4590_digest"}];
+ [inherits("rfc4590_digest")];
opts(_) ->
[].
+inherits(File) ->
+ {Name, _} = make_name(File),
+ {inherits, File ++ "/" ++ Name}.
+
+make_name(File) ->
+ {R, [$_|N]} = lists:splitwith(fun(C) -> C /= $_ end, File),
+ {string:join(["diameter_gen", N, R], "_"), "diameter_" ++ N}.
+
%% ===========================================================================
modify(Bin, Mods) ->
@@ -29,10 +29,8 @@
;;
@id 2
-@name diameter_gen_mip_rfc4004
-@prefix diameter_mip
-@inherits diameter_gen_base_rfc3588
+@inherits rfc3588_base
;; ===========================================================================
@@ -36,10 +36,8 @@
;;
@id 1
-@name diameter_gen_nas_rfc4005
-@prefix diameter_nas
-@inherits diameter_gen_base_rfc3588
+@inherits rfc3588_base
;; ===========================================================================
@@ -22,12 +22,9 @@
;;
@id 4
-@name diameter_gen_cc_rfc4006
-@prefix diameter_cc
-@inherits diameter_gen_base_rfc3588
-
-@inherits diameter_gen_nas_rfc4005 Filter-Id
+@inherits rfc3588_base
+@inherits rfc4005_nas Filter-Id
;; ===========================================================================
@@ -29,11 +29,9 @@
;;
@id 5
-@name diameter_gen_eap_rfc4072
-@prefix diameter_eap
-@inherits diameter_gen_base_rfc3588
-@inherits diameter_gen_nas_rfc4005
+@inherits rfc3588_base
+@inherits rfc4005_nas
;; ===========================================================================
@@ -21,8 +21,6 @@
;; RFC 4590, RADIUS Extension for Digest Authentication
;;
-@name diameter_gen_digest_rfc4590
-
@avp_types
Digest-Response 103 OctetString -
@@ -22,11 +22,9 @@
;;
@id 6
-@name diameter_gen_sip_rfc4740
-@prefix diameter_sip
-@inherits diameter_gen_base_rfc3588
-@inherits diameter_gen_digest_rfc4590
+@inherits rfc3588_base
+@inherits rfc4590_digest
;; ===========================================================================

0 comments on commit d486873

Please sign in to comment.