Revision f1d078c3
| b/Makefile | ||
|---|---|---|
| 99 | 99 |
block-obj-y += $(addprefix block/, $(block-nested-y)) |
| 100 | 100 |
|
| 101 | 101 |
net-obj-y = net.o |
| 102 |
net-nested-y = queue.o checksum.o |
|
| 102 |
net-nested-y = queue.o checksum.o util.o
|
|
| 103 | 103 |
net-nested-y += socket.o |
| 104 | 104 |
net-nested-y += dump.o |
| 105 | 105 |
net-nested-$(CONFIG_POSIX) += tap.o |
| b/net.c | ||
|---|---|---|
| 30 | 30 |
#include "net/dump.h" |
| 31 | 31 |
#include "net/slirp.h" |
| 32 | 32 |
#include "net/vde.h" |
| 33 |
#include "net/util.h" |
|
| 33 | 34 |
#include "monitor.h" |
| 34 | 35 |
#include "sysemu.h" |
| 35 | 36 |
#include "qemu-common.h" |
| ... | ... | |
| 69 | 70 |
} |
| 70 | 71 |
#endif |
| 71 | 72 |
|
| 72 |
static int parse_macaddr(uint8_t *macaddr, const char *p) |
|
| 73 |
{
|
|
| 74 |
int i; |
|
| 75 |
char *last_char; |
|
| 76 |
long int offset; |
|
| 77 |
|
|
| 78 |
errno = 0; |
|
| 79 |
offset = strtol(p, &last_char, 0); |
|
| 80 |
if (0 == errno && '\0' == *last_char && |
|
| 81 |
offset >= 0 && offset <= 0xFFFFFF) {
|
|
| 82 |
macaddr[3] = (offset & 0xFF0000) >> 16; |
|
| 83 |
macaddr[4] = (offset & 0xFF00) >> 8; |
|
| 84 |
macaddr[5] = offset & 0xFF; |
|
| 85 |
return 0; |
|
| 86 |
} else {
|
|
| 87 |
for(i = 0; i < 6; i++) {
|
|
| 88 |
macaddr[i] = strtol(p, (char **)&p, 16); |
|
| 89 |
if (i == 5) {
|
|
| 90 |
if (*p != '\0') |
|
| 91 |
return -1; |
|
| 92 |
} else {
|
|
| 93 |
if (*p != ':' && *p != '-') |
|
| 94 |
return -1; |
|
| 95 |
p++; |
|
| 96 |
} |
|
| 97 |
} |
|
| 98 |
return 0; |
|
| 99 |
} |
|
| 100 |
|
|
| 101 |
return -1; |
|
| 102 |
} |
|
| 103 |
|
|
| 104 | 73 |
static int get_str_sep(char *buf, int buf_size, const char **pp, int sep) |
| 105 | 74 |
{
|
| 106 | 75 |
const char *p, *p1; |
| ... | ... | |
| 858 | 827 |
nd->macaddr[5] = 0x56 + idx; |
| 859 | 828 |
|
| 860 | 829 |
if (qemu_opt_get(opts, "macaddr") && |
| 861 |
parse_macaddr(nd->macaddr, qemu_opt_get(opts, "macaddr")) < 0) {
|
|
| 830 |
net_parse_macaddr(nd->macaddr, qemu_opt_get(opts, "macaddr")) < 0) {
|
|
| 862 | 831 |
qemu_error("invalid syntax for ethernet address\n");
|
| 863 | 832 |
return -1; |
| 864 | 833 |
} |
| b/net/util.c | ||
|---|---|---|
| 1 |
/* |
|
| 2 |
* QEMU System Emulator |
|
| 3 |
* |
|
| 4 |
* Copyright (c) 2003-2008 Fabrice Bellard |
|
| 5 |
* |
|
| 6 |
* Permission is hereby granted, free of charge, to any person obtaining a copy |
|
| 7 |
* of this software and associated documentation files (the "Software"), to deal |
|
| 8 |
* in the Software without restriction, including without limitation the rights |
|
| 9 |
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell |
|
| 10 |
* copies of the Software, and to permit persons to whom the Software is |
|
| 11 |
* furnished to do so, subject to the following conditions: |
|
| 12 |
* |
|
| 13 |
* The above copyright notice and this permission notice shall be included in |
|
| 14 |
* all copies or substantial portions of the Software. |
|
| 15 |
* |
|
| 16 |
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
|
| 17 |
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
|
| 18 |
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL |
|
| 19 |
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
|
| 20 |
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
|
| 21 |
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN |
|
| 22 |
* THE SOFTWARE. |
|
| 23 |
*/ |
|
| 24 |
|
|
| 25 |
#include "net/util.h" |
|
| 26 |
#include <errno.h> |
|
| 27 |
#include <stdlib.h> |
|
| 28 |
|
|
| 29 |
int net_parse_macaddr(uint8_t *macaddr, const char *p) |
|
| 30 |
{
|
|
| 31 |
int i; |
|
| 32 |
char *last_char; |
|
| 33 |
long int offset; |
|
| 34 |
|
|
| 35 |
errno = 0; |
|
| 36 |
offset = strtol(p, &last_char, 0); |
|
| 37 |
if (errno == 0 && *last_char == '\0' && |
|
| 38 |
offset >= 0 && offset <= 0xFFFFFF) {
|
|
| 39 |
macaddr[3] = (offset & 0xFF0000) >> 16; |
|
| 40 |
macaddr[4] = (offset & 0xFF00) >> 8; |
|
| 41 |
macaddr[5] = offset & 0xFF; |
|
| 42 |
return 0; |
|
| 43 |
} |
|
| 44 |
|
|
| 45 |
for (i = 0; i < 6; i++) {
|
|
| 46 |
macaddr[i] = strtol(p, (char **)&p, 16); |
|
| 47 |
if (i == 5) {
|
|
| 48 |
if (*p != '\0') {
|
|
| 49 |
return -1; |
|
| 50 |
} |
|
| 51 |
} else {
|
|
| 52 |
if (*p != ':' && *p != '-') {
|
|
| 53 |
return -1; |
|
| 54 |
} |
|
| 55 |
p++; |
|
| 56 |
} |
|
| 57 |
} |
|
| 58 |
|
|
| 59 |
return 0; |
|
| 60 |
} |
|
| b/net/util.h | ||
|---|---|---|
| 1 |
/* |
|
| 2 |
* QEMU System Emulator |
|
| 3 |
* |
|
| 4 |
* Copyright (c) 2003-2008 Fabrice Bellard |
|
| 5 |
* |
|
| 6 |
* Permission is hereby granted, free of charge, to any person obtaining a copy |
|
| 7 |
* of this software and associated documentation files (the "Software"), to deal |
|
| 8 |
* in the Software without restriction, including without limitation the rights |
|
| 9 |
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell |
|
| 10 |
* copies of the Software, and to permit persons to whom the Software is |
|
| 11 |
* furnished to do so, subject to the following conditions: |
|
| 12 |
* |
|
| 13 |
* The above copyright notice and this permission notice shall be included in |
|
| 14 |
* all copies or substantial portions of the Software. |
|
| 15 |
* |
|
| 16 |
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR |
|
| 17 |
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
|
| 18 |
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL |
|
| 19 |
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER |
|
| 20 |
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
|
| 21 |
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN |
|
| 22 |
* THE SOFTWARE. |
|
| 23 |
*/ |
|
| 24 |
|
|
| 25 |
#ifndef QEMU_NET_UTIL_H |
|
| 26 |
#define QEMU_NET_UTIL_H |
|
| 27 |
|
|
| 28 |
#include <stdint.h> |
|
| 29 |
|
|
| 30 |
int net_parse_macaddr(uint8_t *macaddr, const char *p); |
|
| 31 |
|
|
| 32 |
#endif /* QEMU_NET_UTIL_H */ |
|
Also available in: Unified diff