platform-dependent part in kernel for easy access to OS functions.
+2013-10-15 Vladimir Serbinenko <phcoder@gmail.com>
+
+ Split emunet into platform-dependent and GRUB-binding parts. Keep
+ platform-dependent part in kernel for easy access to OS functions.
+
2013-10-15 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/tests/video_checksum.c: Use grub_util_fd_* rather than
EXTRA_DIST += grub-core/osdep/linux/getroot.c
EXTRA_DIST += grub-core/osdep/sun/getroot.c
-EXTRA_DIST += grub-core/osdep/basic/emunet.c
EXTRA_DIST += grub-core/osdep/basic/random.c
EXTRA_DIST += grub-core/osdep/basic/ofpath.c
EXTRA_DIST += grub-core/osdep/unix/random.c
EXTRA_DIST += grub-core/osdep/unix/sleep.c
-EXTRA_DIST += grub-core/osdep/linux/emunet.c
EXTRA_DIST += grub-core/osdep/linux/ofpath.c
EXTRA_DIST += grub-core/osdep/windows/password.c
KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/datetime.h
KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/emu/misc.h
KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/emu/export.h
+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/emu/net.h
KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/emu/hostdisk.h
KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/extcmd.h
if COND_GRUB_EMU_SDL
extra_dist = osdep/windows/emuconsole.c;
emu = osdep/sleep.c;
emu = osdep/init.c;
+ emu = osdep/emunet.c;
+ extra_dist = osdep/linux/emunet.c;
+ extra_dist = osdep/basic/emunet.c;
videoinkernel = term/gfxterm.c;
videoinkernel = font/font.c;
module = {
name = emunet;
- emu = osdep/emunet.c;
+ emu = net/drivers/emu/emunet.c;
enable = emu;
};
--- /dev/null
+/*
+ * GRUB -- GRand Unified Bootloader
+ * Copyright (C) 2010,2011,2012,2013 Free Software Foundation, Inc.
+ *
+ * GRUB is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GRUB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GRUB. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <grub/dl.h>
+#include <grub/net/netbuff.h>
+#include <grub/net.h>
+#include <grub/term.h>
+#include <grub/i18n.h>
+#include <grub/emu/net.h>
+
+GRUB_MOD_LICENSE ("GPLv3+");
+
+static grub_err_t
+send_card_buffer (struct grub_net_card *dev __attribute__ ((unused)),
+ struct grub_net_buff *pack);
+
+static struct grub_net_buff *
+get_card_packet (struct grub_net_card *dev __attribute__ ((unused)));
+
+static struct grub_net_card_driver emudriver =
+ {
+ .name = "emu",
+ .send = send_card_buffer,
+ .recv = get_card_packet
+ };
+
+static struct grub_net_card emucard =
+ {
+ .name = "emu0",
+ .driver = &emudriver,
+ .mtu = 1500,
+ .default_address = {
+ .type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET,
+ {.mac = {0, 1, 2, 3, 4, 5}}
+ },
+ .flags = 0
+ };
+
+static grub_err_t
+send_card_buffer (struct grub_net_card *dev __attribute__ ((unused)),
+ struct grub_net_buff *pack)
+{
+ grub_ssize_t actual;
+
+ actual = grub_emunet_send (pack->data, pack->tail - pack->data);
+ if (actual < 0)
+ return grub_error (GRUB_ERR_IO, N_("couldn't send network packet"));
+
+ return GRUB_ERR_NONE;
+}
+
+static struct grub_net_buff *
+get_card_packet (struct grub_net_card *dev __attribute__ ((unused)))
+{
+ grub_ssize_t actual;
+ struct grub_net_buff *nb;
+
+ nb = grub_netbuff_alloc (emucard.mtu + 36 + 2);
+ if (!nb)
+ return NULL;
+
+ /* Reserve 2 bytes so that 2 + 14/18 bytes of ethernet header is divisible
+ by 4. So that IP header is aligned on 4 bytes. */
+ grub_netbuff_reserve (nb, 2);
+ if (!nb)
+ {
+ grub_netbuff_free (nb);
+ return NULL;
+ }
+
+ actual = grub_emunet_receive (nb->data, emucard.mtu + 36);
+ if (actual < 0)
+ {
+ grub_netbuff_free (nb);
+ return NULL;
+ }
+ grub_netbuff_put (nb, actual);
+
+ return nb;
+}
+
+static int registered = 0;
+
+GRUB_MOD_INIT(emunet)
+{
+ if (grub_emunet_create (&emucard.mtu))
+ {
+ grub_net_card_register (&emucard);
+ registered = 1;
+ }
+}
+
+GRUB_MOD_FINI(emunet)
+{
+ if (registered)
+ {
+ grub_emunet_close ();
+ grub_net_card_unregister (&emucard);
+ registered = 0;
+ }
+}
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <grub/dl.h>
+#include <config.h>
+#include <config-util.h>
-GRUB_MOD_LICENSE ("GPLv3+");
+#include <grub/i18n.h>
+#include <grub/emu/net.h>
+
+grub_ssize_t
+grub_emunet_send (const void *packet __attribute__ ((unused)),
+ grub_size_t sz __attribute__ ((unused)))
+{
+ return -1;
+}
+
+grub_ssize_t
+grub_emunet_receive (void *packet __attribute__ ((unused)),
+ grub_size_t sz __attribute__ ((unused)))
+{
+ return -1;
+}
+
+int
+grub_emunet_create (grub_size_t *mtu)
+{
+ *mtu = 1500;
+ return -1;
+}
+
+void
+grub_emunet_close (void)
+{
+ return;
+}
* along with GRUB. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <grub/dl.h>
-#include <grub/net/netbuff.h>
+#include <config.h>
+#include <config-util.h>
+
#include <sys/socket.h>
-#include <grub/net.h>
#include <sys/types.h>
#include <linux/if.h>
#include <linux/if_tun.h>
+#include <unistd.h>
#include <sys/ioctl.h>
#include <fcntl.h>
-#include <unistd.h>
-#include <grub/term.h>
-#include <grub/i18n.h>
+#include <string.h>
-GRUB_MOD_LICENSE ("GPLv3+");
+#include <grub/emu/net.h>
static int fd;
-static grub_err_t
-send_card_buffer (struct grub_net_card *dev __attribute__ ((unused)),
- struct grub_net_buff *pack)
+grub_ssize_t
+grub_emunet_send (const void *packet, grub_size_t sz)
{
- ssize_t actual;
-
- actual = write (fd, pack->data, pack->tail - pack->data);
- if (actual < 0)
- return grub_error (GRUB_ERR_IO, N_("couldn't send network packet"));
-
- return GRUB_ERR_NONE;
+ return write (fd, packet, sz);
}
-static struct grub_net_buff *
-get_card_packet (struct grub_net_card *dev __attribute__ ((unused)))
+grub_ssize_t
+grub_emunet_receive (void *packet, grub_size_t sz)
{
- ssize_t actual;
- struct grub_net_buff *nb;
-
- nb = grub_netbuff_alloc (1536 + 2);
- if (!nb)
- return NULL;
-
- /* Reserve 2 bytes so that 2 + 14/18 bytes of ethernet header is divisible
- by 4. So that IP header is aligned on 4 bytes. */
- grub_netbuff_reserve (nb, 2);
- if (!nb)
- {
- grub_netbuff_free (nb);
- return NULL;
- }
-
- actual = read (fd, nb->data, 1536);
- if (actual < 0)
- {
- grub_netbuff_free (nb);
- return NULL;
- }
- grub_netbuff_put (nb, actual);
-
- return nb;
+ return read (fd, packet, sz);
}
-static struct grub_net_card_driver emudriver =
- {
- .name = "emu",
- .send = send_card_buffer,
- .recv = get_card_packet
- };
-
-static struct grub_net_card emucard =
- {
- .name = "emu0",
- .driver = &emudriver,
- .mtu = 1500,
- .default_address = {
- .type = GRUB_NET_LINK_LEVEL_PROTOCOL_ETHERNET,
- {.mac = {0, 1, 2, 3, 4, 5}}
- },
- .flags = 0
- };
-
-GRUB_MOD_INIT(emunet)
+int
+grub_emunet_create (grub_size_t *mtu)
{
struct ifreq ifr;
+ *mtu = 1500;
fd = open ("/dev/net/tun", O_RDWR | O_NONBLOCK);
if (fd < 0)
- return;
- grub_memset (&ifr, 0, sizeof (ifr));
+ return -1;
+ memset (&ifr, 0, sizeof (ifr));
ifr.ifr_flags = IFF_TAP | IFF_NO_PI;
if (ioctl (fd, TUNSETIFF, &ifr) < 0)
{
close (fd);
fd = -1;
- return;
+ return -1;
}
- grub_net_card_register (&emucard);
+ return 0;
}
-GRUB_MOD_FINI(emunet)
+void
+grub_emunet_close (void)
{
- if (fd >= 0)
- {
- close (fd);
- grub_net_card_unregister (&emucard);
- }
+ if (fd < 0)
+ return;
+
+ close (fd);
+ fd = -1;
}
#ifdef GRUB_SYMBOL_GENERATOR
-void EXPORT_FUNC (open64) (void);
-void EXPORT_FUNC (close) (void);
-void EXPORT_FUNC (read) (void);
-void EXPORT_FUNC (write) (void);
-void EXPORT_FUNC (ioctl) (void);
-void EXPORT_FUNC (__errno_location) (void);
-void EXPORT_FUNC (strerror) (void);
void EXPORT_FUNC (sysconf) (void);
void EXPORT_FUNC (times) (void);
#else
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
#include <sys/times.h>
-#include <fcntl.h>
#include <unistd.h>
-#include <errno.h>
-#include <string.h>
#endif
--- /dev/null
+/*
+ * GRUB -- GRand Unified Bootloader
+ * Copyright (C) 2013 Free Software Foundation, Inc.
+ *
+ * GRUB is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GRUB is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GRUB. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GRUB_EMUNET_HEADER
+#define GRUB_EMUNET_HEADER 1
+
+#include <grub/types.h>
+#include <grub/symbol.h>
+
+grub_ssize_t
+EXPORT_FUNC(grub_emunet_send) (const void *packet, grub_size_t sz);
+
+grub_ssize_t
+EXPORT_FUNC(grub_emunet_receive) (void *packet, grub_size_t sz);
+
+int
+EXPORT_FUNC(grub_emunet_create) (grub_size_t *mtu);
+
+void
+EXPORT_FUNC(grub_emunet_close) (void);
+
+#endif
projects / grub.git / commitdiff