wpa_supplicant: Update to 07-Jul-2012 TOT

[android-x86/external-wpa_supplicant_8.git] / src / wps / ndef.c

diff --git a/src/wps/ndef.c b/src/wps/ndef.c
index 9baec7f..7630ecb 100644 (file)
--- a/src/wps/ndef.c
+++ b/src/wps/ndef.c
@@ -1,16 +1,10 @@
 /*
  * NDEF(NFC Data Exchange Format) routines for Wi-Fi Protected Setup
  *   Reference is "NFCForum-TS-NDEF_1.0 2006-07-24".
- * Copyright (c) 2009, Masashi Honma <honma@ictec.co.jp>
+ * Copyright (c) 2009-2012, Masashi Honma <masashi.honma@gmail.com>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * Alternatively, this software may be distributed under the terms of BSD
- * license.
- *
- * See README and COPYING for more details.
+ * This software may be distributed under the terms of the BSD license.
+ * See README for more details.
  */
 
 #include "includes.h"
@@ -26,9 +20,9 @@
 #define FLAG_TNF_RFC2046 (0x02)
 
 struct ndef_record {
-       u8 *type;
-       u8 *id;
-       u8 *payload;
+       const u8 *type;
+       const u8 *id;
+       const u8 *payload;
        u8 type_length;
        u8 id_length;
        u32 payload_length;
@@ -37,9 +31,10 @@ struct ndef_record {
 
 static char wifi_handover_type[] = "application/vnd.wfa.wsc";
 
-static int ndef_parse_record(u8 *data, u32 size, struct ndef_record *record)
+static int ndef_parse_record(const u8 *data, u32 size,
+                            struct ndef_record *record)
 {
-       u8 *pos = data + 1;
+       const u8 *pos = data + 1;
 
        if (size < 2)
                return -1;
@@ -78,12 +73,12 @@ static int ndef_parse_record(u8 *data, u32 size, struct ndef_record *record)
 }
 
 
-static struct wpabuf * ndef_parse_records(struct wpabuf *buf,
+static struct wpabuf * ndef_parse_records(const struct wpabuf *buf,
                                          int (*filter)(struct ndef_record *))
 {
        struct ndef_record record;
        int len = wpabuf_len(buf);
-       u8 *data = wpabuf_mhead(buf);
+       const u8 *data = wpabuf_head(buf);
 
        while (len > 0) {
                if (ndef_parse_record(data, len, &record) < 0) {
@@ -103,13 +98,14 @@ static struct wpabuf * ndef_parse_records(struct wpabuf *buf,
 
 static struct wpabuf * ndef_build_record(u8 flags, void *type,
                                         u8 type_length, void *id,
-                                        u8 id_length, void *payload,
-                                        u32 payload_length)
+                                        u8 id_length,
+                                        const struct wpabuf *payload)
 {
        struct wpabuf *record;
        size_t total_len;
        int short_record;
        u8 local_flag;
+       size_t payload_length = wpabuf_len(payload);
 
        short_record = payload_length < 256 ? 1 : 0;
 
@@ -144,7 +140,7 @@ static struct wpabuf * ndef_build_record(u8 flags, void *type,
                wpabuf_put_u8(record, id_length);
        wpabuf_put_data(record, type, type_length);
        wpabuf_put_data(record, id, id_length);
-       wpabuf_put_data(record, payload, payload_length);
+       wpabuf_put_buf(record, payload);
        return record;
 }
 
@@ -160,16 +156,15 @@ static int wifi_filter(struct ndef_record *record)
 }
 
 
-struct wpabuf * ndef_parse_wifi(struct wpabuf *buf)
+struct wpabuf * ndef_parse_wifi(const struct wpabuf *buf)
 {
        return ndef_parse_records(buf, wifi_filter);
 }
 
 
-struct wpabuf * ndef_build_wifi(struct wpabuf *buf)
+struct wpabuf * ndef_build_wifi(const struct wpabuf *buf)
 {
        return ndef_build_record(FLAG_MESSAGE_BEGIN | FLAG_MESSAGE_END |
                                 FLAG_TNF_RFC2046, wifi_handover_type,
-                                os_strlen(wifi_handover_type), NULL, 0,
-                                wpabuf_mhead(buf), wpabuf_len(buf));
+                                os_strlen(wifi_handover_type), NULL, 0, buf);
 }