Merge lp:~alfonsosanchezbeato/nuntium/nuntium-preferred-context into lp:nuntium/packaging

[Alfonso Sanchez-Beato]

  [ Sergio Schvezov ]
  * Decode properly content type when there are parameters
  [ Alfonso Sanchez-Beato ]
  * Fix LP: #1441135 in the event of an oFono crash
  * Use oFono's Preferred property when selecting the mobile context

  [ Sergio Schvezov ]
  * Decode properly content type when there are parameters
  [ Alfonso Sanchez-Beato ]
  * Fix LP: #1441135 in the event of an oFono crash
  * Use oFono's Preferred property when selecting the mobile context

[lp:~alfonsosanchezbeato/nuntium/nuntium-preferred-context]

95. By Alfonso Sanchez-Beato on 2015-05-21

Fix package version

[Manuel de la Peña (mandel)]

Looks good.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-04-22 00:58:08 +0000
+++ debian/changelog	2015-05-21 06:23:15 +0000
@@ -1,3 +1,14 @@
+nuntium (1.4+15.04.20150520-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Sergio Schvezov ]
+  * Decode properly content type when there are parameters
+
+  [ Alfonso Sanchez-Beato ]
+  * Fix LP: #1441135 in the event of an oFono crash
+  * Use oFono's Preferred property when selecting the mobile context
+
+ -- Alfonso Sanchez-Beato (email Canonical) <[e-mail]>  Wed, 20 May 2015 14:19:54 +0200
+
 nuntium (1.4+15.04.20150422-0ubuntu1) vivid; urgency=medium
 
   [ CI Train Bot ]
 
=== modified file 'mms/attachments.go'
--- mms/attachments.go	2014-09-23 19:58:36 +0000
+++ mms/attachments.go	2015-05-21 06:23:15 +0000
@@ -125,7 +125,7 @@
 	return dataParts
 }
 
