aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <zecke@selfish.org>2013-04-02 16:59:35 +0200
committerHolger Hans Peter Freyther <zecke@selfish.org>2013-04-02 16:59:35 +0200
commit7ccefaa16e5f4106c723c0262c4d04d161494815 (patch)
tree99c04aaa4fa5942bdf7e06e4b8f955690180f3c9
parent247205d8030aa547da6285bf636b322a31927db5 (diff)
sccp: Do not use abbreviation for variable names
It can help users to understand what we are talking about. This request was expressed by noha.
-rw-r--r--sccp/SCCPAddress.st52
1 files changed, 36 insertions, 16 deletions
diff --git a/sccp/SCCPAddress.st b/sccp/SCCPAddress.st
index 993af1a..2f96179 100644
--- a/sccp/SCCPAddress.st
+++ b/sccp/SCCPAddress.st
@@ -17,7 +17,7 @@
"
Object subclass: SCCPAddress [
- | route_ssn ssn poi gti gti_ind |
+ | subSystemNumber globalTitle routedOnSsn poi gti_ind |
<category: 'OsmoNetwork-SCCP'>
<comment: 'I represent the SCCP Address including the
@@ -92,18 +92,28 @@ Object subclass: SCCPAddress [
]
routedOnSSN: aFlag [
+ <category: 'deprecated'>
+ self routedOnSubSystenNumber: aFlag
+ ]
+
+ routedOnSubSystenNumber: aFlag [
<category: 'ssn'>
- route_ssn := aFlag
+ routedOnSsn := aFlag
]
routedOnSSN [
<category: 'ssn'>
- ^ route_ssn ifNil: [false]
+ ^ routedOnSsn ifNil: [false]
]
gti [
+ <category: 'deprecated'>
+ ^ self globalTitle
+ ]
+
+ globalTitle [
<category: 'gti'>
- ^ gti
+ ^ globalTitle
]
gtiInd [
@@ -111,9 +121,9 @@ Object subclass: SCCPAddress [
^ gti_ind
]
- gti: aGti indicator: aGtiInd [
+ gti: aGlobalTitle indicator: aGtiInd [
<category: 'gti'>
- gti := aGti.
+ globalTitle := aGlobalTitle.
gti_ind := aGtiInd bitAnd: 16rF.
]
@@ -121,13 +131,13 @@ Object subclass: SCCPAddress [
<category: 'gti'>
^ gti_ind = 0
ifTrue: [nil]
- ifFalse: [SCCPGTI initWith: gti_ind data: gti].
+ ifFalse: [SCCPGTI initWith: gti_ind data: globalTitle].
]
- gtiFromAddr: aGti [
+ gtiFromAddr: aGlobalTitle [
<category: 'gti'>
- gti_ind := aGti class subType.
- gti := aGti asByteArray.
+ gti_ind := aGlobalTitle class subType.
+ globalTitle := aGlobalTitle asByteArray.
]
poi: aPoi [
@@ -140,14 +150,24 @@ Object subclass: SCCPAddress [
^ poi
]
- ssn: assn [
- <category: 'ssn'>
- ssn := assn
+ ssn: aSubSystemNumber [
+ <category: 'deprecated'>
+ "deprecated"
+ self subSystemNumber: aSubSystemNumber
+ ]
+
+ subSystemNumber: aSubSystemNumber [
+ subSystemNumber := aSubSystemNumber
]
ssn [
+ <category: 'deprecated'>
+ ^ self subSystemNumber
+ ]
+
+ subSystemNumber [
<category: 'accessing'>
- ^ ssn.
+ ^ subSystemNumber
]
asByteArray [
@@ -185,11 +205,11 @@ Object subclass: SCCPAddress [
].
"SSN"
- data add: ssn.
+ data add: subSystemNumber.
"GTI"
gti_ind ifNotNil: [
- gti do: [:each | data add: each ].
+ globalTitle do: [:each | data add: each ].
].
data addFirst: data size.