Deleted Added
full compact
parser.y (121054) parser.y (133178)
1%{
2/*
3 * parser.y
4 *
5 * Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
6 * All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 13 unchanged lines hidden (view full) ---

22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
29 * $Id: parser.y,v 1.5 2003/06/07 21:22:30 max Exp $
1%{
2/*
3 * parser.y
4 *
5 * Copyright (c) 2001-2002 Maksim Yevmenkin <m_evmenkin@yahoo.com>
6 * All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 13 unchanged lines hidden (view full) ---

22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
29 * $Id: parser.y,v 1.5 2003/06/07 21:22:30 max Exp $
30 * $FreeBSD: head/usr.sbin/bluetooth/hcsecd/parser.y 121054 2003-10-12 22:04:24Z emax $
30 * $FreeBSD: head/usr.sbin/bluetooth/hcsecd/parser.y 133178 2004-08-05 16:32:41Z emax $
31 */
32
33#include <sys/fcntl.h>
34#include <sys/queue.h>
35#include <bluetooth.h>
36#include <errno.h>
37#include <limits.h>
38#include <stdio.h>

--- 62 unchanged lines hidden (view full) ---

101 | name
102 | key
103 | pin
104 ;
105
106bdaddr: T_BDADDR T_BDADDRSTRING
107 {
108 if (!bt_aton($2, &key->bdaddr)) {
31 */
32
33#include <sys/fcntl.h>
34#include <sys/queue.h>
35#include <bluetooth.h>
36#include <errno.h>
37#include <limits.h>
38#include <stdio.h>

--- 62 unchanged lines hidden (view full) ---

101 | name
102 | key
103 | pin
104 ;
105
106bdaddr: T_BDADDR T_BDADDRSTRING
107 {
108 if (!bt_aton($2, &key->bdaddr)) {
109 syslog(LOG_ERR, "Cound not parse BDADDR " \
109 syslog(LOG_ERR, "Cound not parse BD_ADDR " \
110 "'%s'", $2);
111 exit(1);
112 }
113 }
114 ;
115
116name: T_NAME T_STRING
117 {

--- 11 unchanged lines hidden (view full) ---

129
130key: T_KEY T_HEXSTRING
131 {
132 int i, len;
133
134 if (key->key != NULL)
135 free(key->key);
136
110 "'%s'", $2);
111 exit(1);
112 }
113 }
114 ;
115
116name: T_NAME T_STRING
117 {

--- 11 unchanged lines hidden (view full) ---

129
130key: T_KEY T_HEXSTRING
131 {
132 int i, len;
133
134 if (key->key != NULL)
135 free(key->key);
136
137 key->key = (u_int8_t *) malloc(NG_HCI_KEY_SIZE);
137 key->key = (uint8_t *) malloc(NG_HCI_KEY_SIZE);
138 if (key->key == NULL) {
139 syslog(LOG_ERR, "Could not allocate new " \
140 "link key");
141 exit(1);
142 }
143
144 memset(key->key, 0, NG_HCI_KEY_SIZE);
145

--- 167 unchanged lines hidden (view full) ---

313
314 if (!bt_aton(p, &bdaddr))
315 continue;
316
317 if ((key = get_key(&bdaddr, 1)) == NULL)
318 continue;
319
320 if (key->key == NULL) {
138 if (key->key == NULL) {
139 syslog(LOG_ERR, "Could not allocate new " \
140 "link key");
141 exit(1);
142 }
143
144 memset(key->key, 0, NG_HCI_KEY_SIZE);
145

--- 167 unchanged lines hidden (view full) ---

313
314 if (!bt_aton(p, &bdaddr))
315 continue;
316
317 if ((key = get_key(&bdaddr, 1)) == NULL)
318 continue;
319
320 if (key->key == NULL) {
321 key->key = (u_int8_t *) malloc(NG_HCI_KEY_SIZE);
321 key->key = (uint8_t *) malloc(NG_HCI_KEY_SIZE);
322 if (key->key == NULL) {
323 syslog(LOG_ERR, "Could not allocate link key");
324 exit(1);
325 }
326 }
327
328 memset(key->key, 0, NG_HCI_KEY_SIZE);
329

--- 103 unchanged lines hidden ---
322 if (key->key == NULL) {
323 syslog(LOG_ERR, "Could not allocate link key");
324 exit(1);
325 }
326 }
327
328 memset(key->key, 0, NG_HCI_KEY_SIZE);
329

--- 103 unchanged lines hidden ---