-func (dec *MMSDecoder) ReadContentTypeParts(reflectedPdu *reflect.Value) error {
+func (dec *MMSDecoder) ReadAttachmentParts(reflectedPdu *reflect.Value) error {
 	var err error
 	var parts uint64
 	if parts, err = dec.ReadUintVar(nil, ""); err != nil {
@@ -147,7 +147,7 @@
 		var ct Attachment
 		ct.Offset = headerEnd + 1
 		ctReflected := reflect.ValueOf(&ct).Elem()
-		if err := dec.ReadContentType(&ctReflected); err == nil {
+		if err := dec.ReadAttachment(&ctReflected); err == nil {
 			if err := dec.ReadMMSHeaders(&ctReflected, headerEnd); err != nil {
 				return err
 			}
@@ -191,7 +191,7 @@
 	return nil
 }
 
-func (dec *MMSDecoder) ReadContentType(ctMember *reflect.Value) error {
+func (dec *MMSDecoder) ReadAttachment(ctMember *reflect.Value) error {
 	if dec.Offset+1 >= len(dec.Data) {
 		return fmt.Errorf("message ended prematurely, offset: %d and payload length is %d", dec.Offset, len(dec.Data))
 	}
 
=== modified file 'mms/decoder.go'
--- mms/decoder.go	2015-01-15 15:45:48 +0000
+++ mms/decoder.go	2015-05-21 06:23:15 +0000
@@ -132,7 +132,17 @@
 
 func (dec *MMSDecoder) ReadMediaType(reflectedPdu *reflect.Value, hdr string) (err error) {
 	var mediaType string
+	var endOffset int
 	origOffset := dec.Offset
+
+	if dec.Data[dec.Offset+1] <= SHORT_LENGTH_MAX || dec.Data[dec.Offset+1] == LENGTH_QUOTE {
+		if length, err := dec.ReadLength(nil); err != nil {
+			return err
+		} else {
+			endOffset = int(length) + dec.Offset
+		}
+	}
+
 	if dec.Data[dec.Offset+1] >= TEXT_MIN && dec.Data[dec.Offset+1] <= TEXT_MAX {
 		if mediaType, err = dec.ReadString(nil, ""); err != nil {
 			return err
@@ -143,8 +153,14 @@
 		return fmt.Errorf("cannot decode media type for field beginning with %#x@%d", dec.Data[origOffset], origOffset)
 	}
 
+	// skip the rest of the content type params
+	if endOffset > 0 {
+		dec.Offset = endOffset
+	}
+
 	reflectedPdu.FieldByName(hdr).SetString(mediaType)
 	dec.log = dec.log + fmt.Sprintf("%s: %s\n", hdr, mediaType)
+
 	return nil
 }
 
@@ -371,12 +387,12 @@
 			_, err = dec.ReadString(&reflectedPdu, "TransactionId")
 		case CONTENT_TYPE:
 			ctMember := reflectedPdu.FieldByName("Content")
-			if err = dec.ReadContentType(&ctMember); err != nil {
+			if err = dec.ReadAttachment(&ctMember); err != nil {
 				return err
 			}
 			//application/vnd.wap.multipart.related and others
 			if ctMember.FieldByName("MediaType").String() != "text/plain" {
-				err = dec.ReadContentTypeParts(&reflectedPdu)
+				err = dec.ReadAttachmentParts(&reflectedPdu)
 			} else {
 				dec.Offset++
 				_, err = dec.ReadBoundedBytes(&reflectedPdu, "Data", len(dec.Data))
 
=== modified file 'ofono/context_test.go'
--- ofono/context_test.go	2014-09-30 18:01:12 +0000
+++ ofono/context_test.go	2015-05-21 06:23:15 +0000
@@ -38,11 +38,12 @@
 
 var proxy ProxyInfo
 
-func makeGenericContextProperty(name, cType string, active, messageCenter, messageProxy bool) PropertiesType {
+func makeGenericContextProperty(name, cType string, active, messageCenter, messageProxy, preferred bool) PropertiesType {
 	p := make(PropertiesType)
 	p["Name"] = dbus.Variant{name}
 	p["Type"] = dbus.Variant{cType}
 	p["Active"] = dbus.Variant{active}
+	p["Preferred"] = dbus.Variant{preferred}
 	if messageCenter {
 		p["MessageCenter"] = dbus.Variant{"http://messagecenter.com"}
 	} else {
@@ -80,7 +81,7 @@
 func (s *ContextTestSuite) TestMMSOverInternet(c *C) {
 	context1 := OfonoContext{
 		ObjectPath: "/ril_0/context1",
-		Properties: makeGenericContextProperty("Context1", contextTypeInternet, true, true, true),
+		Properties: makeGenericContextProperty("Context1", contextTypeInternet, true, true, true, false),
 	}
 	s.contexts = append(s.contexts, context1)
 
@@ -93,7 +94,7 @@
 func (s *ContextTestSuite) TestMMSOverInactiveInternet(c *C) {
 	context1 := OfonoContext{
 		ObjectPath: "/ril_0/context1",
-		Properties: makeGenericContextProperty("Context1", contextTypeInternet, false, true, true),
+		Properties: makeGenericContextProperty("Context1", contextTypeInternet, false, true, true, false),
 	}
 	s.contexts = append(s.contexts, context1)
 
@@ -105,7 +106,7 @@
 func (s *ContextTestSuite) TestMMSOverInternetNoProxy(c *C) {
 	context1 := OfonoContext{
 		ObjectPath: "/ril_0/context1",
-		Properties: makeGenericContextProperty("Context1", contextTypeInternet, true, true, false),
+		Properties: makeGenericContextProperty("Context1", contextTypeInternet, true, true, false, false),
 	}
 	s.contexts = append(s.contexts, context1)
 
@@ -118,13 +119,13 @@
 func (s *ContextTestSuite) TestMMSOverMMS(c *C) {
 	context1 := OfonoContext{
 		ObjectPath: "/ril_0/context1",
-		Properties: makeGenericContextProperty("Context1", contextTypeInternet, true, false, false),
+		Properties: makeGenericContextProperty("Context1", contextTypeInternet, true, false, false, false),
 	}
 	s.contexts = append(s.contexts, context1)
 
 	context2 := OfonoContext{
 		ObjectPath: "/ril_0/context2",
-		Properties: makeGenericContextProperty("Context2", contextTypeMMS, false, true, true),
+		Properties: makeGenericContextProperty("Context2", contextTypeMMS, false, true, true, false),
 	}
 	s.contexts = append(s.contexts, context2)
 
@@ -137,13 +138,13 @@
 func (s *ContextTestSuite) TestMMSOverMMSNoProxy(c *C) {
 	context1 := OfonoContext{
 		ObjectPath: "/ril_0/context1",
-		Properties: makeGenericContextProperty("Context1", contextTypeInternet, true, false, false),
+		Properties: makeGenericContextProperty("Context1", contextTypeInternet, true, false, false, false),
 	}
 	s.contexts = append(s.contexts, context1)
 
 	context2 := OfonoContext{
 		ObjectPath: "/ril_0/context2",
-		Properties: makeGenericContextProperty("Context2", contextTypeMMS, false, true, false),
+		Properties: makeGenericContextProperty("Context2", contextTypeMMS, false, true, false, false),
 	}
 	s.contexts = append(s.contexts, context2)
 
@@ -156,13 +157,13 @@
 func (s *ContextTestSuite) TestMMSMoreThanOneValid(c *C) {
 	context1 := OfonoContext{
 		ObjectPath: "/ril_0/context1",
-		Properties: makeGenericContextProperty("Context1", contextTypeInternet, true, true, false),
+		Properties: makeGenericContextProperty("Context1", contextTypeInternet, true, true, false, false),
 	}
 	s.contexts = append(s.contexts, context1)
 
 	context2 := OfonoContext{
 		ObjectPath: "/ril_0/context2",
-		Properties: makeGenericContextProperty("Context2", contextTypeMMS, false, true, false),
+		Properties: makeGenericContextProperty("Context2", contextTypeMMS, false, true, false, false),
 	}
 	s.contexts = append(s.contexts, context2)
 
@@ -176,19 +177,19 @@
 func (s *ContextTestSuite) TestMMSMoreThanOneValidContextSelectPreferred(c *C) {
 	context1 := OfonoContext{
 		ObjectPath: "/ril_0/context1",
-		Properties: makeGenericContextProperty("Context1", contextTypeInternet, true, true, false),
+		Properties: makeGenericContextProperty("Context1", contextTypeInternet, true, true, false, false),
 	}
 	s.contexts = append(s.contexts, context1)
 
 	context2 := OfonoContext{
 		ObjectPath: "/ril_0/context2",
-		Properties: makeGenericContextProperty("Context2", contextTypeMMS, false, true, false),
+		Properties: makeGenericContextProperty("Context2", contextTypeMMS, false, true, false, false),
 	}
 	s.contexts = append(s.contexts, context2)
 
 	context3 := OfonoContext{
 		ObjectPath: "/ril_0/context3",
-		Properties: makeGenericContextProperty("Context3", contextTypeMMS, false, true, false),
+		Properties: makeGenericContextProperty("Context3", contextTypeMMS, false, true, false, false),
 	}
 	s.contexts = append(s.contexts, context3)
 
@@ -203,19 +204,19 @@
 func (s *ContextTestSuite) TestMMSMoreThanOneValidContextPreferredNoMatch(c *C) {
 	context1 := OfonoContext{
 		ObjectPath: "/ril_0/context1",
-		Properties: makeGenericContextProperty("Context1", contextTypeInternet, true, true, false),
+		Properties: makeGenericContextProperty("Context1", contextTypeInternet, true, true, false, false),
 	}
 	s.contexts = append(s.contexts, context1)
 
 	context2 := OfonoContext{
 		ObjectPath: "/ril_0/context2",
-		Properties: makeGenericContextProperty("Context2", contextTypeMMS, false, true, false),
+		Properties: makeGenericContextProperty("Context2", contextTypeMMS, false, true, false, false),
 	}
 	s.contexts = append(s.contexts, context2)
 
 	context3 := OfonoContext{
 		ObjectPath: "/ril_0/context3",
-		Properties: makeGenericContextProperty("Context3", contextTypeMMS, false, true, false),
+		Properties: makeGenericContextProperty("Context3", contextTypeMMS, false, true, false, false),
 	}
 	s.contexts = append(s.contexts, context3)
 
@@ -230,25 +231,25 @@
 func (s *ContextTestSuite) TestMMSMoreThanOneValidContext2Active(c *C) {
 	context0 := OfonoContext{
 		ObjectPath: "/ril_0/context0",
-		Properties: makeGenericContextProperty("Context0", contextTypeInternet, false, true, false),
+		Properties: makeGenericContextProperty("Context0", contextTypeInternet, false, true, false, false),
 	}
 	s.contexts = append(s.contexts, context0)
 
 	context1 := OfonoContext{
 		ObjectPath: "/ril_0/context1",
-		Properties: makeGenericContextProperty("Context1", contextTypeMMS, false, true, false),
+		Properties: makeGenericContextProperty("Context1", contextTypeMMS, false, true, false, false),
 	}
 	s.contexts = append(s.contexts, context1)
 
 	context2 := OfonoContext{
 		ObjectPath: "/ril_0/context2",
-		Properties: makeGenericContextProperty("Context2", contextTypeMMS, false, true, false),
+		Properties: makeGenericContextProperty("Context2", contextTypeMMS, false, true, false, false),
 	}
 	s.contexts = append(s.contexts, context2)
 
 	context3 := OfonoContext{
 		ObjectPath: "/ril_0/context3",
-		Properties: makeGenericContextProperty("Context3", contextTypeMMS, true, true, false),
+		Properties: makeGenericContextProperty("Context3", contextTypeMMS, true, true, false, false),
 	}
 	s.contexts = append(s.contexts, context3)
 
@@ -263,25 +264,25 @@
 func (s *ContextTestSuite) TestMMSMoreThanOneValidContextPreferredNotActive(c *C) {
 	context0 := OfonoContext{
 		ObjectPath: "/ril_0/context0",
-		Properties: makeGenericContextProperty("Context1", contextTypeInternet, true, true, false),
+		Properties: makeGenericContextProperty("Context1", contextTypeInternet, true, true, false, false),
 	}
 	s.contexts = append(s.contexts, context0)
 
 	context1 := OfonoContext{
 		ObjectPath: "/ril_0/context1",
-		Properties: makeGenericContextProperty("Context1", contextTypeMMS, false, true, false),
+		Properties: makeGenericContextProperty("Context1", contextTypeMMS, false, true, false, false),
 	}
 	s.contexts = append(s.contexts, context1)
 
 	context2 := OfonoContext{
 		ObjectPath: "/ril_0/context2",
-		Properties: makeGenericContextProperty("Context2", contextTypeMMS, false, true, false),
+		Properties: makeGenericContextProperty("Context2", contextTypeMMS, false, true, false, false),
 	}
 	s.contexts = append(s.contexts, context2)
 
 	context3 := OfonoContext{
 		ObjectPath: "/ril_0/context3",
-		Properties: makeGenericContextProperty("Context3", contextTypeMMS, false, true, false),
+		Properties: makeGenericContextProperty("Context3", contextTypeMMS, false, true, false, false),
 	}
 
 	s.contexts = append(s.contexts, context3)
@@ -295,10 +296,41 @@
 	c.Check(contexts[3], DeepEquals, context2)
 }
 
+func (s *ContextTestSuite) TestOnePreferredContext(c *C) {
+	context0 := OfonoContext{
+		ObjectPath: "/ril_0/context0",
+		Properties: makeGenericContextProperty("Context0", contextTypeInternet, true, true, false, false),
+	}
+	s.contexts = append(s.contexts, context0)
+
+	context1 := OfonoContext{
+		ObjectPath: "/ril_0/context1",
+		Properties: makeGenericContextProperty("Context1", contextTypeMMS, false, true, false, true),
+	}
+	s.contexts = append(s.contexts, context1)
+
+	context2 := OfonoContext{
+		ObjectPath: "/ril_0/context2",
+		Properties: makeGenericContextProperty("Context2", contextTypeMMS, false, true, false, false),
+	}
+	s.contexts = append(s.contexts, context2)
+
+	context3 := OfonoContext{
+		ObjectPath: "/ril_0/context3",
+		Properties: makeGenericContextProperty("Context3", contextTypeMMS, true, true, false, false),
+	}
+	s.contexts = append(s.contexts, context3)
+
+	contexts, err := s.modem.GetMMSContexts("")
+	c.Assert(err, IsNil)
+	c.Assert(len(contexts), Equals, 1)
+	c.Check(contexts[0], DeepEquals, context1)
+}
+
 func (s *ContextTestSuite) TestGetProxy(c *C) {
 	context := OfonoContext{
 		ObjectPath: "/ril_0/context1",
-		Properties: makeGenericContextProperty("Context1", contextTypeInternet, true, true, true),
+		Properties: makeGenericContextProperty("Context1", contextTypeInternet, true, true, true, false),
 	}
 
 	p, err := context.GetProxy()
@@ -309,7 +341,7 @@
 func (s *ContextTestSuite) TestGetProxyNoProxy(c *C) {
 	context := OfonoContext{
 		ObjectPath: "/ril_0/context1",
-		Properties: makeGenericContextProperty("Context1", contextTypeInternet, true, true, false),
+		Properties: makeGenericContextProperty("Context1", contextTypeInternet, true, true, false, false),
 	}
 
 	p, err := context.GetProxy()
@@ -320,7 +352,7 @@
 func (s *ContextTestSuite) TestGetProxyWithHTTP(c *C) {
 	context := OfonoContext{
 		ObjectPath: "/ril_0/context1",
-		Properties: makeGenericContextProperty("Context1", contextTypeInternet, true, true, true),
+		Properties: makeGenericContextProperty("Context1", contextTypeInternet, true, true, true, false),
 	}
 	context.Properties["MessageProxy"] = dbus.Variant{fmt.Sprintf("http://%s:%d", proxy.Host, proxy.Port)}
 
@@ -332,7 +364,7 @@
 func (s *ContextTestSuite) TestGetProxyNoPort(c *C) {
 	context := OfonoContext{
 		ObjectPath: "/ril_0/context1",
-		Properties: makeGenericContextProperty("Context1", contextTypeInternet, true, true, true),
+		Properties: makeGenericContextProperty("Context1", contextTypeInternet, true, true, true, false),
 	}
 	context.Properties["MessageProxy"] = dbus.Variant{fmt.Sprintf("http://%s", proxy.Host)}
 
 
=== modified file 'ofono/manager.go'
--- ofono/manager.go	2014-05-08 23:23:22 +0000
+++ ofono/manager.go	2015-05-21 06:23:15 +0000
@@ -46,18 +46,24 @@
 }
 
 func (mm *ModemManager) Init() error {
-	modemAddedSignal, err := connectToSignal(mm.conn, "/", OFONO_MANAGER_INTERFACE, "ModemAdded")
+	//Use a different connection for the modem signals to avoid go-dbus blocking issues
+	conn, err := dbus.Connect(dbus.SystemBus)
+	if err != nil {
+		return err;
+	}
+
+	modemAddedSignal, err := connectToSignal(conn, "/", OFONO_MANAGER_INTERFACE, "ModemAdded")
 	if err != nil {
 		return err
 	}
-	modemRemovedSignal, err := connectToSignal(mm.conn, "/", OFONO_MANAGER_INTERFACE, "ModemRemoved")
+	modemRemovedSignal, err := connectToSignal(conn, "/", OFONO_MANAGER_INTERFACE, "ModemRemoved")
 	if err != nil {
 		return err
 	}
 	go mm.watchModems(modemAddedSignal, modemRemovedSignal)
 
 	//Check for existing modems
-	modemPaths, err := getModems(mm.conn)
+	modemPaths, err := getModems(conn)
 	if err != nil {
 		log.Print("Cannot preemptively add modems: ", err)
 	} else {
 
=== modified file 'ofono/modem.go'
--- ofono/modem.go	2014-10-02 01:24:13 +0000
+++ ofono/modem.go	2015-05-21 06:23:15 +0000
@@ -310,6 +310,10 @@
 	return reflect.ValueOf(oContext.Properties["Active"].Value).Bool()
 }
 
+func (oContext OfonoContext) isPreferred() bool {
+	return reflect.ValueOf(oContext.Properties["Preferred"].Value).Bool()
+}
+
 func (oContext OfonoContext) hasMessageCenter() bool {
 	return oContext.messageCenter() != ""
 }
@@ -371,10 +375,11 @@
 //and a MessageCenter within the context.
 //
 //The following rules take place:
-//- check current type=internet context for MessageProxy & MessageCenter;
-//  if they exist and aren't empty AND the context is active, select it as the
-//  context to use for MMS.
-//- otherwise search for type=mms, if found, use it and activate
+//- if current type=internet context, check for MessageProxy & MessageCenter;
+//  if they exist and aren't empty AND the context is active, add it to the list
+//- if current type=mms, add it to the list
+//- if ofono's ConnectionManager.Preferred property is set, use only that context
+//- prioritize active and recently successfully used contexts
 //
 //Returns either the type=internet context or the type=mms, if none is found
 //an error is returned.
@@ -386,7 +391,10 @@
 
 	for _, context := range contexts {
 		if (context.isTypeInternet() && context.isActive() && context.hasMessageCenter()) || context.isTypeMMS() {
-			if context.ObjectPath == preferredContext || context.isActive() {
+			if context.isPreferred() {
+				mmsContexts = []OfonoContext{context}
+				break
+			} else if context.ObjectPath == preferredContext || context.isActive() {
 				mmsContexts = append([]OfonoContext{context}, mmsContexts...)
 			} else {
 				mmsContexts = append(mmsContexts, context)
@@ -418,7 +426,9 @@
 }
 
 func (modem *Modem) Delete() {
-	modem.IdentityRemoved <- modem.identity
+	if modem.identity != "" {
+		modem.IdentityRemoved <- modem.identity
+	}
 	modem.modemSignal.Cancel()
 	modem.modemSignal.C = nil
 	modem.simSignal.Cancel()
 
=== modified file 'ofono/push_decode_test.go'
--- ofono/push_decode_test.go	2014-10-21 13:13:11 +0000
+++ ofono/push_decode_test.go	2015-05-21 06:23:15 +0000
@@ -169,3 +169,33 @@
 	dec := NewDecoder(inputBytes)
 	c.Assert(dec.Decode(s.pdu), DeepEquals, errors.New("7 != 6 is not a push PDU"))
 }
+
+func (s *PushDecodeTestSuite) TestDecodeTMobileUSA(c *C) {
+	inputBytes := []byte{
+		0xc0, 0x06, 0x28, 0x1f, 0x22, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74,
+		0x69, 0x6f, 0x6e, 0x2f, 0x76, 0x6e, 0x64, 0x2e, 0x77, 0x61, 0x70, 0x2e, 0x6d,
+		0x6d, 0x73, 0x2d, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x00, 0x81, 0x84,
+		0x8d, 0x80, 0xaf, 0x84, 0x8c, 0x82, 0x98, 0x6d, 0x61, 0x76, 0x6f, 0x64, 0x69,
+		0x2d, 0x37, 0x2d, 0x38, 0x39, 0x2d, 0x31, 0x63, 0x30, 0x2d, 0x37, 0x2d, 0x63,
+		0x61, 0x2d, 0x35, 0x30, 0x66, 0x39, 0x33, 0x38, 0x34, 0x33, 0x2d, 0x37, 0x2d,
+		0x31, 0x33, 0x62, 0x2d, 0x32, 0x65, 0x62, 0x2d, 0x31, 0x2d, 0x63, 0x61, 0x2d,
+		0x33, 0x36, 0x31, 0x65, 0x33, 0x31, 0x35, 0x00, 0x8d, 0x92, 0x89, 0x1a, 0x80,
+		0x18, 0x83, 0x2b, 0x31, 0x39, 0x31, 0x39, 0x39, 0x30, 0x33, 0x33, 0x34, 0x38,
+		0x38, 0x2f, 0x54, 0x59, 0x50, 0x45, 0x3d, 0x50, 0x4c, 0x4d, 0x4e, 0x00, 0x8a,
+		0x80, 0x8e, 0x03, 0x0f, 0x21, 0x9f, 0x88, 0x05, 0x81, 0x03, 0x03, 0xf4, 0x80,
+		0x83, 0x68, 0x74, 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x61, 0x74, 0x6c, 0x32, 0x6d,
+		0x6f, 0x73, 0x67, 0x65, 0x74, 0x2e, 0x6d, 0x73, 0x67, 0x2e, 0x65, 0x6e, 0x67,
+		0x2e, 0x74, 0x2d, 0x6d, 0x6f, 0x62, 0x69, 0x6c, 0x65, 0x2e, 0x63, 0x6f, 0x6d,
+		0x2f, 0x6d, 0x6d, 0x73, 0x2f, 0x77, 0x61, 0x70, 0x65, 0x6e, 0x63, 0x3f, 0x54,
+		0x3d, 0x6d, 0x61, 0x76, 0x6f, 0x64, 0x69, 0x2d, 0x37, 0x2d, 0x31, 0x33, 0x62,
+		0x2d, 0x32, 0x65, 0x62, 0x2d, 0x31, 0x2d, 0x63, 0x61, 0x2d, 0x33, 0x36, 0x31,
+		0x65, 0x33, 0x31, 0x35, 0x00,
+	}
+	dec := NewDecoder(inputBytes)
+	c.Assert(dec.Decode(s.pdu), IsNil)
+
+	c.Check(int(s.pdu.HeaderLength), Equals, 40)
+	c.Check(int(s.pdu.ApplicationId), Equals, mms.PUSH_APPLICATION_ID)
+	c.Check(s.pdu.ContentType, Equals, mms.VND_WAP_MMS_MESSAGE)
+	c.Check(len(s.pdu.Data), Equals, 183)
+}