nuntium

Merge lp:~alfonsosanchezbeato/nuntium/fix-mms-rx into lp:nuntium/packaging

  1. fix-mms-rx
  2. Merge into packaging
Proposed by Alfonso Sanchez-Beato on 2015-06-01
Status: Merged
Approved by: Manuel de la Peña on 2015-06-09
Approved revision: 97
Merged at revision: 97
Proposed branch: lp:~alfonsosanchezbeato/nuntium/fix-mms-rx
Merge into: lp:nuntium/packaging
Diff against target: 54 lines (+19/-2)
3 files modified
.gitignore (+4/-0)
debian/changelog (+8/-0)
mms/decoder.go (+7/-2)
To merge this branch: bzr merge lp:~alfonsosanchezbeato/nuntium/fix-mms-rx
Reviewer Review Type Date Requested Status
Alfonso Sanchez-Beato Approve on 2015-06-09
Manuel de la Peña (community) Approve on 2015-06-09
Review via email: mp+260678@code.launchpad.net

Commit Message

* Fix LP #1459995 and most bugs which symptom is not receiving MMS
  messages
* Remove nuntium binary from VC

Description of the Change

* Fix LP #1459995 and most bugs which symptom is not receiving MMS
  messages
* Remove nuntium binary from VC

To post a comment you must log in.
Manuel de la Peña (mandel) wrote :

Looks good and the conversation has already taken place in github.

review: Approve
Alfonso Sanchez-Beato (alfonsosanchezbeato) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.gitignore'
2--- .gitignore 2014-10-21 13:13:11 +0000
3+++ .gitignore 2015-06-01 06:43:24 +0000
4@@ -1,1 +1,5 @@
5 **/*.swp
6+cmd/nuntium/nuntium
7+cmd/nuntium-decode-cli/nuntium-decode-cli
8+cmd/nuntium-inject-push/nuntium-inject-push
9+test/test
10
11=== removed file 'cmd/nuntium/nuntium'
12Binary files cmd/nuntium/nuntium 2014-10-21 13:13:11 +0000 and cmd/nuntium/nuntium 1970-01-01 00:00:00 +0000 differ
13=== modified file 'debian/changelog'
14--- debian/changelog 2015-05-21 06:27:57 +0000
15+++ debian/changelog 2015-06-01 06:43:24 +0000
16@@ -1,3 +1,11 @@
17+nuntium (1.4+15.04.20150601-0ubuntu1) UNRELEASED; urgency=medium
18+
19+ * Fix LP #1459995 and most bugs which symptom is not receiving MMS
20+ messages
21+ * Remove nuntium binary from VC
22+
23+ -- Alfonso Sanchez-Beato (email Canonical) <alfonso.sanchez-beato@canonical.com> Mon, 01 Jun 2015 08:31:48 +0200
24+
25 nuntium (1.4+15.04.20150521-0ubuntu1) vivid; urgency=medium
26
27 [ Sergio Schvezov ]
28
29=== modified file 'mms/decoder.go'
30--- mms/decoder.go 2015-05-20 12:32:08 +0000
31+++ mms/decoder.go 2015-06-01 06:43:24 +0000
32@@ -165,7 +165,7 @@
33 }
34
35 func (dec *MMSDecoder) ReadTo(reflectedPdu *reflect.Value) error {
36- // field in the MMS protocol
37+ // field in the MMS protocol
38 toField, err := dec.ReadEncodedString(reflectedPdu, "")
39 if err != nil {
40 return err
41@@ -414,7 +414,12 @@
42 case X_MMS_RETRIEVE_TEXT:
43 _, err = dec.ReadString(&reflectedPdu, "RetrieveText")
44 case X_MMS_MMS_VERSION:
45- _, err = dec.ReadShortInteger(&reflectedPdu, "Version")
46+ // TODO This should be ReadShortInteger instead, but we read it
47+ // as a byte because we are not properly encoding the version
48+ // either, as we are using the raw value there. To fix this we
49+ // need to change the encoder and the MMS_MESSAGE_VERSION_1_X
50+ // constants.
51+ _, err = dec.ReadByte(&reflectedPdu, "Version")
52 case X_MMS_MESSAGE_CLASS:
53 //TODO implement Token text form
54 _, err = dec.ReadByte(&reflectedPdu, "Class")

Subscribers

People subscribed via source and target branches