* [PATCH BlueZ] monitor: Add helper functions to get data from L2CAP frames
@ 2014-08-22 10:25 Luiz Augusto von Dentz
2014-08-25 8:49 ` Luiz Augusto von Dentz
0 siblings, 1 reply; 2+ messages in thread
From: Luiz Augusto von Dentz @ 2014-08-22 10:25 UTC (permalink / raw)
To: linux-bluetooth
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
---
monitor/l2cap.h | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 file changed, 109 insertions(+), 9 deletions(-)
diff --git a/monitor/l2cap.h b/monitor/l2cap.h
index a0f844b..645e3ef 100644
--- a/monitor/l2cap.h
+++ b/monitor/l2cap.h
@@ -40,15 +40,115 @@ struct l2cap_frame {
static inline void l2cap_frame_pull(struct l2cap_frame *frame,
const struct l2cap_frame *source, uint16_t len)
{
- frame->index = source->index;
- frame->in = source->in;
- frame->handle = source->handle;
- frame->cid = source->cid;
- frame->psm = source->psm;
- frame->chan = source->chan;
- frame->mode = source->mode;
- frame->data = source->data + len;
- frame->size = source->size - len;
+ if (frame != source) {
+ frame->index = source->index;
+ frame->in = source->in;
+ frame->handle = source->handle;
+ frame->cid = source->cid;
+ frame->psm = source->psm;
+ frame->chan = source->chan;
+ frame->mode = source->mode;
+ }
+
+ frame->data = source->data + len;
+ frame->size = source->size - len;
+}
+
+static inline int l2cap_frame_get_u8(struct l2cap_frame *frame, uint8_t *value)
+{
+ if (frame->size < sizeof(*value))
+ return -1;
+
+ if (value)
+ *value = *((uint8_t *) frame->data);
+
+ l2cap_frame_pull(frame, frame, sizeof(*value));
+
+ return 0;
+}
+
+static inline int l2cap_frame_get_be16(struct l2cap_frame *frame,
+ uint16_t *value)
+{
+ if (frame->size < sizeof(*value))
+ return -1;
+
+ if (value)
+ *value = get_be16(frame->data);
+
+ l2cap_frame_pull(frame, frame, sizeof(*value));
+
+ return 0;
+}
+
+static inline int l2cap_frame_get_le16(struct l2cap_frame *frame,
+ uint16_t *value)
+{
+ if (frame->size < sizeof(*value))
+ return -1;
+
+ if (value)
+ *value = get_le16(frame->data);
+
+ l2cap_frame_pull(frame, frame, sizeof(*value));
+
+ return 0;
+}
+
+static inline int l2cap_frame_get_be32(struct l2cap_frame *frame,
+ uint32_t *value)
+{
+ if (frame->size < sizeof(*value))
+ return -1;
+
+ if (value)
+ *value = get_be32(frame->data);
+
+ l2cap_frame_pull(frame, frame, sizeof(*value));
+
+ return 0;
+}
+
+static inline int l2cap_frame_get_le32(struct l2cap_frame *frame,
+ uint32_t *value)
+{
+ if (frame->size < sizeof(*value))
+ return -1;
+
+ if (value)
+ *value = get_le32(frame->data);
+
+ l2cap_frame_pull(frame, frame, sizeof(*value));
+
+ return 0;
+}
+
+static inline int l2cap_frame_get_be64(struct l2cap_frame *frame,
+ uint64_t *value)
+{
+ if (frame->size < sizeof(*value))
+ return -1;
+
+ if (value)
+ *value = get_be64(frame->data);
+
+ l2cap_frame_pull(frame, frame, sizeof(*value));
+
+ return 0;
+}
+
+static inline int l2cap_frame_get_le64(struct l2cap_frame *frame,
+ uint64_t *value)
+{
+ if (frame->size < sizeof(*value))
+ return -1;
+
+ if (value)
+ *value = get_le64(frame->data);
+
+ l2cap_frame_pull(frame, frame, sizeof(*value));
+
+ return 0;
}
void l2cap_packet(uint16_t index, bool in, uint16_t handle, uint8_t flags,
--
1.9.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH BlueZ] monitor: Add helper functions to get data from L2CAP frames
2014-08-22 10:25 [PATCH BlueZ] monitor: Add helper functions to get data from L2CAP frames Luiz Augusto von Dentz
@ 2014-08-25 8:49 ` Luiz Augusto von Dentz
0 siblings, 0 replies; 2+ messages in thread
From: Luiz Augusto von Dentz @ 2014-08-25 8:49 UTC (permalink / raw)
To: linux-bluetooth
Hi,
On Fri, Aug 22, 2014 at 1:25 PM, Luiz Augusto von Dentz
<luiz.dentz@gmail.com> wrote:
> From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
>
> ---
> monitor/l2cap.h | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
> 1 file changed, 109 insertions(+), 9 deletions(-)
>
> diff --git a/monitor/l2cap.h b/monitor/l2cap.h
> index a0f844b..645e3ef 100644
> --- a/monitor/l2cap.h
> +++ b/monitor/l2cap.h
> @@ -40,15 +40,115 @@ struct l2cap_frame {
> static inline void l2cap_frame_pull(struct l2cap_frame *frame,
> const struct l2cap_frame *source, uint16_t len)
> {
> - frame->index = source->index;
> - frame->in = source->in;
> - frame->handle = source->handle;
> - frame->cid = source->cid;
> - frame->psm = source->psm;
> - frame->chan = source->chan;
> - frame->mode = source->mode;
> - frame->data = source->data + len;
> - frame->size = source->size - len;
> + if (frame != source) {
> + frame->index = source->index;
> + frame->in = source->in;
> + frame->handle = source->handle;
> + frame->cid = source->cid;
> + frame->psm = source->psm;
> + frame->chan = source->chan;
> + frame->mode = source->mode;
> + }
> +
> + frame->data = source->data + len;
> + frame->size = source->size - len;
> +}
> +
> +static inline int l2cap_frame_get_u8(struct l2cap_frame *frame, uint8_t *value)
> +{
> + if (frame->size < sizeof(*value))
> + return -1;
> +
> + if (value)
> + *value = *((uint8_t *) frame->data);
> +
> + l2cap_frame_pull(frame, frame, sizeof(*value));
> +
> + return 0;
> +}
> +
> +static inline int l2cap_frame_get_be16(struct l2cap_frame *frame,
> + uint16_t *value)
> +{
> + if (frame->size < sizeof(*value))
> + return -1;
> +
> + if (value)
> + *value = get_be16(frame->data);
> +
> + l2cap_frame_pull(frame, frame, sizeof(*value));
> +
> + return 0;
> +}
> +
> +static inline int l2cap_frame_get_le16(struct l2cap_frame *frame,
> + uint16_t *value)
> +{
> + if (frame->size < sizeof(*value))
> + return -1;
> +
> + if (value)
> + *value = get_le16(frame->data);
> +
> + l2cap_frame_pull(frame, frame, sizeof(*value));
> +
> + return 0;
> +}
> +
> +static inline int l2cap_frame_get_be32(struct l2cap_frame *frame,
> + uint32_t *value)
> +{
> + if (frame->size < sizeof(*value))
> + return -1;
> +
> + if (value)
> + *value = get_be32(frame->data);
> +
> + l2cap_frame_pull(frame, frame, sizeof(*value));
> +
> + return 0;
> +}
> +
> +static inline int l2cap_frame_get_le32(struct l2cap_frame *frame,
> + uint32_t *value)
> +{
> + if (frame->size < sizeof(*value))
> + return -1;
> +
> + if (value)
> + *value = get_le32(frame->data);
> +
> + l2cap_frame_pull(frame, frame, sizeof(*value));
> +
> + return 0;
> +}
> +
> +static inline int l2cap_frame_get_be64(struct l2cap_frame *frame,
> + uint64_t *value)
> +{
> + if (frame->size < sizeof(*value))
> + return -1;
> +
> + if (value)
> + *value = get_be64(frame->data);
> +
> + l2cap_frame_pull(frame, frame, sizeof(*value));
> +
> + return 0;
> +}
> +
> +static inline int l2cap_frame_get_le64(struct l2cap_frame *frame,
> + uint64_t *value)
> +{
> + if (frame->size < sizeof(*value))
> + return -1;
> +
> + if (value)
> + *value = get_le64(frame->data);
> +
> + l2cap_frame_pull(frame, frame, sizeof(*value));
> +
> + return 0;
> }
>
> void l2cap_packet(uint16_t index, bool in, uint16_t handle, uint8_t flags,
> --
> 1.9.3
Pushed.
--
Luiz Augusto von Dentz
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-08-25 8:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-08-22 10:25 [PATCH BlueZ] monitor: Add helper functions to get data from L2CAP frames Luiz Augusto von Dentz
2014-08-25 8:49 ` Luiz Augusto von Dentz
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.