Merge 1e40a99 into 64baf33

praekelt · Oct 15, 2014 · 62c9eb7 · 62c9eb7
2 parents 64baf33 + 1e40a99
commit 62c9eb7
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/smpp/pdu.py b/smpp/pdu.py
@@ -16,7 +16,9 @@
 mandatory_parameter_lists = {
     'bind_transmitter':[ # SMPP v3.4, section 4.1.1, table 4-1, page 46
         {'name':'system_id',               'min':1, 'max':16,  'var':True,              'type':'string',        'map':None},
-        {'name':'password',                'min':1, 'max':9,   'var':True,              'type':'string',        'map':None},
+        # The spec states max=9, but there are longer passwords in the wild.
+        # {'name':'password',                'min':1, 'max':9,   'var':True,              'type':'string',        'map':None},
+        {'name':'password',                'min':1, 'max':254,   'var':True,              'type':'string',        'map':None},
         {'name':'system_type',             'min':1, 'max':13,  'var':True,              'type':'string',        'map':None},
         {'name':'interface_version',       'min':1, 'max':1,   'var':False,             'type':'hex',           'map':None},
         {'name':'addr_ton',                'min':1, 'max':1,   'var':False,             'type':'integer',       'map':'addr_ton'},
@@ -28,7 +30,9 @@
     ],
     'bind_receiver':[ # SMPP v3.4, section 4.1.3, table 4-3, page 48
         {'name':'system_id',               'min':1, 'max':16,  'var':True,              'type':'string',        'map':None},
-        {'name':'password',                'min':1, 'max':9,   'var':True,              'type':'string',        'map':None},
+        # The spec states max=9, but there are longer passwords in the wild.
+        # {'name':'password',                'min':1, 'max':9,   'var':True,              'type':'string',        'map':None},
+        {'name':'password',                'min':1, 'max':254,   'var':True,              'type':'string',        'map':None},
         {'name':'system_type',             'min':1, 'max':13,  'var':True,              'type':'string',        'map':None},
         {'name':'interface_version',       'min':1, 'max':1,   'var':False,             'type':'hex',           'map':None},
         {'name':'addr_ton',                'min':1, 'max':1,   'var':False,             'type':'integer',       'map':'addr_ton'},
@@ -40,7 +44,9 @@
     ],
     'bind_transceiver':[ # SMPP v3.4, section 4.1.5, table 4-5, page 51
         {'name':'system_id',               'min':1, 'max':16,  'var':True,              'type':'string',        'map':None},
-        {'name':'password',                'min':1, 'max':9,   'var':True,              'type':'string',        'map':None},
+        # The spec states max=9, but there are longer passwords in the wild.
+        # {'name':'password',                'min':1, 'max':9,   'var':True,              'type':'string',        'map':None},
+        {'name':'password',                'min':1, 'max':254,   'var':True,              'type':'string',        'map':None},
         {'name':'system_type',             'min':1, 'max':13,  'var':True,              'type':'string',        'map':None},
         {'name':'interface_version',       'min':1, 'max':1,   'var':False,             'type':'hex',           'map':None},
         {'name':'addr_ton',                'min':1, 'max':1,   'var':False,             'type':'integer',       'map':'addr_ton'},
@@ -52,7 +58,9 @@
     ],
     'outbind':[ # SMPP v3.4, section 4.1.7.1, page 54
         {'name':'system_id',               'min':1, 'max':16,  'var':True,              'type':'string',        'map':None},
-        {'name':'password',                'min':1, 'max':9,   'var':True,              'type':'string',        'map':None}
+        # The spec states max=9, but there are longer passwords in the wild.
+        # {'name':'password',                'min':1, 'max':9,   'var':True,              'type':'string',        'map':None},
+        {'name':'password',                'min':1, 'max':254,   'var':True,              'type':'string',        'map':None}
     ],
     'unbind':[ # SMPP v3.4, section 4.2.1, table 4-7, page 56
     ],