Fixed dependencies to build correctly with erlang >= 18.0.

3 files changed, 115 insertions, 8 deletions

diff --git a/README.md b/README.md
index 1c5a36b..a527712 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ SS7 MAP (pen-)testing toolkit
 
 You will need:
 
- * Erlang. Get it from your repo or from http://www.erlang.org. Currently only building with Erlang <= 17.5 due to a bug in the Erlang ASN.1 compiler.
+ * Erlang. Get it from your repo or from http://www.erlang.org. ~~Currently only building with Erlang <= 17.5 due to a bug in the Erlang ASN.1 compiler.~~ Fixed.
 
  * Rebar. Get it from your repo or from https://github.com/rebar/rebar
 
diff --git a/patches/osmo_map.patch b/patches/osmo_map.patch
index 255914b..bfab9d4 100644
--- a/patches/osmo_map.patch
+++ b/patches/osmo_map.patch
@@ -1,3 +1,106 @@
+diff --git a/asn1/MAP-Contracts.asn b/asn1/MAP-Contracts.asn
+index df7e340..fdd53bd 100644
+--- a/asn1/MAP-Contracts.asn
++++ b/asn1/MAP-Contracts.asn
+@@ -36,79 +36,79 @@ FROM
+ ;
+ 
+ locationUpdatingContract-v3  CONTRACT ::= {
+-       OPERATIONS OF locationUpdatingPackage-v3
++       OPERATIONS OF {locationUpdatingPackage-v3}
+ }
+ 
+ locationCancellationContract-v3  CONTRACT ::= {
+-       OPERATIONS OF locationCancellationPackage-v3
++       OPERATIONS OF {locationCancellationPackage-v3}
+ }
+ 
+ roamingNumberEnquiryContract-v3  CONTRACT ::= {
+-       OPERATIONS OF roamingNumberEnquiryPackage-v3
++       OPERATIONS OF {roamingNumberEnquiryPackage-v3}
+ }
+ 
+ infoRetrievalContract-v3  CONTRACT ::= {
+-       OPERATIONS OF infoRetrievalPackage-v3
++       OPERATIONS OF {infoRetrievalPackage-v3}
+ }
+ 
+ infoRetrievalContract-v2  CONTRACT ::= {
+-       OPERATIONS OF infoRetrievalPackage-v2
++       OPERATIONS OF {infoRetrievalPackage-v2}
+ }
+ 
+ interVlrInfoRetrievalContract-v3  CONTRACT ::= {
+-       OPERATIONS OF interVlrInfoRetrievalPackage-v3
++       OPERATIONS OF {interVlrInfoRetrievalPackage-v3}
+ }
+ 
+ interVlrInfoRetrievalContract-v2  CONTRACT ::= {
+-       OPERATIONS OF interVlrInfoRetrievalPackage-v2
++       OPERATIONS OF {interVlrInfoRetrievalPackage-v2}
+ }
+ 
+ imsiRetrievalContract-v2  CONTRACT ::= {
+-       OPERATIONS OF imsiRetrievalPackage-v2
++       OPERATIONS OF {imsiRetrievalPackage-v2}
+ }
+ 
+ callControlTransferContract-v4  CONTRACT ::= {
+-       OPERATIONS OF callControlTransferPackage-v4
++       OPERATIONS OF {callControlTransferPackage-v4}
+ }
+ 
+ interrogationContract-v3  CONTRACT ::= {
+-       OPERATIONS OF interrogationPackage-v3
++       OPERATIONS OF {interrogationPackage-v3}
+ }
+ 
+ handoverControlContract-v3  CONTRACT ::= {
+-       OPERATIONS OF handoverControlPackage-v3
++       OPERATIONS OF {handoverControlPackage-v3}
+ }
+ 
+ subscriberDataMngtStandAloneContract-v3  CONTRACT ::= {
+-       OPERATIONS OF subscriberDataMngtStandAlonePackage-v3
++       OPERATIONS OF {subscriberDataMngtStandAlonePackage-v3}
+ }
+ 
+ equipmentMngtContract-v3  CONTRACT ::= {
+-       OPERATIONS OF equipmentMngtPackage-v3
++       OPERATIONS OF {equipmentMngtPackage-v3}
+ }
+ 
+ subscriberDataMngtContract-v3  CONTRACT ::= {
+-       OPERATIONS OF subscriberDataMngtPackage-v3
++       OPERATIONS OF {subscriberDataMngtPackage-v3}
+ }
+ 
+ resetContract-v2  CONTRACT ::= {
+-       OPERATIONS OF resetPackage-v2
++       OPERATIONS OF {resetPackage-v2}
+ }
+ 
+ tracingStandAloneContract-v3  CONTRACT ::= {
+-       OPERATIONS OF tracingStandAlonePackage-v3
++       OPERATIONS OF {tracingStandAlonePackage-v3}
+ }
+ 
+ functionalSsContract-v2  CONTRACT ::= {
+-       OPERATIONS OF functionalSsPackage-v2
++       OPERATIONS OF {functionalSsPackage-v2}
+ }
+ 
+ tracingContract-v3  CONTRACT ::= {
+-       OPERATIONS OF tracingPackage-v3
++       OPERATIONS OF {tracingPackage-v3}
+ }
+ 
+ unstructuredSsContract-v2  CONTRACT ::= {
+-       OPERATIONS OF unstructuredSsPackage-v2
++       OPERATIONS OF {unstructuredSsPackage-v2}
+ }
+ 
+ -- FIXME: missing packages / contracts
 diff --git a/ebin/osmo_map.app b/ebin/osmo_map.app
 index 6502f41..6919668 100644
 --- a/ebin/osmo_map.app
diff --git a/patches/osmo_ss7.patch b/patches/osmo_ss7.patch
index d71e653..40d3653 100644
--- a/patches/osmo_ss7.patch
+++ b/patches/osmo_ss7.patch
@@ -1,13 +1,17 @@
 diff --git a/include/osmo_ss7.hrl b/include/osmo_ss7.hrl
-index 80dcb3e..8ccdf42 100644
+index 80dcb3e..5f8c970 100644
 --- a/include/osmo_ss7.hrl
 +++ b/include/osmo_ss7.hrl
-@@ -14,7 +14,10 @@
- 	sls		:: non_neg_integer(),
- 	local		:: record(sigtran_peer),
- 	remote		:: record(sigtran_peer),
--	role		:: role()
-+	role		:: role(),
+@@ -12,9 +12,12 @@
+        name            :: string(),
+        linkset_name    :: string(),
+        sls             :: non_neg_integer(),
+-       local           :: record(sigtran_peer),
+-       remote          :: record(sigtran_peer),
+-       role            :: role()
++       local           :: #sigtran_peer{},
++       remote          :: #sigtran_peer{},
++       role            :: role(),
 +    asp_id      :: integer(),
 +    route_ctx   :: integer(),
 +    net_app     :: integer()