<p>daniel <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11201">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pySim-prog: Honor international '+' in SMSC number<br><br>The smsc no. programmed by pySim-prog would always be a national number<br>in the past. Check whether the first 'digit' is a + and indicate that it<br>is an international number.<br><br>Change-Id: Ia79913f5b0307e9786a5acea75c0811927be2eef<br>---<br>M pySim-prog.py<br>1 file changed, 8 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pySim-prog.py b/pySim-prog.py</span><br><span>index eca8b4e..ae5e482 100755</span><br><span>--- a/pySim-prog.py</span><br><span>+++ b/pySim-prog.py</span><br><span>@@ -97,7 +97,7 @@</span><br><span> default=55,</span><br><span> )</span><br><span> parser.add_option("-m", "--smsc", dest="smsc",</span><br><span style="color: hsl(0, 100%, 40%);">- help="SMSP [default: '00 + country code + 5555']",</span><br><span style="color: hsl(120, 100%, 40%);">+ help="SMSC number (Start with + for international no.) [default: '00 + country code + 5555']",</span><br><span> )</span><br><span> parser.add_option("-M", "--smsp", dest="smsp",</span><br><span> help="Raw SMSP content in hex [default: auto from SMSC]",</span><br><span>@@ -319,14 +319,19 @@</span><br><span> raise ValueError('SMSP must be at least 28 bytes')</span><br><span> </span><br><span> else:</span><br><span style="color: hsl(120, 100%, 40%);">+ ton = "81"</span><br><span> if opts.smsc is not None:</span><br><span> smsc = opts.smsc</span><br><span style="color: hsl(120, 100%, 40%);">+ if smsc[0] == '+':</span><br><span style="color: hsl(120, 100%, 40%);">+ ton = "91"</span><br><span style="color: hsl(120, 100%, 40%);">+ smsc = smsc[1:]</span><br><span> if not _isnum(smsc):</span><br><span style="color: hsl(0, 100%, 40%);">- raise ValueError('SMSC must be digits only !')</span><br><span style="color: hsl(120, 100%, 40%);">+ raise ValueError('SMSC must be digits only!\n \</span><br><span style="color: hsl(120, 100%, 40%);">+ Start with \'+\' for international numbers')</span><br><span> else:</span><br><span> smsc = '00%d' % opts.country + '5555' # Hack ...</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- smsc = '%02d' % ((len(smsc) + 3)//2,) + "81" + swap_nibbles(rpad(smsc, 20))</span><br><span style="color: hsl(120, 100%, 40%);">+ smsc = '%02d' % ((len(smsc) + 3)//2,) + ton + swap_nibbles(rpad(smsc, 20))</span><br><span> </span><br><span> smsp = (</span><br><span> 'e1' + # Parameters indicator</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11201">change 11201</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/11201"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: pysim </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ia79913f5b0307e9786a5acea75c0811927be2eef </div>
<div style="display:none"> Gerrit-Change-Number: 11201 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>