[PATCH openobex 1/3] Add transport format member in fdobex_data struct. Support STREAM and SEQPACKET transport format.

[PATCH openobex 1/3] Add transport format member in fdobex_data struct. Support STREAM and SEQPACKET transport format.

[Nami]

---
 include/openobex/obex_const.h |    4 ++++
 lib/fdobex.h                  |    1 +
 2 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/include/openobex/obex_const.h b/include/openobex/obex_const.h
index cb7afeb..8acee91 100644
--- a/include/openobex/obex_const.h
+++ b/include/openobex/obex_const.h
@@ -302,6 +302,10 @@ enum obex_rsp_mode {
   OBEX_RSP_MODE_SINGLE = 1, /**< single response mode (SRM) */
 };

+enum fdobex_transport_format{
+	 FDOBEX_MT_STREAM ,
+	 FDOBEX_MT_SEQPACKET
+};
 /* Min, Max and default transport MTU */
 #define OBEX_DEFAULT_MTU	1024
 #define OBEX_MINIMUM_MTU	255
diff --git a/lib/fdobex.h b/lib/fdobex.h
index 07e33ab..6839e77 100644
--- a/lib/fdobex.h
+++ b/lib/fdobex.h
@@ -6,5 +6,6 @@ void fdobex_get_ops(struct obex_transport_ops* ops);

 struct fdobex_data {
 	socket_t writefd; /* write descriptor */
+	enum fdobex_transport_format fmt;
 };
 #endif
--
1.7.1

[PATCH openobex 2/3] Add transport format parameter when setup fd obex transprot.

[Nami]

---
 include/openobex/obex.h |    2 +-
 lib/obex.c              |    4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/include/openobex/obex.h b/include/openobex/obex.h
