From: Marcel Holtmann <marcel@holtmann.org>
To: jcaden@libresoft.es
Cc: Claudio Takahasi <claudio.takahasi@openbossa.org>,
"linux-bluetooth@vger.kernel.org"
<linux-bluetooth@vger.kernel.org>
Subject: Re: [PATCH] SDP patch to add support for HDP
Date: Sat, 05 Dec 2009 17:25:50 +0100 [thread overview]
Message-ID: <1260030350.3041.25.camel@violet> (raw)
In-Reply-To: <200911171208.13972.jcaden@libresoft.es>
Hi Jose,
> > > This patch tries to simplify the way the SDP records for HDP are created.
> > > The created functions allow adding supported features easily to an sdp
> > > record. The are similar to sdp_set_profile_descs and
> > > sdp_get_profile_descs. I've also added some macros to define new UUID's
> > > for HDP.
> > Do you have an application or sdptool's patch to test these functions?
>
> We have an HDP/MCAP implementation that uses this functions. We are going to
> release it this week. Sancane and I are solving some problems with this code.
> We will announce here when this code is available.
>
> About the patch to sdptool: I didn't do anything but I can do it if you think
> that is a good task.
> I made some changes correcting all the problems that you suggested an other
> that I found.
> Here's the new pach:
so first of all, fix your mail client to submit this patch properly. If
it messes with it I can't apply it.
patch: **** malformed patch at line 161: SDP_ATTR_SUPPORTED_FEATURES_LIST, seqp);
>
> diff --git a/lib/sdp.c b/lib/sdp.c
> index 822ec1a..79f1261 100644
> --- a/lib/sdp.c
> +++ b/lib/sdp.c
> @@ -4621,3 +4621,87 @@ uint16_t sdp_gen_tid(sdp_session_t *session)
> {
> return session->tid++;
> }
> +
> +/*
> + * Set the supported features
> + */
> +void sdp_set_supp_feat(sdp_record_t *rec, const sdp_list_t *sf)
> +{
> + const sdp_list_t *p, *r;
> + sdp_data_t *feat, *seq_feat;
> +
> + int seqlen = sdp_list_len(sf);
> + void **seqDTDs = (void **)malloc (seqlen * sizeof(void *));
> + void **seqVals = (void **)malloc (seqlen * sizeof(void *));
This is a coding style violation in so many ways. Did you place the
whitespace in a random order.
So first of all. The casting should not be needed. And if, then after
that case you do space (void **) malloc.
Then malloc is a function and it is malloc( and not malloc (.
And also it is one space after an operator. So * sizeof.
Since you are accessing the allocated memory you need to check if malloc
succeeded or not.
> + int i = 0;
> +
> + for (p = sf; p; p = p->next) {
> + int plen = sdp_list_len(p->data);
> + void **dtds = (void **)malloc (plen * sizeof(void *));
> + void **vals = (void **)malloc (plen * sizeof(void *));
Same as above.
> + int j = 0;
> + for (r = p->data; r; r = r->next) {
> + sdp_data_t *data = (sdp_data_t*)r->data;
> + dtds[j] = &data->dtd;
> + vals[j] = &data->val;
> + j++;
> + }
> + feat = sdp_seq_alloc(dtds, vals, plen);
You need to check feat if the alloc succeeded.
> + free(dtds);
> + free(vals);
> +
> + seqDTDs[i] = &feat->dtd;
> + seqVals[i] = feat;
> + i++;
> + }
> + seq_feat = sdp_seq_alloc(seqDTDs, seqVals, seqlen);
Same as above.
> +
> + sdp_attr_replace(rec, SDP_ATTR_SUPPORTED_FEATURES_LIST, seq_feat);
> +
> + free(seqDTDs);
> + free(seqVals);
> +}
> +
> +/*
> + * Get the supported features
> + * If an error occurred -1 is returned and errno is set
> + */
> +int sdp_get_supp_feat (const sdp_record_t *rec, sdp_list_t **seqp)
> +{
> + sdp_data_t * sdpdata, *d;
> + sdp_list_t * next;
> + *seqp = NULL;
> +
> + sdpdata = sdp_data_get(rec, SDP_ATTR_SUPPORTED_FEATURES_LIST);
> +
> + if (!sdpdata || sdpdata->dtd < SDP_SEQ8 || sdpdata->dtd > SDP_SEQ32)
> + return sdp_get_uuidseq_attr(rec,
> SDP_ATTR_SUPPORTED_FEATURES_LIST, seqp);
Here is where your mailer fully screwed it up ;)
> +
> + for (d = sdpdata->val.dataseq; d; d = d->next) {
> + sdp_data_t *dd;
> + sdp_list_t *subseq;
> + subseq = NULL;
> + if ( d->dtd < SDP_SEQ8 || d->dtd > SDP_SEQ32 )
> + goto fail;
What are these extra whitespace after ( and before ) about. Remove them.
> + for (dd = d->val.dataseq; dd; dd = dd->next) {
> + sdp_data_t *data;
> + if ( dd->dtd != SDP_UINT8 && dd->dtd != SDP_UINT16 &&
> + dd->dtd != SDP_TEXT_STR8)
Smae as above.
>
> + goto fail;
> + data = sdp_data_alloc(dd->dtd, &dd->val);
We might wanna check that alloc succeeded.
>
> + subseq = sdp_list_append(subseq, data);
> + }
> + *seqp = sdp_list_append (*seqp, subseq);
Where does this whitespace come from? It is _append(.
>
> + }
> + return 0;
> +
> +fail:
> + while (*seqp) {
> + next = (*seqp)->next;
> + sdp_list_free(*seqp, free);
> + *seqp = next;
> + }
> + errno = EINVAL;
> + return -1;
> +}
> +
> diff --git a/lib/sdp.h b/lib/sdp.h
> index 375261e..1bb351a 100644
> --- a/lib/sdp.h
> +++ b/lib/sdp.h
> @@ -244,13 +244,16 @@ extern "C" {
> #define SDP_ATTR_GROUP_ID 0x0200
> #define SDP_ATTR_IP_SUBNET 0x0200
> #define SDP_ATTR_VERSION_NUM_LIST 0x0200
> +#define SDP_ATTR_SUPPORTED_FEATURES_LIST 0x0200
> #define SDP_ATTR_SVCDB_STATE 0x0201
Why does this look to shitty now?
> #define SDP_ATTR_SERVICE_VERSION 0x0300
> #define SDP_ATTR_EXTERNAL_NETWORK 0x0301
> #define SDP_ATTR_SUPPORTED_DATA_STORES_LIST 0x0301
> +#define SDP_ATTR_DATA_EXCHANGE_SPEC 0x0301
> #define SDP_ATTR_FAX_CLASS1_SUPPORT 0x0302
> #define SDP_ATTR_REMOTE_AUDIO_VOLUME_CONTROL 0x0302
> +#define SDP_ATTR_MCAP_SUPPORTED_PROCEDURES 0x0302
> #define SDP_ATTR_FAX_CLASS20_SUPPORT 0x0303
> #define SDP_ATTR_SUPPORTED_FORMATS_LIST 0x0303
> #define SDP_ATTR_FAX_CLASS2_SUPPORT 0x0304
Same here.
> diff --git a/lib/sdp_lib.h b/lib/sdp_lib.h
> index ee39df8..41d5786 100644
> --- a/lib/sdp_lib.h
> +++ b/lib/sdp_lib.h
> @@ -585,6 +585,19 @@ static inline int sdp_get_icon_url(const sdp_record_t
> *rec, char *str, int len)
> return sdp_get_string_attr(rec, SDP_ATTR_ICON_URL, str, len);
> }
>
> +/*
> + * Set the supported features
> + * sf should be a list of list with each feature data
> + */
> +void sdp_set_supp_feat(sdp_record_t *rec, const sdp_list_t *sf);
> +
> +/*
> + * Get the supported features
> + * seqp is set to a list of list with each feature data
> + * If an error occurred -1 is returned and errno is set
> + */
> +int sdp_get_supp_feat (const sdp_record_t *rec, sdp_list_t **seqp);
And what is this whitespace doing here?
Regards
Marcel
next prev parent reply other threads:[~2009-12-05 16:25 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-13 12:43 [PATCH] SDP patch to add support for HDP José Antonio Santos Cadenas
2009-11-16 17:30 ` Claudio Takahasi
2009-11-16 17:52 ` Claudio Takahasi
2009-11-17 11:08 ` José Antonio Santos Cadenas
2009-12-05 16:25 ` Marcel Holtmann [this message]
2009-12-10 10:49 ` José Antonio Santos Cadenas
2009-12-10 10:50 ` José Antonio Santos Cadenas
2009-12-10 21:59 ` Marcel Holtmann
2009-12-11 9:21 ` José Antonio Santos Cadenas
2009-12-11 18:32 ` Marcel Holtmann
2009-12-14 11:35 ` José Antonio Santos Cadenas
2009-12-14 20:25 ` Marcel Holtmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1260030350.3041.25.camel@violet \
--to=marcel@holtmann.org \
--cc=claudio.takahasi@openbossa.org \
--cc=jcaden@libresoft.es \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.