diff --git a/aros/Makefile.AROS b/aros/Makefile.AROS new file mode 100755 index 0000000..5a6eb61 --- /dev/null +++ b/aros/Makefile.AROS @@ -0,0 +1,15 @@ +AR=ar +CC=gcc +CFLAGS=-g -O0 -DAROS=1 -D_U_=" " -DHAVE_SYS_TYPES_H -DHAVE_SOCKADDR_LEN -I. -Iinclude -Iaros + +OBJS=lib/connect.o lib/crc32c.o lib/discovery.o lib/init.o lib/iscsi-command.o lib/logging.o lib/login.o lib/md5.o lib/nop.o lib/pdu.o lib/scsi-lowlevel.o lib/socket.o lib/sync.o lib/task_mgmt.o + +all: lib/libiscsi.a + +lib/libiscsi.a: $(OBJS) + $(AR) cru $@ $(OBJS) + +.c.o: + echo $(CC) $(CFLAGS) -c -o $@ $< + $(CC) $(CFLAGS) -c -o $@ $< + diff --git a/aros/aros_compat.c b/aros/aros_compat.c new file mode 100644 index 0000000..fa3d03c --- /dev/null +++ b/aros/aros_compat.c @@ -0,0 +1,169 @@ +/* + Copyright (C) 2013 by Ronnie Sahlberg + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. + + This program 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 Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program; if not, see . +*/ + +#include +#include +#include +#include +#include +#include +#include +#include "aros_compat.h" +#include +#include + +#undef poll + +int aros_getnameinfo(const struct sockaddr *sa, socklen_t salen, +char *host, size_t hostlen, +char *serv, size_t servlen, int flags) +{ + struct sockaddr_in *sin = (struct sockaddr_in *)sa; + + if (host) { + snprintf(host, hostlen, Inet_NtoA(sin->sin_addr.s_addr)); + } + + return 0; +} + +int aros_getaddrinfo(const char *node, const char*service, +const struct addrinfo *hints, +struct addrinfo **res) +{ + struct sockaddr_in *sin; + + sin = malloc(sizeof(struct sockaddr_in)); + sin->sin_len = sizeof(struct sockaddr_in); + sin->sin_family=AF_INET; + + /* Some error checking would be nice */ + sin->sin_addr.s_addr = inet_addr(node); + + sin->sin_port=0; + if (service) { + sin->sin_port=htons(atoi(service)); + } + + *res = malloc(sizeof(struct addrinfo)); + + (*res)->ai_family = AF_INET; + (*res)->ai_addrlen = sizeof(struct sockaddr_in); + (*res)->ai_addr = (struct sockaddr *)sin; + + return 0; +} + +void aros_freeaddrinfo(struct addrinfo *res) +{ + free(res->ai_addr); + free(res); +} + +int aros_inet_pton(int af, char *src, void *dst) +{ + struct sockaddr_in sin; + + sin.sin_addr.s_addr = inet_addr(src); + memcpy(dst, &sin.sin_addr.s_addr, sizeof(sin.sin_addr.s_addr)); + return 1; +} + +struct Library * SocketBase = NULL; + +extern int errno; +int h_errno = 0; + + +void aros_init_socket(void) +{ + if (!(SocketBase = OpenLibrary("bsdsocket.library", 4))) { + printf("NoTCP/IP Stack available"); + exit(10); + } + if (SocketBaseTags(SBTM_SETVAL(SBTC_ERRNOPTR(sizeof(errno))), + (IPTR)&errno, + SBTM_SETVAL(SBTC_HERRNOLONGPTR), + (IPTR)&h_errno, TAG_DONE)) { + printf("Failed to set ERRNO"); + exit(10); + } +} + +int aros_poll(struct pollfd *fds, unsigned int nfds, int timo) +{ + struct timeval timeout, *toptr; + fd_set ifds, ofds, efds, *ip, *op; + unsigned int i, maxfd = 0; + int rc; + + // Set up the file-descriptor sets in ifds, ofds and efds. + FD_ZERO(&ifds); + FD_ZERO(&ofds); + FD_ZERO(&efds); + for (i = 0, op = ip = 0; i < nfds; ++i) + { + fds[i].revents = 0; + if(fds[i].events & (POLLIN|POLLPRI)) + { + ip = &ifds; + FD_SET(fds[i].fd, ip); + } + if(fds[i].events & POLLOUT) + { + op = &ofds; + FD_SET(fds[i].fd, op); + } + FD_SET(fds[i].fd, &efds); + if (fds[i].fd > maxfd) { + maxfd = fds[i].fd; + } + } + + // Set up the timeval structure for the timeout parameter + if(timo < 0) + { + toptr = 0; + } + else + { + toptr = &timeout; + timeout.tv_sec = timo / 1000; + timeout.tv_usec = (timo - timeout.tv_sec * 1000) * 1000; + } + + rc = WaitSelect(maxfd + 1, ip, op, &efds, toptr, NULL); + + if(rc <= 0) + return rc; + + if(rc > 0) + { + for (i = 0; i < nfds; ++i) + { + int fd = fds[i].fd; + if(fds[i].events & (POLLIN|POLLPRI) && FD_ISSET(fd, &ifds)) + fds[i].revents |= POLLIN; + if(fds[i].events & POLLOUT && FD_ISSET(fd, &ofds)) + fds[i].revents |= POLLOUT; + if(FD_ISSET(fd, &efds)) // Some error was detected ... should be some way to know. + fds[i].revents |= POLLHUP; + } + } + return rc; +} + diff --git a/aros/aros_compat.h b/aros/aros_compat.h new file mode 100644 index 0000000..b0efa74 --- /dev/null +++ b/aros/aros_compat.h @@ -0,0 +1,43 @@ +#ifndef AROS_COMPAT_H +#define AROS_COMPAT_H + +#include +#include +#include +#include +#include +#include +#include +#include + +#define statvfs statfs +#define ioctl IoctlSocket +#define close CloseSocket + +#define inet_pton aros_inet_pton +#define freeaddrinfo aros_freeaddrinfo +#define getnameinfo aros_getnameinfo +#define getaddrinfo aros_getaddrinfo + +#define SOL_TCP IPPROTO_TCP + +extern struct Library * SocketBase; + +void aros_init_socket(void); + +#define POLLIN 0x0001 /* There is data to read */ +#define POLLPRI 0x0002 /* There is urgent data to read */ +#define POLLOUT 0x0004 /* Writing now will not block */ +#define POLLERR 0x0008 /* Error condition */ +#define POLLHUP 0x0010 /* Hung up */ +#define POLLNVAL 0x0020 /* Invalid request: fd not open */ + +struct pollfd { + int fd; /* file descriptor */ + short events; /* requested events */ + short revents; /* returned events */ +}; + +#define poll(x, y, z) aros_poll(x, y, z) + +#endif