index f948113..0d7afec 100644
--- a/include/openobex/obex.h
+++ b/include/openobex/obex.h
@@ -147,7 +147,7 @@ OPENOBEX_SYMBOL(int) BtOBEX_TransportConnect(obex_t *self, bt_addr_t *src, bt_ad
 /*
  * OBEX File API
  */
-OPENOBEX_SYMBOL(int) FdOBEX_TransportSetup(obex_t *self, int rfd, int wfd, int mtu);
+OPENOBEX_SYMBOL(int) FdOBEX_TransportSetup(obex_t *self, int rfd, int wfd, int mtu, int fmt);

 /*
  * OBEX interface discovery API
diff --git a/lib/obex.c b/lib/obex.c
index 165fcb8..304bc15 100644
--- a/lib/obex.c
+++ b/lib/obex.c
@@ -1116,10 +1116,11 @@ int CALLAPI BtOBEX_TransportConnect(obex_t *self, bdaddr_t *src,
 	\param rfd descriptor to read
 	\param wfd descriptor to write
 	\param mtu transport mtu: 0 - default
+	\param fmt transport format: 0 - default
 	\return -1 or negative error code on error
  */
 LIB_SYMBOL
-int CALLAPI FdOBEX_TransportSetup(obex_t *self, int rfd, int wfd, int mtu)
+int CALLAPI FdOBEX_TransportSetup(obex_t *self, int rfd, int wfd, int mtu, int fmt)
 {
 	DEBUG(4, "\n");

@@ -1132,6 +1133,7 @@ int CALLAPI FdOBEX_TransportSetup(obex_t *self, int rfd, int wfd, int mtu)
 	self->trans.fd = rfd;
 	self->trans.data.fd.writefd = wfd;
 	self->trans.mtu = mtu ? mtu : self->mtu_tx_max;
+	self->trans.data.fd.fmt = fmt;
 	return obex_transport_connect_request(self);
 }

--
1.7.1

[PATCH openobex 3/3] Modify fdobex_read to read the entire packet when data tarnsprot format is SEQPACKET,

[Nami]

---
 lib/fdobex.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/lib/fdobex.c b/lib/fdobex.c
index 45c56ff..7a44fbd 100644
--- a/lib/fdobex.c
+++ b/lib/fdobex.c
@@ -78,6 +78,8 @@ static int fdobex_read(obex_t *self, void *buf, int buflen)
 {
 	struct obex_transport *trans = &self->trans;

+	if(trans->data.fd.fmt == FDOBEX_MT_SEQPACKET)
+		buflen = self->mtu_rx;
 #ifdef _WIN32
 	return  _read(trans->fd, buf, buflen);
 #else
--
1.7.1

RE: [PATCH openobex 1/3] Add transport format member in fdobex_data struct. Support STREAM and SEQPACKET transport format.

[Sumangala, Suraj]

Hi Nami,

-----Original Message-----
From: linux-bluetooth-owner@vger.kernel.org [mailto:linux-bluetooth-owner@vger.kernel.org] On Behalf Of Nami
Sent: Monday, June 20, 2011 11:17 AM
To: linux-bluetooth@vger.kernel.org
Cc: Liu, Haijun; openobex-users@lists.sourceforge.net; Li, Nami
Subject: [PATCH openobex 1/3] Add transport format member in fdobex_data struct. Support STREAM and SEQPACKET transport format.

---
 include/openobex/obex_const.h |    4 ++++
 lib/fdobex.h                  |    1 +
 2 files changed, 5 insertions(+), 0 deletions(-)

I think you should limit the number of characters in the subject to around 72 odd.
Any explanation can be added in the beginning of the patch.

Regards
Suraj

Re: [openobex-users] [PATCH openobex 1/3] Add transport format member in fdobex_data struct. Support STREAM and SEQPACKET transport format.

[Hendrik Sattler]

Zitat von Nami <nami.li@atheros.com>:

> ---
>  include/openobex/obex_const.h |    4 ++++
>  lib/fdobex.h                  |    1 +
>  2 files changed, 5 insertions(+), 0 deletions(-)
>
> diff --git a/include/openobex/obex_const.h b/include/openobex/obex_const.h
> index cb7afeb..8acee91 100644
> --- a/include/openobex/obex_const.h
> +++ b/include/openobex/obex_const.h
> @@ -302,6 +302,10 @@ enum obex_rsp_mode {
>    OBEX_RSP_MODE_SINGLE = 1, /**< single response mode (SRM) */
>  };
>
> +enum fdobex_transport_format{
> +	 FDOBEX_MT_STREAM ,
> +	 FDOBEX_MT_SEQPACKET
> +};
>  /* Min, Max and default transport MTU */
>  #define OBEX_DEFAULT_MTU	1024
>  #define OBEX_MINIMUM_MTU	255

Insert an empty line after the enum, please.
Also document the enum and its members, see the enum above. This is  
needed for the doxygen output.

> diff --git a/lib/fdobex.h b/lib/fdobex.h
> index 07e33ab..6839e77 100644
> --- a/lib/fdobex.h
> +++ b/lib/fdobex.h
> @@ -6,5 +6,6 @@ void fdobex_get_ops(struct obex_transport_ops* ops);
>
>  struct fdobex_data {
>  	socket_t writefd; /* write descriptor */
> +	enum fdobex_transport_format fmt;
>  };
>  #endif
> --
> 1.7.1
>
>
> ------------------------------------------------------------------------------
> EditLive Enterprise is the world's most technically advanced content
> authoring tool. Experience the power of Track Changes, Inline Image
> Editing and ensure content is compliant with Accessibility Checking.
> http://p.sf.net/sfu/ephox-dev2dev
> _______________________________________________
> Openobex-users mailing list
> Openobex-users@lists.sourceforge.net
> http://lists.sourceforge.net/lists/listinfo/openobex-users
>

Re: [PATCH openobex 1/3] Add transport format member in fdobex_data struct. Support STREAM and SEQPACKET transport format.

[Marcel Holtmann]

Hi Nami,

>  include/openobex/obex_const.h |    4 ++++
>  lib/fdobex.h                  |    1 +
>  2 files changed, 5 insertions(+), 0 deletions(-)
> 
> diff --git a/include/openobex/obex_const.h b/include/openobex/obex_const.h
> index cb7afeb..8acee91 100644
> --- a/include/openobex/obex_const.h
> +++ b/include/openobex/obex_const.h
> @@ -302,6 +302,10 @@ enum obex_rsp_mode {
>    OBEX_RSP_MODE_SINGLE = 1, /**< single response mode (SRM) */
>  };
> 
> +enum fdobex_transport_format{
> +	 FDOBEX_MT_STREAM ,
> +	 FDOBEX_MT_SEQPACKET
> +};

can I ask again why we should be doing this. Especially for the FdOBEX
transport this is pointless. You are getting a file descriptor in the
first place. It does not have to be a socket.

And in the case this is really a socket, then you can just use SO_TYPE
to read the current type of the socket.

If it is not a socket, then it needs to treated as stream anyway.

Regards

Marcel

Re: [openobex-users] [PATCH openobex 1/3] Add transport format member in fdobex_data struct. Support STREAM and SEQPACKET transport format.

[Hendrik Sattler]

Am Montag, 20. Juni 2011, 18:43:10 schrieb Marcel Holtmann:
> Hi Nami,
> 
> >  include/openobex/obex_const.h |    4 ++++
> >  lib/fdobex.h                  |    1 +
> >  2 files changed, 5 insertions(+), 0 deletions(-)
> > 
> > diff --git a/include/openobex/obex_const.h
> > b/include/openobex/obex_const.h index cb7afeb..8acee91 100644
> > --- a/include/openobex/obex_const.h
> > +++ b/include/openobex/obex_const.h
> > @@ -302,6 +302,10 @@ enum obex_rsp_mode {
> > 
> >    OBEX_RSP_MODE_SINGLE = 1, /**< single response mode (SRM) */
> >  
> >  };
> > 
> > +enum fdobex_transport_format{
> > +	 FDOBEX_MT_STREAM ,
> > +	 FDOBEX_MT_SEQPACKET
> > +};
> 
> can I ask again why we should be doing this. Especially for the FdOBEX
> transport this is pointless. You are getting a file descriptor in the
> first place. It does not have to be a socket.
> 
> And in the case this is really a socket, then you can just use SO_TYPE
> to read the current type of the socket.
> 
> If it is not a socket, then it needs to treated as stream anyway.

No. Ever tried that on the linux USB gadget implementation in Linux? If a FD 
is not pointing to a socket, it can still point to a device file of whatever 
kind. You SO_TYPE won't completely help here. You can try any amount of 
guessing but isn't it easier if the application just tells you? OTOH, the 
application could just use a custom transport, then.

HS

Re: [openobex-users] [PATCH openobex 1/3] Add transport format member in fdobex_data struct. Support STREAM and SEQPACKET transport format.

[Marcel Holtmann]

Hi Hendrik,

> > >  include/openobex/obex_const.h |    4 ++++
> > >  lib/fdobex.h                  |    1 +
> > >  2 files changed, 5 insertions(+), 0 deletions(-)
> > > 
> > > diff --git a/include/openobex/obex_const.h
> > > b/include/openobex/obex_const.h index cb7afeb..8acee91 100644
> > > --- a/include/openobex/obex_const.h
> > > +++ b/include/openobex/obex_const.h
> > > @@ -302,6 +302,10 @@ enum obex_rsp_mode {
> > > 
> > >    OBEX_RSP_MODE_SINGLE = 1, /**< single response mode (SRM) */
> > >  
> > >  };
> > > 
> > > +enum fdobex_transport_format{
> > > +	 FDOBEX_MT_STREAM ,
> > > +	 FDOBEX_MT_SEQPACKET
> > > +};
> > 
> > can I ask again why we should be doing this. Especially for the FdOBEX
> > transport this is pointless. You are getting a file descriptor in the
> > first place. It does not have to be a socket.
> > 
> > And in the case this is really a socket, then you can just use SO_TYPE
> > to read the current type of the socket.
> > 
> > If it is not a socket, then it needs to treated as stream anyway.
> 
> No. Ever tried that on the linux USB gadget implementation in Linux? If a FD 
> is not pointing to a socket, it can still point to a device file of whatever 
> kind. You SO_TYPE won't completely help here. You can try any amount of 
> guessing but isn't it easier if the application just tells you? OTOH, the 
> application could just use a custom transport, then.

problem is that either we introduce a new abstraction or we figure this
out magically. Breaking the API like this is not a good idea.

So if we go for FdPacketOBEX or something it might be a possible option,
but breaking FdOBEX API is not an option.

Regards

Marcel

Re: [openobex-users] [PATCH openobex 1/3] Add transport format member in fdobex_data struct. Support STREAM and SEQPACKET transport format.

[Hendrik Sattler]

Hi,

Am Montag, 20. Juni 2011, 21:45:11 schrieb Marcel Holtmann:
> > > >  include/openobex/obex_const.h |    4 ++++
> > > >  lib/fdobex.h                  |    1 +
> > > >  2 files changed, 5 insertions(+), 0 deletions(-)
> > > > 
> > > > diff --git a/include/openobex/obex_const.h
> > > > b/include/openobex/obex_const.h index cb7afeb..8acee91 100644
> > > > --- a/include/openobex/obex_const.h
> > > > +++ b/include/openobex/obex_const.h
> > > > @@ -302,6 +302,10 @@ enum obex_rsp_mode {
> > > > 
> > > >    OBEX_RSP_MODE_SINGLE = 1, /**< single response mode (SRM) */
> > > >  
> > > >  };
> > > > 
> > > > +enum fdobex_transport_format{
> > > > +	 FDOBEX_MT_STREAM ,
> > > > +	 FDOBEX_MT_SEQPACKET
> > > > +};
> > > 
> > > can I ask again why we should be doing this. Especially for the FdOBEX
> > > transport this is pointless. You are getting a file descriptor in the
> > > first place. It does not have to be a socket.
> > > 
> > > And in the case this is really a socket, then you can just use SO_TYPE
> > > to read the current type of the socket.
> > > 
> > > If it is not a socket, then it needs to treated as stream anyway.
> > 
> > No. Ever tried that on the linux USB gadget implementation in Linux? If a
> > FD is not pointing to a socket, it can still point to a device file of
> > whatever kind. You SO_TYPE won't completely help here. You can try any
> > amount of guessing but isn't it easier if the application just tells
> > you? OTOH, the application could just use a custom transport, then.
> 
> problem is that either we introduce a new abstraction or we figure this
> out magically. Breaking the API like this is not a good idea.
> 
> So if we go for FdPacketOBEX or something it might be a possible option,
> but breaking FdOBEX API is not an option.

How about a new function:
void FdOBEX_SetTransportFormat(obex_t *self, enum fdobex_transport_format 
fmt);

Should not break anything :)

HS

RE: [openobex-users] [PATCH openobex 1/3] Add transport format member in fdobex_data struct. Support STREAM and SEQPACKET transport format.

[Li, Nami]

SGksIA0KIEkgdGhpbmsgaXRgcyBhIGdvb2QgaWRlYSB0byBjcmVhdGUgYSBuZXcgQVBJIDogRmRP
QkVYX1NldFRyYW5zcG9ydEZvcm1hdC4gIElgbGwgdXBkYXRlIG15IHBhdGNoZXMgaW4gbmV3IG1h
aWxzLg0KDQotLS0tLU9yaWdpbmFsIE1lc3NhZ2UtLS0tLQ0KRnJvbTogSGVuZHJpayBTYXR0bGVy
IFttYWlsdG86cG9zdEBoZW5kcmlrLXNhdHRsZXIuZGVdIA0KU2VudDogMjAxMcTqNtTCMjHI1SA0
OjQ0DQpUbzogb3Blbm9iZXgtdXNlcnNAbGlzdHMuc291cmNlZm9yZ2UubmV0DQpDYzogTWFyY2Vs
IEhvbHRtYW5uOyBMaSwgTmFtaTsgTGl1LCBIYWlqdW47IGxpbnV4LWJsdWV0b290aEB2Z2VyLmtl
cm5lbC5vcmcNClN1YmplY3Q6IFJlOiBbb3Blbm9iZXgtdXNlcnNdIFtQQVRDSCBvcGVub2JleCAx
LzNdIEFkZCB0cmFuc3BvcnQgZm9ybWF0IG1lbWJlciBpbiBmZG9iZXhfZGF0YSBzdHJ1Y3QuIFN1
cHBvcnQgU1RSRUFNIGFuZCBTRVFQQUNLRVQgdHJhbnNwb3J0IGZvcm1hdC4NCg0KSGksDQoNCkFt
IE1vbnRhZywgMjAuIEp1bmkgMjAxMSwgMjE6NDU6MTEgc2NocmllYiBNYXJjZWwgSG9sdG1hbm46
DQo+ID4gPiA+ICBpbmNsdWRlL29wZW5vYmV4L29iZXhfY29uc3QuaCB8ICAgIDQgKysrKw0KPiA+
ID4gPiAgbGliL2Zkb2JleC5oICAgICAgICAgICAgICAgICAgfCAgICAxICsNCj4gPiA+ID4gIDIg
ZmlsZXMgY2hhbmdlZCwgNSBpbnNlcnRpb25zKCspLCAwIGRlbGV0aW9ucygtKQ0KPiA+ID4gPiAN
Cj4gPiA+ID4gZGlmZiAtLWdpdCBhL2luY2x1ZGUvb3Blbm9iZXgvb2JleF9jb25zdC5oIA0KPiA+
ID4gPiBiL2luY2x1ZGUvb3Blbm9iZXgvb2JleF9jb25zdC5oIGluZGV4IGNiN2FmZWIuLjhhY2Vl
OTEgMTAwNjQ0DQo+ID4gPiA+IC0tLSBhL2luY2x1ZGUvb3Blbm9iZXgvb2JleF9jb25zdC5oDQo+
ID4gPiA+ICsrKyBiL2luY2x1ZGUvb3Blbm9iZXgvb2JleF9jb25zdC5oDQo+ID4gPiA+IEBAIC0z
MDIsNiArMzAyLDEwIEBAIGVudW0gb2JleF9yc3BfbW9kZSB7DQo+ID4gPiA+IA0KPiA+ID4gPiAg
ICBPQkVYX1JTUF9NT0RFX1NJTkdMRSA9IDEsIC8qKjwgc2luZ2xlIHJlc3BvbnNlIG1vZGUgKFNS
TSkgKi8NCj4gPiA+ID4gIA0KPiA+ID4gPiAgfTsNCj4gPiA+ID4gDQo+ID4gPiA+ICtlbnVtIGZk
b2JleF90cmFuc3BvcnRfZm9ybWF0ew0KPiA+ID4gPiArCSBGRE9CRVhfTVRfU1RSRUFNICwNCj4g
PiA+ID4gKwkgRkRPQkVYX01UX1NFUVBBQ0tFVA0KPiA+ID4gPiArfTsNCj4gPiA+IA0KPiA+ID4g
Y2FuIEkgYXNrIGFnYWluIHdoeSB3ZSBzaG91bGQgYmUgZG9pbmcgdGhpcy4gRXNwZWNpYWxseSBm
b3IgdGhlIA0KPiA+ID4gRmRPQkVYIHRyYW5zcG9ydCB0aGlzIGlzIHBvaW50bGVzcy4gWW91IGFy
ZSBnZXR0aW5nIGEgZmlsZSANCj4gPiA+IGRlc2NyaXB0b3IgaW4gdGhlIGZpcnN0IHBsYWNlLiBJ
dCBkb2VzIG5vdCBoYXZlIHRvIGJlIGEgc29ja2V0Lg0KPiA+ID4gDQo+ID4gPiBBbmQgaW4gdGhl
IGNhc2UgdGhpcyBpcyByZWFsbHkgYSBzb2NrZXQsIHRoZW4geW91IGNhbiBqdXN0IHVzZSANCj4g
PiA+IFNPX1RZUEUgdG8gcmVhZCB0aGUgY3VycmVudCB0eXBlIG9mIHRoZSBzb2NrZXQuDQo+ID4g
PiANCj4gPiA+IElmIGl0IGlzIG5vdCBhIHNvY2tldCwgdGhlbiBpdCBuZWVkcyB0byB0cmVhdGVk
IGFzIHN0cmVhbSBhbnl3YXkuDQo+ID4gDQo+ID4gTm8uIEV2ZXIgdHJpZWQgdGhhdCBvbiB0aGUg
bGludXggVVNCIGdhZGdldCBpbXBsZW1lbnRhdGlvbiBpbiBMaW51eD8gDQo+ID4gSWYgYSBGRCBp
cyBub3QgcG9pbnRpbmcgdG8gYSBzb2NrZXQsIGl0IGNhbiBzdGlsbCBwb2ludCB0byBhIGRldmlj
ZSANCj4gPiBmaWxlIG9mIHdoYXRldmVyIGtpbmQuIFlvdSBTT19UWVBFIHdvbid0IGNvbXBsZXRl
bHkgaGVscCBoZXJlLiBZb3UgDQo+ID4gY2FuIHRyeSBhbnkgYW1vdW50IG9mIGd1ZXNzaW5nIGJ1
dCBpc24ndCBpdCBlYXNpZXIgaWYgdGhlIA0KPiA+IGFwcGxpY2F0aW9uIGp1c3QgdGVsbHMgeW91
PyBPVE9ILCB0aGUgYXBwbGljYXRpb24gY291bGQganVzdCB1c2UgYSBjdXN0b20gdHJhbnNwb3J0
LCB0aGVuLg0KPiANCj4gcHJvYmxlbSBpcyB0aGF0IGVpdGhlciB3ZSBpbnRyb2R1Y2UgYSBuZXcg
YWJzdHJhY3Rpb24gb3Igd2UgZmlndXJlIA0KPiB0aGlzIG91dCBtYWdpY2FsbHkuIEJyZWFraW5n
IHRoZSBBUEkgbGlrZSB0aGlzIGlzIG5vdCBhIGdvb2QgaWRlYS4NCj4gDQo+IFNvIGlmIHdlIGdv
IGZvciBGZFBhY2tldE9CRVggb3Igc29tZXRoaW5nIGl0IG1pZ2h0IGJlIGEgcG9zc2libGUgDQo+
IG9wdGlvbiwgYnV0IGJyZWFraW5nIEZkT0JFWCBBUEkgaXMgbm90IGFuIG9wdGlvbi4NCg0KSG93
IGFib3V0IGEgbmV3IGZ1bmN0aW9uOg0Kdm9pZCBGZE9CRVhfU2V0VHJhbnNwb3J0Rm9ybWF0KG9i
ZXhfdCAqc2VsZiwgZW51bSBmZG9iZXhfdHJhbnNwb3J0X2Zvcm1hdCBmbXQpOw0KDQpTaG91bGQg
bm90IGJyZWFrIGFueXRoaW5nIDopDQoNCkhTDQo=