← Back to branch summary

~ubuntu-branches/ubuntu/wily/nuntium/wily-proposed

« back to all changes in this revision

Viewing changes to mms/decoder.go

  • Committer: Package Import Robot
  • Author(s): CI Train Bot
  • Date: 2015-07-14 09:19:52 UTC
  • mto: This revision was merged to the branch mainline in revision 31.
  • Revision ID: package-import@ubuntu.com-20150714091952-cgtz5v6c1fo0k19j
Tags: upstream-1.4+15.10.20150714
Import upstream version 1.4+15.10.20150714

Show diffs side-by-side

added added

removed removed

Lines of Context:
mms/decoder.go
386
386
                case FROM:
387
387
                        dec.Offset++
388
388
                        size := int(dec.Data[dec.Offset])
 
389
                        valStart := dec.Offset
389
390
                        dec.Offset++
390
391
                        token := dec.Data[dec.Offset]
391
392
                        switch token {
393
394
                                break
394
395
                        case TOKEN_ADDRESS_PRESENT:
395
396
                                // TODO add check for /TYPE=PLMN
396
 
                                var from string
397
 
                                from, err = dec.ReadString(&reflectedPdu, "From")
398
 
                                // size - 2 == size - token - '0'
399
 
                                if len(from) != size-2 {
400
 
                                        err = fmt.Errorf("From field is %d but expected size is %d", len(from), size-2)
 
397
                                _, err = dec.ReadEncodedString(&reflectedPdu, "From")
 
398
                                if valStart+size != dec.Offset {
 
399
                                        err = fmt.Errorf("From field length is %d but expected size is %d",
 
400
                                                dec.Offset-valStart, size)
401
401
                                }
402
402
                        default:
403
403
                                err = fmt.Errorf("Unhandled token address in from field %x", token)