Merge branch 'maginet' into v0.11-alpha
This commit is contained in:
Andrew Pamment
GitHub
commit
e8c7b0cfec
10
.gitignore
vendored
10
.gitignore
vendored
@ -83,3 +83,13 @@ utils/reset_pass/reset_pass
|
||||
last10v2.dat
|
||||
utils/filecenter/filecenter
|
||||
utils/dosbox_shim/shim
|
||||
deps/libuuid/Makefile
|
||||
deps/libuuid/config.h
|
||||
deps/libuuid/libtool
|
||||
deps/libuuid/libuuid.la
|
||||
deps/libuuid/stamp-h1
|
||||
deps/libuuid/uuid.pc
|
||||
utils/mnetscan/mnetscan
|
||||
mail.out
|
||||
utils/mnettoss/mnettoss
|
||||
mnet/*
|
||||
|
||||
@ -19,6 +19,10 @@ LINE 111 MODIFIED
|
||||
OLDSTRING: "\e[1;32mAttribs : \e[1;37m%s\r\n"
|
||||
NEWSTRING: "\e[1;32mAttribs : \e[1;37m%s \e[1;31m%s\r\n"
|
||||
|
||||
LINE 289 NEW
|
||||
OLDSTRING: (NONE)
|
||||
NEWSTRING: "\e[2J\e[1;1H\e[1;32mFrom : \e[1;37m%s (@%d)\r\n"
|
||||
|
||||
Changes from v0.9-alpha -> v0.10-alpha
|
||||
--------------------------------------------------------------
|
||||
|
||||
|
||||
4
deps/libuuid/.gitignore
vendored
Normal file
4
deps/libuuid/.gitignore
vendored
Normal file
@ -0,0 +1,4 @@
|
||||
.deps
|
||||
.libs
|
||||
*.lo
|
||||
|
||||
5
deps/libuuid/COPYING
vendored
Normal file
5
deps/libuuid/COPYING
vendored
Normal file
@ -0,0 +1,5 @@
|
||||
This library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the Modified BSD License.
|
||||
|
||||
The complete text of the license is available at the
|
||||
Documentation/licenses/COPYING.BSD-3 file.
|
||||
40
deps/libuuid/Makefile.am
vendored
Normal file
40
deps/libuuid/Makefile.am
vendored
Normal file
@ -0,0 +1,40 @@
|
||||
check_PROGRAMS = test_uuid
|
||||
test_uuid_SOURCES = test_uuid.c
|
||||
test_uuid_LDADD = libuuid.la $(SOCKET_LIBS)
|
||||
test_uuid_CFLAGS = -I$(top_srcdir)
|
||||
|
||||
EXTRA_DIST = uuid.pc.in
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
pkgconfig_DATA = uuid.pc
|
||||
|
||||
# includes
|
||||
uuidincdir = $(includedir)/uuid
|
||||
uuidinc_HEADERS = uuid.h
|
||||
|
||||
lib_LTLIBRARIES = libuuid.la
|
||||
|
||||
libuuid_la_SOURCES = \
|
||||
clear.c \
|
||||
compare.c \
|
||||
copy.c \
|
||||
gen_uuid.c \
|
||||
isnull.c \
|
||||
pack.c \
|
||||
parse.c \
|
||||
unpack.c \
|
||||
unparse.c \
|
||||
uuidd.h \
|
||||
uuidd.h \
|
||||
uuidP.h \
|
||||
uuid_time.c \
|
||||
randutils.c \
|
||||
$(uuidinc_HEADERS)
|
||||
|
||||
noinst_HEADERS = \
|
||||
all-io.h \
|
||||
c.h \
|
||||
randutils.h
|
||||
|
||||
libuuid_la_LIBADD = $(SOCKET_LIBS)
|
||||
libuuid_la_CFLAGS = -I$(top_srcdir)
|
||||
libuuid_la_LDFLAGS = -version-info $(LIBUUID_VERSION_INFO)
|
||||
1051
deps/libuuid/Makefile.in
vendored
Normal file
1051
deps/libuuid/Makefile.in
vendored
Normal file
File diff suppressed because it is too large
Load Diff
10199
deps/libuuid/aclocal.m4
vendored
Normal file
10199
deps/libuuid/aclocal.m4
vendored
Normal file
File diff suppressed because it is too large
Load Diff
82
deps/libuuid/all-io.h
vendored
Normal file
82
deps/libuuid/all-io.h
vendored
Normal file
@ -0,0 +1,82 @@
|
||||
/*
|
||||
* No copyright is claimed. This code is in the public domain; do with
|
||||
* it what you wish.
|
||||
*
|
||||
* Written by Karel Zak <kzak@redhat.com>
|
||||
* Petr Uzel <petr.uzel@suse.cz>
|
||||
*/
|
||||
|
||||
#ifndef UTIL_LINUX_ALL_IO_H
|
||||
#define UTIL_LINUX_ALL_IO_H
|
||||
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
#include <errno.h>
|
||||
|
||||
#include "c.h"
|
||||
|
||||
static inline int write_all(int fd, const void *buf, size_t count)
|
||||
{
|
||||
while (count) {
|
||||
ssize_t tmp;
|
||||
|
||||
errno = 0;
|
||||
tmp = write(fd, buf, count);
|
||||
if (tmp > 0) {
|
||||
count -= tmp;
|
||||
if (count)
|
||||
buf = (void *) ((char *) buf + tmp);
|
||||
} else if (errno != EINTR && errno != EAGAIN)
|
||||
return -1;
|
||||
if (errno == EAGAIN) /* Try later, *sigh* */
|
||||
usleep(10000);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline int fwrite_all(const void *ptr, size_t size,
|
||||
size_t nmemb, FILE *stream)
|
||||
{
|
||||
while (nmemb) {
|
||||
size_t tmp;
|
||||
|
||||
errno = 0;
|
||||
tmp = fwrite(ptr, size, nmemb, stream);
|
||||
if (tmp > 0) {
|
||||
nmemb -= tmp;
|
||||
if (nmemb)
|
||||
ptr = (void *) ((char *) ptr + (tmp * size));
|
||||
} else if (errno != EINTR && errno != EAGAIN)
|
||||
return -1;
|
||||
if (errno == EAGAIN) /* Try later, *sigh* */
|
||||
usleep(10000);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline ssize_t read_all(int fd, char *buf, size_t count)
|
||||
{
|
||||
ssize_t ret;
|
||||
ssize_t c = 0;
|
||||
int tries = 0;
|
||||
|
||||
memset(buf, 0, count);
|
||||
while (count > 0) {
|
||||
ret = read(fd, buf, count);
|
||||
if (ret <= 0) {
|
||||
if ((errno == EAGAIN || errno == EINTR || ret == 0) &&
|
||||
(tries++ < 5))
|
||||
continue;
|
||||
return c ? c : -1;
|
||||
}
|
||||
if (ret > 0)
|
||||
tries = 0;
|
||||
count -= ret;
|
||||
buf += ret;
|
||||
c += ret;
|
||||
}
|
||||
return c;
|
||||
}
|
||||
|
||||
|
||||
#endif /* UTIL_LINUX_ALL_IO_H */
|
||||
317
deps/libuuid/c.h
vendored
Normal file
317
deps/libuuid/c.h
vendored
Normal file
@ -0,0 +1,317 @@
|
||||
/*
|
||||
* Fundamental C definitions.
|
||||
*/
|
||||
|
||||
#ifndef UTIL_LINUX_C_H
|
||||
#define UTIL_LINUX_C_H
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#include <limits.h>
|
||||
#include <stddef.h>
|
||||
|
||||
#ifdef HAVE_STDINT_H
|
||||
#include <stdint.h>
|
||||
#else
|
||||
# ifdef HAVE_INTTYPES_H
|
||||
# include <inttypes.h>
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
#include <unistd.h>
|
||||
#include <stdarg.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
|
||||
#ifdef HAVE_ERR_H
|
||||
# include <err.h>
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_USLEEP
|
||||
# include <time.h>
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Compiler specific stuff
|
||||
*/
|
||||
#ifndef __GNUC_PREREQ
|
||||
# if defined __GNUC__ && defined __GNUC_MINOR__
|
||||
# define __GNUC_PREREQ(maj, min) \
|
||||
((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
|
||||
# else
|
||||
# define __GNUC_PREREQ(maj, min) 0
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#ifdef __GNUC__
|
||||
|
||||
/* &a[0] degrades to a pointer: a different type from an array */
|
||||
# define __must_be_array(a) \
|
||||
UL_BUILD_BUG_ON_ZERO(__builtin_types_compatible_p(__typeof__(a), __typeof__(&a[0])))
|
||||
|
||||
# define ignore_result(x) ({ \
|
||||
__typeof__(x) __dummy __attribute__((__unused__)) = (x); (void) __dummy; \
|
||||
})
|
||||
|
||||
#else /* !__GNUC__ */
|
||||
# define __must_be_array(a) 0
|
||||
# define __attribute__(_arg_)
|
||||
# define ignore_result(x) ((void) (x))
|
||||
#endif /* !__GNUC__ */
|
||||
|
||||
/*
|
||||
* Function attributes
|
||||
*/
|
||||
#ifndef __ul_alloc_size
|
||||
# if __GNUC_PREREQ (4, 3)
|
||||
# define __ul_alloc_size(s) __attribute__((alloc_size(s)))
|
||||
# else
|
||||
# define __ul_alloc_size(s)
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#ifndef __ul_calloc_size
|
||||
# if __GNUC_PREREQ (4, 3)
|
||||
# define __ul_calloc_size(n, s) __attribute__((alloc_size(n, s)))
|
||||
# else
|
||||
# define __ul_calloc_size(n, s)
|
||||
# endif
|
||||
#endif
|
||||
|
||||
/* Force a compilation error if condition is true, but also produce a
|
||||
* result (of value 0 and type size_t), so the expression can be used
|
||||
* e.g. in a structure initializer (or where-ever else comma expressions
|
||||
* aren't permitted).
|
||||
*/
|
||||
#define UL_BUILD_BUG_ON_ZERO(e) (sizeof(struct { int:-!!(e); }))
|
||||
#define BUILD_BUG_ON_NULL(e) ((void *)sizeof(struct { int:-!!(e); }))
|
||||
|
||||
#ifndef ARRAY_SIZE
|
||||
# define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + __must_be_array(arr))
|
||||
#endif
|
||||
|
||||
#ifndef PATH_MAX
|
||||
# define PATH_MAX 4096
|
||||
#endif
|
||||
|
||||
#ifndef TRUE
|
||||
# define TRUE 1
|
||||
#endif
|
||||
|
||||
#ifndef FALSE
|
||||
# define FALSE 0
|
||||
#endif
|
||||
|
||||
#ifndef min
|
||||
# define min(x, y) ({ \
|
||||
__typeof__(x) _min1 = (x); \
|
||||
__typeof__(y) _min2 = (y); \
|
||||
(void) (&_min1 == &_min2); \
|
||||
_min1 < _min2 ? _min1 : _min2; })
|
||||
#endif
|
||||
|
||||
#ifndef max
|
||||
# define max(x, y) ({ \
|
||||
__typeof__(x) _max1 = (x); \
|
||||
__typeof__(y) _max2 = (y); \
|
||||
(void) (&_max1 == &_max2); \
|
||||
_max1 > _max2 ? _max1 : _max2; })
|
||||
#endif
|
||||
|
||||
#ifndef offsetof
|
||||
#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
|
||||
#endif
|
||||
|
||||
#ifndef container_of
|
||||
#define container_of(ptr, type, member) ({ \
|
||||
const __typeof__( ((type *)0)->member ) *__mptr = (ptr); \
|
||||
(type *)( (char *)__mptr - offsetof(type,member) );})
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_PROGRAM_INVOCATION_SHORT_NAME
|
||||
# ifdef HAVE___PROGNAME
|
||||
extern char *__progname;
|
||||
# define program_invocation_short_name __progname
|
||||
# else
|
||||
# ifdef HAVE_GETEXECNAME
|
||||
# define program_invocation_short_name \
|
||||
prog_inv_sh_nm_from_file(getexecname(), 0)
|
||||
# else
|
||||
# define program_invocation_short_name \
|
||||
prog_inv_sh_nm_from_file(__FILE__, 1)
|
||||
# endif
|
||||
static char prog_inv_sh_nm_buf[256];
|
||||
static inline char *
|
||||
prog_inv_sh_nm_from_file(char *f, char stripext)
|
||||
{
|
||||
char *t;
|
||||
|
||||
if ((t = strrchr(f, '/')) != NULL)
|
||||
t++;
|
||||
else
|
||||
t = f;
|
||||
|
||||
strncpy(prog_inv_sh_nm_buf, t, sizeof(prog_inv_sh_nm_buf) - 1);
|
||||
prog_inv_sh_nm_buf[sizeof(prog_inv_sh_nm_buf) - 1] = '\0';
|
||||
|
||||
if (stripext && (t = strrchr(prog_inv_sh_nm_buf, '.')) != NULL)
|
||||
*t = '\0';
|
||||
|
||||
return prog_inv_sh_nm_buf;
|
||||
}
|
||||
# endif
|
||||
#endif
|
||||
|
||||
|
||||
#ifndef HAVE_ERR_H
|
||||
static inline void
|
||||
errmsg(char doexit, int excode, char adderr, const char *fmt, ...)
|
||||
{
|
||||
fprintf(stderr, "%s: ", program_invocation_short_name);
|
||||
if (fmt != NULL) {
|
||||
va_list argp;
|
||||
va_start(argp, fmt);
|
||||
vfprintf(stderr, fmt, argp);
|
||||
va_end(argp);
|
||||
if (adderr)
|
||||
fprintf(stderr, ": ");
|
||||
}
|
||||
if (adderr)
|
||||
fprintf(stderr, "%m");
|
||||
fprintf(stderr, "\n");
|
||||
if (doexit)
|
||||
exit(excode);
|
||||
}
|
||||
|
||||
#ifndef HAVE_ERR
|
||||
# define err(E, FMT...) errmsg(1, E, 1, FMT)
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_ERRX
|
||||
# define errx(E, FMT...) errmsg(1, E, 0, FMT)
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_WARN
|
||||
# define warn(FMT...) errmsg(0, 0, 1, FMT)
|
||||
#endif
|
||||
|
||||
#ifndef HAVE_WARNX
|
||||
# define warnx(FMT...) errmsg(0, 0, 0, FMT)
|
||||
#endif
|
||||
#endif /* !HAVE_ERR_H */
|
||||
|
||||
|
||||
static inline __attribute__((const)) int is_power_of_2(unsigned long num)
|
||||
{
|
||||
return (num != 0 && ((num & (num - 1)) == 0));
|
||||
}
|
||||
|
||||
#ifndef HAVE_LOFF_T
|
||||
typedef int64_t loff_t;
|
||||
#endif
|
||||
|
||||
#if !defined(HAVE_DIRFD) && (!defined(HAVE_DECL_DIRFD) || HAVE_DECL_DIRFD == 0) && defined(HAVE_DIR_DD_FD)
|
||||
#include <sys/types.h>
|
||||
#include <dirent.h>
|
||||
static inline int dirfd(DIR *d)
|
||||
{
|
||||
return d->dd_fd;
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Fallback defines for old versions of glibc
|
||||
*/
|
||||
#include <fcntl.h>
|
||||
|
||||
#ifdef O_CLOEXEC
|
||||
#define UL_CLOEXECSTR "e"
|
||||
#else
|
||||
#define UL_CLOEXECSTR ""
|
||||
#endif
|
||||
|
||||
#ifndef O_CLOEXEC
|
||||
#define O_CLOEXEC 0
|
||||
#endif
|
||||
|
||||
|
||||
#ifndef AI_ADDRCONFIG
|
||||
#define AI_ADDRCONFIG 0x0020
|
||||
#endif
|
||||
|
||||
#ifndef IUTF8
|
||||
#define IUTF8 0040000
|
||||
#endif
|
||||
|
||||
/*
|
||||
* MAXHOSTNAMELEN replacement
|
||||
*/
|
||||
static inline size_t get_hostname_max(void)
|
||||
{
|
||||
#if HAVE_DECL__SC_HOST_NAME_MAX
|
||||
long len = sysconf(_SC_HOST_NAME_MAX);
|
||||
|
||||
if (0 < len)
|
||||
return len;
|
||||
#endif
|
||||
|
||||
#ifdef MAXHOSTNAMELEN
|
||||
return MAXHOSTNAMELEN;
|
||||
#elif HOST_NAME_MAX
|
||||
return HOST_NAME_MAX;
|
||||
#endif
|
||||
return 64;
|
||||
}
|
||||
|
||||
#ifndef HAVE_USLEEP
|
||||
/*
|
||||
* This function is marked obsolete in POSIX.1-2001 and removed in
|
||||
* POSIX.1-2008. It is replaced with nanosleep().
|
||||
*/
|
||||
static inline int usleep(useconds_t usec)
|
||||
{
|
||||
struct timespec waittime = {
|
||||
.tv_sec = usec / 1000000L,
|
||||
.tv_nsec = (usec % 1000000L) * 1000
|
||||
};
|
||||
return nanosleep(&waittime, NULL);
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Constant strings for usage() functions. For more info see
|
||||
* Documentation/howto-usage-function.txt and disk-utils/delpart.c
|
||||
*/
|
||||
#define USAGE_HEADER _("\nUsage:\n")
|
||||
#define USAGE_OPTIONS _("\nOptions:\n")
|
||||
#define USAGE_SEPARATOR _("\n")
|
||||
#define USAGE_HELP _(" -h, --help display this help and exit\n")
|
||||
#define USAGE_VERSION _(" -V, --version output version information and exit\n")
|
||||
#define USAGE_MAN_TAIL(_man) _("\nFor more details see %s.\n"), _man
|
||||
|
||||
#define UTIL_LINUX_VERSION _("%s from %s\n"), program_invocation_short_name, PACKAGE_STRING
|
||||
|
||||
/*
|
||||
* scanf modifiers for "strings allocation"
|
||||
*/
|
||||
#ifdef HAVE_SCANF_MS_MODIFIER
|
||||
#define UL_SCNsA "%ms"
|
||||
#elif defined(HAVE_SCANF_AS_MODIFIER)
|
||||
#define UL_SCNsA "%as"
|
||||
#endif
|
||||
|
||||
/*
|
||||
* seek stuff
|
||||
*/
|
||||
#ifndef SEEK_DATA
|
||||
# define SEEK_DATA 3
|
||||
#endif
|
||||
#ifndef SEEK_HOLE
|
||||
# define SEEK_HOLE 4
|
||||
#endif
|
||||
|
||||
#endif /* UTIL_LINUX_C_H */
|
||||
43
deps/libuuid/clear.c
vendored
Normal file
43
deps/libuuid/clear.c
vendored
Normal file
@ -0,0 +1,43 @@
|
||||
/*
|
||||
* clear.c -- Clear a UUID
|
||||
*
|
||||
* Copyright (C) 1996, 1997 Theodore Ts'o.
|
||||
*
|
||||
* %Begin-Header%
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, and the entire permission notice in its entirety,
|
||||
* including the disclaimer of warranties.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. The name of the author may not be used to endorse or promote
|
||||
* products derived from this software without specific prior
|
||||
* written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
||||
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
|
||||
* WHICH ARE HEREBY DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE
|
||||
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
|
||||
* OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
|
||||
* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
||||
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
|
||||
* USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
|
||||
* DAMAGE.
|
||||
* %End-Header%
|
||||
*/
|
||||
|
||||
#include "string.h"
|
||||
|
||||
#include "uuidP.h"
|
||||
|
||||
void uuid_clear(uuid_t uu)
|
||||
{
|
||||
memset(uu, 0, 16);
|
||||
}
|
||||
|
||||
55
deps/libuuid/compare.c
vendored
Normal file
55
deps/libuuid/compare.c
vendored
Normal file
@ -0,0 +1,55 @@
|
||||
/*
|
||||
* compare.c --- compare whether or not two UUIDs are the same
|
||||
*
|
||||
* Returns 0 if the two UUIDs are different, and 1 if they are the same.
|
||||
*
|
||||
* Copyright (C) 1996, 1997 Theodore Ts'o.
|
||||
*
|
||||
* %Begin-Header%
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, and the entire permission notice in its entirety,
|
||||
* including the disclaimer of warranties.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. The name of the author may not be used to endorse or promote
|
||||
* products derived from this software without specific prior
|
||||
* written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
||||
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
|
||||
* WHICH ARE HEREBY DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE
|
||||
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
|
||||
* OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
|
||||
* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
||||
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
|
||||
* USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
|
||||
* DAMAGE.
|
||||
* %End-Header%
|
||||
*/
|
||||
|
||||
#include "uuidP.h"
|
||||
#include <string.h>
|
||||
|
||||
#define UUCMP(u1,u2) if (u1 != u2) return((u1 < u2) ? -1 : 1);
|
||||
|
||||
int uuid_compare(const uuid_t uu1, const uuid_t uu2)
|
||||
{
|
||||
struct uuid uuid1, uuid2;
|
||||
|
||||
uuid_unpack(uu1, &uuid1);
|
||||
uuid_unpack(uu2, &uuid2);
|
||||
|
||||
UUCMP(uuid1.time_low, uuid2.time_low);
|
||||
UUCMP(uuid1.time_mid, uuid2.time_mid);
|
||||
UUCMP(uuid1.time_hi_and_version, uuid2.time_hi_and_version);
|
||||
UUCMP(uuid1.clock_seq, uuid2.clock_seq);
|
||||
return memcmp(uuid1.node, uuid2.node, 6);
|
||||
}
|
||||
|
||||
1
deps/libuuid/compile
vendored
Symbolic link
1
deps/libuuid/compile
vendored
Symbolic link
@ -0,0 +1 @@
|
||||
/usr/share/automake-1.15/compile
|
||||
1
deps/libuuid/config.guess
vendored
Symbolic link
1
deps/libuuid/config.guess
vendored
Symbolic link
@ -0,0 +1 @@
|
||||
/usr/share/automake-1.15/config.guess
|
||||
151
deps/libuuid/config.h.in
vendored
Normal file
151
deps/libuuid/config.h.in
vendored
Normal file
@ -0,0 +1,151 @@
|
||||
/* config.h.in. Generated from configure.ac by autoheader. */
|
||||
|
||||
/* Define to 1 if you have the declaration of `_SC_HOST_NAME_MAX', and to 0 if
|
||||
you don't. */
|
||||
#undef HAVE_DECL__SC_HOST_NAME_MAX
|
||||
|
||||
/* Define to 1 if you have the <dlfcn.h> header file. */
|
||||
#undef HAVE_DLFCN_H
|
||||
|
||||
/* Define to 1 if you have the <fcntl.h> header file. */
|
||||
#undef HAVE_FCNTL_H
|
||||
|
||||
/* Define to 1 if you have the `ftruncate' function. */
|
||||
#undef HAVE_FTRUNCATE
|
||||
|
||||
/* Define to 1 if you have the `gettimeofday' function. */
|
||||
#undef HAVE_GETTIMEOFDAY
|
||||
|
||||
/* Define to 1 if you have the <inttypes.h> header file. */
|
||||
#undef HAVE_INTTYPES_H
|
||||
|
||||
/* Define to 1 if you have the <limits.h> header file. */
|
||||
#undef HAVE_LIMITS_H
|
||||
|
||||
/* Define to 1 if you have the <memory.h> header file. */
|
||||
#undef HAVE_MEMORY_H
|
||||
|
||||
/* Define to 1 if you have the `memset' function. */
|
||||
#undef HAVE_MEMSET
|
||||
|
||||
/* Define to 1 if you have the <netinet/in.h> header file. */
|
||||
#undef HAVE_NETINET_IN_H
|
||||
|
||||
/* Define to 1 if you have the `socket' function. */
|
||||
#undef HAVE_SOCKET
|
||||
|
||||
/* Define to 1 if you have the `srandom' function. */
|
||||
#undef HAVE_SRANDOM
|
||||
|
||||
/* Define to 1 if you have the <stdint.h> header file. */
|
||||
#undef HAVE_STDINT_H
|
||||
|
||||
/* Define to 1 if you have the <stdlib.h> header file. */
|
||||
#undef HAVE_STDLIB_H
|
||||
|
||||
/* Define to 1 if you have the <strings.h> header file. */
|
||||
#undef HAVE_STRINGS_H
|
||||
|
||||
/* Define to 1 if you have the <string.h> header file. */
|
||||
#undef HAVE_STRING_H
|
||||
|
||||
/* Define to 1 if you have the `strtoul' function. */
|
||||
#undef HAVE_STRTOUL
|
||||
|
||||
/* Define to 1 if you have the <sys/file.h> header file. */
|
||||
#undef HAVE_SYS_FILE_H
|
||||
|
||||
/* Define to 1 if you have the <sys/ioctl.h> header file. */
|
||||
#undef HAVE_SYS_IOCTL_H
|
||||
|
||||
/* Define to 1 if you have the <sys/socket.h> header file. */
|
||||
#undef HAVE_SYS_SOCKET_H
|
||||
|
||||
/* Define to 1 if you have the <sys/stat.h> header file. */
|
||||
#undef HAVE_SYS_STAT_H
|
||||
|
||||
/* Define to 1 if you have the <sys/time.h> header file. */
|
||||
#undef HAVE_SYS_TIME_H
|
||||
|
||||
/* Define to 1 if you have the <sys/types.h> header file. */
|
||||
#undef HAVE_SYS_TYPES_H
|
||||
|
||||
/* Define to 1 if you have the <unistd.h> header file. */
|
||||
#undef HAVE_UNISTD_H
|
||||
|
||||
/* Define to 1 if you have the `usleep' function. */
|
||||
#undef HAVE_USLEEP
|
||||
|
||||
/* Define to the sub-directory where libtool stores uninstalled libraries. */
|
||||
#undef LT_OBJDIR
|
||||
|
||||
/* Name of package */
|
||||
#undef PACKAGE
|
||||
|
||||
/* Define to the address where bug reports for this package should be sent. */
|
||||
#undef PACKAGE_BUGREPORT
|
||||
|
||||
/* Define to the full name of this package. */
|
||||
#undef PACKAGE_NAME
|
||||
|
||||
/* Define to the full name and version of this package. */
|
||||
#undef PACKAGE_STRING
|
||||
|
||||
/* Define to the one symbol short name of this package. */
|
||||
#undef PACKAGE_TARNAME
|
||||
|
||||
/* Define to the home page for this package. */
|
||||
#undef PACKAGE_URL
|
||||
|
||||
/* Define to the version of this package. */
|
||||
#undef PACKAGE_VERSION
|
||||
|
||||
/* Define to 1 if you have the ANSI C header files. */
|
||||
#undef STDC_HEADERS
|
||||
|
||||
/* Version number of package */
|
||||
#undef VERSION
|
||||
|
||||
/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
|
||||
<pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
|
||||
#define below would cause a syntax error. */
|
||||
#undef _UINT32_T
|
||||
|
||||
/* Define for Solaris 2.5.1 so the uint64_t typedef from <sys/synch.h>,
|
||||
<pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
|
||||
#define below would cause a syntax error. */
|
||||
#undef _UINT64_T
|
||||
|
||||
/* Define for Solaris 2.5.1 so the uint8_t typedef from <sys/synch.h>,
|
||||
<pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
|
||||
#define below would cause a syntax error. */
|
||||
#undef _UINT8_T
|
||||
|
||||
/* Define to the type of a signed integer type of width exactly 32 bits if
|
||||
such a type exists and the standard includes do not define it. */
|
||||
#undef int32_t
|
||||
|
||||
/* Define to `int' if <sys/types.h> does not define. */
|
||||
#undef mode_t
|
||||
|
||||
/* Define to `unsigned int' if <sys/types.h> does not define. */
|
||||
#undef size_t
|
||||
|
||||
/* Define to `int' if <sys/types.h> does not define. */
|
||||
#undef ssize_t
|
||||
|
||||
/* Define to the type of an unsigned integer type of width exactly 16 bits if
|
||||
such a type exists and the standard includes do not define it. */
|
||||
#undef uint16_t
|
||||
|
||||
/* Define to the type of an unsigned integer type of width exactly 32 bits if
|
||||
such a type exists and the standard includes do not define it. */
|
||||
#undef uint32_t
|
||||
|
||||
/* Define to the type of an unsigned integer type of width exactly 64 bits if
|
||||
such a type exists and the standard includes do not define it. */
|
||||
#undef uint64_t
|
||||
|
||||
/* Define to the type of an unsigned integer type of width exactly 8 bits if
|
||||
such a type exists and the standard includes do not define it. */
|
||||
#undef uint8_t
|
||||
1
deps/libuuid/config.sub
vendored
Symbolic link
1
deps/libuuid/config.sub
vendored
Symbolic link
@ -0,0 +1 @@
|
||||
/usr/share/automake-1.15/config.sub
|
||||
15419
deps/libuuid/configure
vendored
Executable file
15419
deps/libuuid/configure
vendored
Executable file
File diff suppressed because it is too large
Load Diff
56
deps/libuuid/configure.ac
vendored
Normal file
56
deps/libuuid/configure.ac
vendored
Normal file
@ -0,0 +1,56 @@
|
||||
# Process this file with autoconf to produce a configure script.
|
||||
|
||||
AC_PREREQ([2.69])
|
||||
AC_INIT([libuuid], [1.0.3], [sloowfranklin@gmail.com])
|
||||
AC_CONFIG_SRCDIR([compare.c])
|
||||
AC_CONFIG_HEADERS([config.h])
|
||||
AM_INIT_AUTOMAKE([foreign])
|
||||
LT_INIT
|
||||
|
||||
# Checks for programs.
|
||||
AC_PROG_CC
|
||||
|
||||
|
||||
# Checks for libraries.
|
||||
SOCKET_LIBS=
|
||||
AC_SEARCH_LIBS([socket], [socket],
|
||||
[if test x"$ac_cv_search_socket" != x"none required"; then
|
||||
SOCKET_LIBS="$SOCKET_LIBS -lsocket";
|
||||
fi])
|
||||
AC_SUBST([SOCKET_LIBS])
|
||||
|
||||
# Checks for header files.
|
||||
AC_CHECK_HEADERS([fcntl.h inttypes.h limits.h netinet/in.h stdlib.h string.h sys/file.h sys/ioctl.h sys/socket.h sys/time.h unistd.h])
|
||||
AC_CHECK_DECLS([_SC_HOST_NAME_MAX])
|
||||
|
||||
# Checks for typedefs, structures, and compiler characteristics.
|
||||
AC_TYPE_INT32_T
|
||||
AC_TYPE_MODE_T
|
||||
AC_TYPE_SIZE_T
|
||||
AC_TYPE_SSIZE_T
|
||||
AC_TYPE_UINT16_T
|
||||
AC_TYPE_UINT32_T
|
||||
AC_TYPE_UINT64_T
|
||||
AC_TYPE_UINT8_T
|
||||
|
||||
# Checks for library functions.
|
||||
AC_CHECK_FUNCS([ftruncate gettimeofday memset socket strtoul usleep srandom])
|
||||
|
||||
dnl version details from <major>.<minor>.<release>
|
||||
PACKAGE_VERSION_MAJOR=$(echo $PACKAGE_VERSION | awk -F. '{print $1}')
|
||||
PACKAGE_VERSION_MINOR=$(echo $PACKAGE_VERSION | awk -F. '{print $2}')
|
||||
PACKAGE_VERSION_RELEASE=$(echo $PACKAGE_VERSION | awk -F. '{print $3}')
|
||||
|
||||
LIBUUID_VERSION="$PACKAGE_VERSION_MAJOR.$PACKAGE_VERSION_MINOR.$PACKAGE_VERSION_RELEASE"
|
||||
LIBUUID_LT_MAJOR=1
|
||||
LIBUUID_LT_MINOR=0
|
||||
LIBUUID_LT_MICRO=0
|
||||
LIBUUID_VERSION_INFO=`expr $LIBUUID_LT_MAJOR + $LIBUUID_LT_MINOR`:$LIBUUID_LT_MICRO:$LIBUUID_LT_MINOR
|
||||
AC_SUBST([LIBUUID_VERSION])
|
||||
AC_SUBST([LIBUUID_VERSION_INFO])
|
||||
|
||||
AC_CONFIG_FILES(
|
||||
[Makefile]
|
||||
[uuid.pc]
|
||||
)
|
||||
AC_OUTPUT
|
||||
45
deps/libuuid/copy.c
vendored
Normal file
45
deps/libuuid/copy.c
vendored
Normal file
@ -0,0 +1,45 @@
|
||||
/*
|
||||
* copy.c --- copy UUIDs
|
||||
*
|
||||
* Copyright (C) 1996, 1997 Theodore Ts'o.
|
||||
*
|
||||
* %Begin-Header%
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, and the entire permission notice in its entirety,
|
||||
* including the disclaimer of warranties.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. The name of the author may not be used to endorse or promote
|
||||
* products derived from this software without specific prior
|
||||
* written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
||||
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
|
||||
* WHICH ARE HEREBY DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE
|
||||
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
|
||||
* OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
|
||||
* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
||||
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
|
||||
* USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
|
||||
* DAMAGE.
|
||||
* %End-Header%
|
||||
*/
|
||||
|
||||
#include "uuidP.h"
|
||||
|
||||
void uuid_copy(uuid_t dst, const uuid_t src)
|
||||
{
|
||||
unsigned char *cp1;
|
||||
const unsigned char *cp2;
|
||||
int i;
|
||||
|
||||
for (i=0, cp1 = dst, cp2 = src; i < 16; i++)
|
||||
*cp1++ = *cp2++;
|
||||
}
|
||||
1
deps/libuuid/depcomp
vendored
Symbolic link
1
deps/libuuid/depcomp
vendored
Symbolic link
@ -0,0 +1 @@
|
||||
/usr/share/automake-1.15/depcomp
|
||||
595
deps/libuuid/gen_uuid.c
vendored
Normal file
595
deps/libuuid/gen_uuid.c
vendored
Normal file
@ -0,0 +1,595 @@
|
||||
/*
|
||||
* gen_uuid.c --- generate a DCE-compatible uuid
|
||||
*
|
||||
* Copyright (C) 1996, 1997, 1998, 1999 Theodore Ts'o.
|
||||
*
|
||||
* %Begin-Header%
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, and the entire permission notice in its entirety,
|
||||
* including the disclaimer of warranties.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. The name of the author may not be used to endorse or promote
|
||||
* products derived from this software without specific prior
|
||||
* written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
||||
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
|
||||
* WHICH ARE HEREBY DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE
|
||||
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
|
||||
* OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
|
||||
* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
||||
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
|
||||
* USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
|
||||
* DAMAGE.
|
||||
* %End-Header%
|
||||
*/
|
||||
|
||||
/*
|
||||
* Force inclusion of SVID stuff since we need it if we're compiling in
|
||||
* gcc-wall wall mode
|
||||
*/
|
||||
#define _SVID_SOURCE
|
||||
|
||||
#ifdef _WIN32
|
||||
#define _WIN32_WINNT 0x0500
|
||||
#include <windows.h>
|
||||
#define UUID MYUUID
|
||||
#endif
|
||||
#include <stdio.h>
|
||||
#ifdef HAVE_UNISTD_H
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
#ifdef HAVE_STDLIB_H
|
||||
#include <stdlib.h>
|
||||
#endif
|
||||
#include <string.h>
|
||||
#include <fcntl.h>
|
||||
#include <errno.h>
|
||||
#include <limits.h>
|
||||
#include <sys/types.h>
|
||||
#ifdef HAVE_SYS_TIME_H
|
||||
#include <sys/time.h>
|
||||
#endif
|
||||
#include <sys/stat.h>
|
||||
#ifdef HAVE_SYS_FILE_H
|
||||
#include <sys/file.h>
|
||||
#endif
|
||||
#ifdef HAVE_SYS_IOCTL_H
|
||||
#include <sys/ioctl.h>
|
||||
#endif
|
||||
#ifdef HAVE_SYS_SOCKET_H
|
||||
#include <sys/socket.h>
|
||||
#endif
|
||||
#ifdef HAVE_SYS_UN_H
|
||||
#include <sys/un.h>
|
||||
#endif
|
||||
#ifdef HAVE_SYS_SOCKIO_H
|
||||
#include <sys/sockio.h>
|
||||
#endif
|
||||
#ifdef HAVE_NET_IF_H
|
||||
#include <net/if.h>
|
||||
#endif
|
||||
#ifdef HAVE_NETINET_IN_H
|
||||
#include <netinet/in.h>
|
||||
#endif
|
||||
#ifdef HAVE_NET_IF_DL_H
|
||||
#include <net/if_dl.h>
|
||||
#endif
|
||||
#if defined(__linux__) && defined(HAVE_SYS_SYSCALL_H)
|
||||
#include <sys/syscall.h>
|
||||
#endif
|
||||
|
||||
#include "all-io.h"
|
||||
#include "uuidP.h"
|
||||
#include "uuidd.h"
|
||||
#include "randutils.h"
|
||||
#include "c.h"
|
||||
|
||||
#ifdef HAVE_TLS
|
||||
#define THREAD_LOCAL static __thread
|
||||
#else
|
||||
#define THREAD_LOCAL static
|
||||
#endif
|
||||
|
||||
#ifndef LOCK_EX
|
||||
/* flock() replacement */
|
||||
#define LOCK_EX 1
|
||||
#define LOCK_SH 2
|
||||
#define LOCK_UN 3
|
||||
#define LOCK_NB 4
|
||||
|
||||
static int flock(int fd, int op)
|
||||
{
|
||||
int rc = 0;
|
||||
|
||||
#if defined(F_SETLK) && defined(F_SETLKW)
|
||||
struct flock fl = {0};
|
||||
|
||||
switch (op & (LOCK_EX|LOCK_SH|LOCK_UN)) {
|
||||
case LOCK_EX:
|
||||
fl.l_type = F_WRLCK;
|
||||
break;
|
||||
|
||||
case LOCK_SH:
|
||||
fl.l_type = F_RDLCK;
|
||||
break;
|
||||
|
||||
case LOCK_UN:
|
||||
fl.l_type = F_UNLCK;
|
||||
break;
|
||||
|
||||
default:
|
||||
errno = EINVAL;
|
||||
return -1;
|
||||
}
|
||||
|
||||
fl.l_whence = SEEK_SET;
|
||||
rc = fcntl (fd, op & LOCK_NB ? F_SETLK : F_SETLKW, &fl);
|
||||
|
||||
if (rc && (errno == EAGAIN))
|
||||
errno = EWOULDBLOCK;
|
||||
#endif /* defined(F_SETLK) && defined(F_SETLKW) */
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
||||
#endif /* LOCK_EX */
|
||||
|
||||
#ifdef _WIN32
|
||||
static void gettimeofday (struct timeval *tv, void *dummy)
|
||||
{
|
||||
FILETIME ftime;
|
||||
uint64_t n;
|
||||
|
||||
GetSystemTimeAsFileTime (&ftime);
|
||||
n = (((uint64_t) ftime.dwHighDateTime << 32)
|
||||
+ (uint64_t) ftime.dwLowDateTime);
|
||||
if (n) {
|
||||
n /= 10;
|
||||
n -= ((369 * 365 + 89) * (uint64_t) 86400) * 1000000;
|
||||
}
|
||||
|
||||
tv->tv_sec = n / 1000000;
|
||||
tv->tv_usec = n % 1000000;
|
||||
}
|
||||
|
||||
static int getuid (void)
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Get the ethernet hardware address, if we can find it...
|
||||
*
|
||||
* XXX for a windows version, probably should use GetAdaptersInfo:
|
||||
* http://www.codeguru.com/cpp/i-n/network/networkinformation/article.php/c5451
|
||||
* commenting out get_node_id just to get gen_uuid to compile under windows
|
||||
* is not the right way to go!
|
||||
*/
|
||||
static int get_node_id(unsigned char *node_id)
|
||||
{
|
||||
#ifdef HAVE_NET_IF_H
|
||||
int sd;
|
||||
struct ifreq ifr, *ifrp;
|
||||
struct ifconf ifc;
|
||||
char buf[1024];
|
||||
int n, i;
|
||||
unsigned char *a;
|
||||
#ifdef HAVE_NET_IF_DL_H
|
||||
struct sockaddr_dl *sdlp;
|
||||
#endif
|
||||
|
||||
/*
|
||||
* BSD 4.4 defines the size of an ifreq to be
|
||||
* max(sizeof(ifreq), sizeof(ifreq.ifr_name)+ifreq.ifr_addr.sa_len
|
||||
* However, under earlier systems, sa_len isn't present, so the size is
|
||||
* just sizeof(struct ifreq)
|
||||
*/
|
||||
#ifdef HAVE_SA_LEN
|
||||
#define ifreq_size(i) max(sizeof(struct ifreq),\
|
||||
sizeof((i).ifr_name)+(i).ifr_addr.sa_len)
|
||||
#else
|
||||
#define ifreq_size(i) sizeof(struct ifreq)
|
||||
#endif /* HAVE_SA_LEN */
|
||||
|
||||
sd = socket(AF_INET, SOCK_DGRAM, IPPROTO_IP);
|
||||
if (sd < 0) {
|
||||
return -1;
|
||||
}
|
||||
memset(buf, 0, sizeof(buf));
|
||||
ifc.ifc_len = sizeof(buf);
|
||||
ifc.ifc_buf = buf;
|
||||
if (ioctl (sd, SIOCGIFCONF, (char *)&ifc) < 0) {
|
||||
close(sd);
|
||||
return -1;
|
||||
}
|
||||
n = ifc.ifc_len;
|
||||
for (i = 0; i < n; i+= ifreq_size(*ifrp) ) {
|
||||
ifrp = (struct ifreq *)((char *) ifc.ifc_buf+i);
|
||||
strncpy(ifr.ifr_name, ifrp->ifr_name, IFNAMSIZ);
|
||||
#ifdef SIOCGIFHWADDR
|
||||
if (ioctl(sd, SIOCGIFHWADDR, &ifr) < 0)
|
||||
continue;
|
||||
a = (unsigned char *) &ifr.ifr_hwaddr.sa_data;
|
||||
#else
|
||||
#ifdef SIOCGENADDR
|
||||
if (ioctl(sd, SIOCGENADDR, &ifr) < 0)
|
||||
continue;
|
||||
a = (unsigned char *) ifr.ifr_enaddr;
|
||||
#else
|
||||
#ifdef HAVE_NET_IF_DL_H
|
||||
sdlp = (struct sockaddr_dl *) &ifrp->ifr_addr;
|
||||
if ((sdlp->sdl_family != AF_LINK) || (sdlp->sdl_alen != 6))
|
||||
continue;
|
||||
a = (unsigned char *) &sdlp->sdl_data[sdlp->sdl_nlen];
|
||||
#else
|
||||
/*
|
||||
* XXX we don't have a way of getting the hardware
|
||||
* address
|
||||
*/
|
||||
close(sd);
|
||||
return 0;
|
||||
#endif /* HAVE_NET_IF_DL_H */
|
||||
#endif /* SIOCGENADDR */
|
||||
#endif /* SIOCGIFHWADDR */
|
||||
if (!a[0] && !a[1] && !a[2] && !a[3] && !a[4] && !a[5])
|
||||
continue;
|
||||
if (node_id) {
|
||||
memcpy(node_id, a, 6);
|
||||
close(sd);
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
close(sd);
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Assume that the gettimeofday() has microsecond granularity */
|
||||
#define MAX_ADJUSTMENT 10
|
||||
|
||||
/*
|
||||
* Get clock from global sequence clock counter.
|
||||
*
|
||||
* Return -1 if the clock counter could not be opened/locked (in this case
|
||||
* pseudorandom value is returned in @ret_clock_seq), otherwise return 0.
|
||||
*/
|
||||
static int get_clock(uint32_t *clock_high, uint32_t *clock_low,
|
||||
uint16_t *ret_clock_seq, int *num)
|
||||
{
|
||||
THREAD_LOCAL int adjustment = 0;
|
||||
THREAD_LOCAL struct timeval last = {0, 0};
|
||||
THREAD_LOCAL int state_fd = -2;
|
||||
THREAD_LOCAL FILE *state_f;
|
||||
THREAD_LOCAL uint16_t clock_seq;
|
||||
struct timeval tv;
|
||||
uint64_t clock_reg;
|
||||
mode_t save_umask;
|
||||
int len;
|
||||
int ret = 0;
|
||||
|
||||
if (state_fd == -2) {
|
||||
save_umask = umask(0);
|
||||
state_fd = open(LIBUUID_CLOCK_FILE, O_RDWR|O_CREAT|O_CLOEXEC, 0660);
|
||||
(void) umask(save_umask);
|
||||
if (state_fd != -1) {
|
||||
state_f = fdopen(state_fd, "r+" UL_CLOEXECSTR);
|
||||
if (!state_f) {
|
||||
close(state_fd);
|
||||
state_fd = -1;
|
||||
ret = -1;
|
||||
}
|
||||
}
|
||||
else
|
||||
ret = -1;
|
||||
}
|
||||
if (state_fd >= 0) {
|
||||
rewind(state_f);
|
||||
while (flock(state_fd, LOCK_EX) < 0) {
|
||||
if ((errno == EAGAIN) || (errno == EINTR))
|
||||
continue;
|
||||
fclose(state_f);
|
||||
close(state_fd);
|
||||
state_fd = -1;
|
||||
ret = -1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (state_fd >= 0) {
|
||||
unsigned int cl;
|
||||
unsigned long tv1, tv2;
|
||||
int a;
|
||||
|
||||
if (fscanf(state_f, "clock: %04x tv: %lu %lu adj: %d\n",
|
||||
&cl, &tv1, &tv2, &a) == 4) {
|
||||
clock_seq = cl & 0x3FFF;
|
||||
last.tv_sec = tv1;
|
||||
last.tv_usec = tv2;
|
||||
adjustment = a;
|
||||
}
|
||||
}
|
||||
|
||||
if ((last.tv_sec == 0) && (last.tv_usec == 0)) {
|
||||
random_get_bytes(&clock_seq, sizeof(clock_seq));
|
||||
clock_seq &= 0x3FFF;
|
||||
gettimeofday(&last, 0);
|
||||
last.tv_sec--;
|
||||
}
|
||||
|
||||
try_again:
|
||||
gettimeofday(&tv, 0);
|
||||
if ((tv.tv_sec < last.tv_sec) ||
|
||||
((tv.tv_sec == last.tv_sec) &&
|
||||
(tv.tv_usec < last.tv_usec))) {
|
||||
clock_seq = (clock_seq+1) & 0x3FFF;
|
||||
adjustment = 0;
|
||||
last = tv;
|
||||
} else if ((tv.tv_sec == last.tv_sec) &&
|
||||
(tv.tv_usec == last.tv_usec)) {
|
||||
if (adjustment >= MAX_ADJUSTMENT)
|
||||
goto try_again;
|
||||
adjustment++;
|
||||
} else {
|
||||
adjustment = 0;
|
||||
last = tv;
|
||||
}
|
||||
|
||||
clock_reg = tv.tv_usec*10 + adjustment;
|
||||
clock_reg += ((uint64_t) tv.tv_sec)*10000000;
|
||||
clock_reg += (((uint64_t) 0x01B21DD2) << 32) + 0x13814000;
|
||||
|
||||
if (num && (*num > 1)) {
|
||||
adjustment += *num - 1;
|
||||
last.tv_usec += adjustment / 10;
|
||||
adjustment = adjustment % 10;
|
||||
last.tv_sec += last.tv_usec / 1000000;
|
||||
last.tv_usec = last.tv_usec % 1000000;
|
||||
}
|
||||
|
||||
if (state_fd >= 0) {
|
||||
rewind(state_f);
|
||||
len = fprintf(state_f,
|
||||
"clock: %04x tv: %016lu %08lu adj: %08d\n",
|
||||
clock_seq, last.tv_sec, last.tv_usec, adjustment);
|
||||
fflush(state_f);
|
||||
if (ftruncate(state_fd, len) < 0) {
|
||||
fprintf(state_f, " \n");
|
||||
fflush(state_f);
|
||||
}
|
||||
rewind(state_f);
|
||||
flock(state_fd, LOCK_UN);
|
||||
}
|
||||
|
||||
*clock_high = clock_reg >> 32;
|
||||
*clock_low = clock_reg;
|
||||
*ret_clock_seq = clock_seq;
|
||||
return ret;
|
||||
}
|
||||
|
||||
#if defined(HAVE_UUIDD) && defined(HAVE_SYS_UN_H)
|
||||
/*
|
||||
* Try using the uuidd daemon to generate the UUID
|
||||
*
|
||||
* Returns 0 on success, non-zero on failure.
|
||||
*/
|
||||
static int get_uuid_via_daemon(int op, uuid_t out, int *num)
|
||||
{
|
||||
char op_buf[64];
|
||||
int op_len;
|
||||
int s;
|
||||
ssize_t ret;
|
||||
int32_t reply_len = 0, expected = 16;
|
||||
struct sockaddr_un srv_addr;
|
||||
|
||||
if ((s = socket(AF_UNIX, SOCK_STREAM, 0)) < 0)
|
||||
return -1;
|
||||
|
||||
srv_addr.sun_family = AF_UNIX;
|
||||
strcpy(srv_addr.sun_path, UUIDD_SOCKET_PATH);
|
||||
|
||||
if (connect(s, (const struct sockaddr *) &srv_addr,
|
||||
sizeof(struct sockaddr_un)) < 0)
|
||||
goto fail;
|
||||
|
||||
op_buf[0] = op;
|
||||
op_len = 1;
|
||||
if (op == UUIDD_OP_BULK_TIME_UUID) {
|
||||
memcpy(op_buf+1, num, sizeof(*num));
|
||||
op_len += sizeof(*num);
|
||||
expected += sizeof(*num);
|
||||
}
|
||||
|
||||
ret = write(s, op_buf, op_len);
|
||||
if (ret < 1)
|
||||
goto fail;
|
||||
|
||||
ret = read_all(s, (char *) &reply_len, sizeof(reply_len));
|
||||
if (ret < 0)
|
||||
goto fail;
|
||||
|
||||
if (reply_len != expected)
|
||||
goto fail;
|
||||
|
||||
ret = read_all(s, op_buf, reply_len);
|
||||
|
||||
if (op == UUIDD_OP_BULK_TIME_UUID)
|
||||
memcpy(op_buf+16, num, sizeof(int));
|
||||
|
||||
memcpy(out, op_buf, 16);
|
||||
|
||||
close(s);
|
||||
return ((ret == expected) ? 0 : -1);
|
||||
|
||||
fail:
|
||||
close(s);
|
||||
return -1;
|
||||
}
|
||||
|
||||
#else /* !defined(HAVE_UUIDD) && defined(HAVE_SYS_UN_H) */
|
||||
static int get_uuid_via_daemon(int op, uuid_t out, int *num)
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
#endif
|
||||
|
||||
int __uuid_generate_time(uuid_t out, int *num)
|
||||
{
|
||||
static unsigned char node_id[6];
|
||||
static int has_init = 0;
|
||||
struct uuid uu;
|
||||
uint32_t clock_mid;
|
||||
int ret;
|
||||
|
||||
if (!has_init) {
|
||||
if (get_node_id(node_id) <= 0) {
|
||||
random_get_bytes(node_id, 6);
|
||||
/*
|
||||
* Set multicast bit, to prevent conflicts
|
||||
* with IEEE 802 addresses obtained from
|
||||
* network cards
|
||||
*/
|
||||
node_id[0] |= 0x01;
|
||||
}
|
||||
has_init = 1;
|
||||
}
|
||||
ret = get_clock(&clock_mid, &uu.time_low, &uu.clock_seq, num);
|
||||
uu.clock_seq |= 0x8000;
|
||||
uu.time_mid = (uint16_t) clock_mid;
|
||||
uu.time_hi_and_version = ((clock_mid >> 16) & 0x0FFF) | 0x1000;
|
||||
memcpy(uu.node, node_id, 6);
|
||||
uuid_pack(&uu, out);
|
||||
return ret;
|
||||
}
|
||||
|
||||
/*
|
||||
* Generate time-based UUID and store it to @out
|
||||
*
|
||||
* Tries to guarantee uniqueness of the generated UUIDs by obtaining them from the uuidd daemon,
|
||||
* or, if uuidd is not usable, by using the global clock state counter (see get_clock()).
|
||||
* If neither of these is possible (e.g. because of insufficient permissions), it generates
|
||||
* the UUID anyway, but returns -1. Otherwise, returns 0.
|
||||
*/
|
||||
static int uuid_generate_time_generic(uuid_t out) {
|
||||
#ifdef HAVE_TLS
|
||||
THREAD_LOCAL int num = 0;
|
||||
THREAD_LOCAL struct uuid uu;
|
||||
THREAD_LOCAL time_t last_time = 0;
|
||||
time_t now;
|
||||
|
||||
if (num > 0) {
|
||||
now = time(0);
|
||||
if (now > last_time+1)
|
||||
num = 0;
|
||||
}
|
||||
if (num <= 0) {
|
||||
num = 1000;
|
||||
if (get_uuid_via_daemon(UUIDD_OP_BULK_TIME_UUID,
|
||||
out, &num) == 0) {
|
||||
last_time = time(0);
|
||||
uuid_unpack(out, &uu);
|
||||
num--;
|
||||
return 0;
|
||||
}
|
||||
num = 0;
|
||||
}
|
||||
if (num > 0) {
|
||||
uu.time_low++;
|
||||
if (uu.time_low == 0) {
|
||||
uu.time_mid++;
|
||||
if (uu.time_mid == 0)
|
||||
uu.time_hi_and_version++;
|
||||
}
|
||||
num--;
|
||||
uuid_pack(&uu, out);
|
||||
return 0;
|
||||
}
|
||||
#else
|
||||
if (get_uuid_via_daemon(UUIDD_OP_TIME_UUID, out, 0) == 0)
|
||||
return 0;
|
||||
#endif
|
||||
|
||||
return __uuid_generate_time(out, 0);
|
||||
}
|
||||
|
||||
/*
|
||||
* Generate time-based UUID and store it to @out.
|
||||
*
|
||||
* Discards return value from uuid_generate_time_generic()
|
||||
*/
|
||||
void uuid_generate_time(uuid_t out)
|
||||
{
|
||||
(void)uuid_generate_time_generic(out);
|
||||
}
|
||||
|
||||
|
||||
int uuid_generate_time_safe(uuid_t out)
|
||||
{
|
||||
return uuid_generate_time_generic(out);
|
||||
}
|
||||
|
||||
|
||||
void __uuid_generate_random(uuid_t out, int *num)
|
||||
{
|
||||
uuid_t buf;
|
||||
struct uuid uu;
|
||||
int i, n;
|
||||
|
||||
if (!num || !*num)
|
||||
n = 1;
|
||||
else
|
||||
n = *num;
|
||||
|
||||
for (i = 0; i < n; i++) {
|
||||
random_get_bytes(buf, sizeof(buf));
|
||||
uuid_unpack(buf, &uu);
|
||||
|
||||
uu.clock_seq = (uu.clock_seq & 0x3FFF) | 0x8000;
|
||||
uu.time_hi_and_version = (uu.time_hi_and_version & 0x0FFF)
|
||||
| 0x4000;
|
||||
uuid_pack(&uu, out);
|
||||
out += sizeof(uuid_t);
|
||||
}
|
||||
}
|
||||
|
||||
void uuid_generate_random(uuid_t out)
|
||||
{
|
||||
int num = 1;
|
||||
/* No real reason to use the daemon for random uuid's -- yet */
|
||||
|
||||
__uuid_generate_random(out, &num);
|
||||
}
|
||||
|
||||
/*
|
||||
* Check whether good random source (/dev/random or /dev/urandom)
|
||||
* is available.
|
||||
*/
|
||||
static int have_random_source(void)
|
||||
{
|
||||
struct stat s;
|
||||
|
||||
return (!stat("/dev/random", &s) || !stat("/dev/urandom", &s));
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* This is the generic front-end to uuid_generate_random and
|
||||
* uuid_generate_time. It uses uuid_generate_random only if
|
||||
* /dev/urandom is available, since otherwise we won't have
|
||||
* high-quality randomness.
|
||||
*/
|
||||
void uuid_generate(uuid_t out)
|
||||
{
|
||||
if (have_random_source())
|
||||
uuid_generate_random(out);
|
||||
else
|
||||
uuid_generate_time(out);
|
||||
}
|
||||
1
deps/libuuid/install-sh
vendored
Symbolic link
1
deps/libuuid/install-sh
vendored
Symbolic link
@ -0,0 +1 @@
|
||||
/usr/share/automake-1.15/install-sh
|
||||
48
deps/libuuid/isnull.c
vendored
Normal file
48
deps/libuuid/isnull.c
vendored
Normal file
@ -0,0 +1,48 @@
|
||||
/*
|
||||
* isnull.c --- Check whether or not the UUID is null
|
||||
*
|
||||
* Copyright (C) 1996, 1997 Theodore Ts'o.
|
||||
*
|
||||
* %Begin-Header%
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, and the entire permission notice in its entirety,
|
||||
* including the disclaimer of warranties.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. The name of the author may not be used to endorse or promote
|
||||
* products derived from this software without specific prior
|
||||
* written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
||||
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
|
||||
* WHICH ARE HEREBY DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE
|
||||
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
|
||||
* OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
|
||||
* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
||||
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
|
||||
* USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
|
||||
* DAMAGE.
|
||||
* %End-Header%
|
||||
*/
|
||||
|
||||
#include "uuidP.h"
|
||||
|
||||
/* Returns 1 if the uuid is the NULL uuid */
|
||||
int uuid_is_null(const uuid_t uu)
|
||||
{
|
||||
const unsigned char *cp;
|
||||
int i;
|
||||
|
||||
for (i=0, cp = uu; i < 16; i++)
|
||||
if (*cp++)
|
||||
return 0;
|
||||
return 1;
|
||||
}
|
||||
|
||||
1
deps/libuuid/ltmain.sh
vendored
Symbolic link
1
deps/libuuid/ltmain.sh
vendored
Symbolic link
@ -0,0 +1 @@
|
||||
/usr/share/libtool/build-aux/ltmain.sh
|
||||
1
deps/libuuid/missing
vendored
Symbolic link
1
deps/libuuid/missing
vendored
Symbolic link
@ -0,0 +1 @@
|
||||
/usr/share/automake-1.15/missing
|
||||
69
deps/libuuid/pack.c
vendored
Normal file
69
deps/libuuid/pack.c
vendored
Normal file
@ -0,0 +1,69 @@
|
||||
/*
|
||||
* Internal routine for packing UUIDs
|
||||
*
|
||||
* Copyright (C) 1996, 1997 Theodore Ts'o.
|
||||
*
|
||||
* %Begin-Header%
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, and the entire permission notice in its entirety,
|
||||
* including the disclaimer of warranties.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. The name of the author may not be used to endorse or promote
|
||||
* products derived from this software without specific prior
|
||||
* written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
||||
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
|
||||
* WHICH ARE HEREBY DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE
|
||||
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
|
||||
* OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
|
||||
* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
||||
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
|
||||
* USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
|
||||
* DAMAGE.
|
||||
* %End-Header%
|
||||
*/
|
||||
|
||||
#include <string.h>
|
||||
#include "uuidP.h"
|
||||
|
||||
void uuid_pack(const struct uuid *uu, uuid_t ptr)
|
||||
{
|
||||
uint32_t tmp;
|
||||
unsigned char *out = ptr;
|
||||
|
||||
tmp = uu->time_low;
|
||||
out[3] = (unsigned char) tmp;
|
||||
tmp >>= 8;
|
||||
out[2] = (unsigned char) tmp;
|
||||
tmp >>= 8;
|
||||
out[1] = (unsigned char) tmp;
|
||||
tmp >>= 8;
|
||||
out[0] = (unsigned char) tmp;
|
||||
|
||||
tmp = uu->time_mid;
|
||||
out[5] = (unsigned char) tmp;
|
||||
tmp >>= 8;
|
||||
out[4] = (unsigned char) tmp;
|
||||
|
||||
tmp = uu->time_hi_and_version;
|
||||
out[7] = (unsigned char) tmp;
|
||||
tmp >>= 8;
|
||||
out[6] = (unsigned char) tmp;
|
||||
|
||||
tmp = uu->clock_seq;
|
||||
out[9] = (unsigned char) tmp;
|
||||
tmp >>= 8;
|
||||
out[8] = (unsigned char) tmp;
|
||||
|
||||
memcpy(out+10, uu->node, 6);
|
||||
}
|
||||
|
||||
79
deps/libuuid/parse.c
vendored
Normal file
79
deps/libuuid/parse.c
vendored
Normal file
@ -0,0 +1,79 @@
|
||||
/*
|
||||
* parse.c --- UUID parsing
|
||||
*
|
||||
* Copyright (C) 1996, 1997 Theodore Ts'o.
|
||||
*
|
||||
* %Begin-Header%
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, and the entire permission notice in its entirety,
|
||||
* including the disclaimer of warranties.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. The name of the author may not be used to endorse or promote
|
||||
* products derived from this software without specific prior
|
||||
* written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
||||
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
|
||||
* WHICH ARE HEREBY DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE
|
||||
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
|
||||
* OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
|
||||
* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
||||
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
|
||||
* USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
|
||||
* DAMAGE.
|
||||
* %End-Header%
|
||||
*/
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <ctype.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "uuidP.h"
|
||||
|
||||
int uuid_parse(const char *in, uuid_t uu)
|
||||
{
|
||||
struct uuid uuid;
|
||||
int i;
|
||||
const char *cp;
|
||||
char buf[3];
|
||||
|
||||
if (strlen(in) != 36)
|
||||
return -1;
|
||||
for (i=0, cp = in; i <= 36; i++,cp++) {
|
||||
if ((i == 8) || (i == 13) || (i == 18) ||
|
||||
(i == 23)) {
|
||||
if (*cp == '-')
|
||||
continue;
|
||||
else
|
||||
return -1;
|
||||
}
|
||||
if (i== 36)
|
||||
if (*cp == 0)
|
||||
continue;
|
||||
if (!isxdigit(*cp))
|
||||
return -1;
|
||||
}
|
||||
uuid.time_low = strtoul(in, NULL, 16);
|
||||
uuid.time_mid = strtoul(in+9, NULL, 16);
|
||||
uuid.time_hi_and_version = strtoul(in+14, NULL, 16);
|
||||
uuid.clock_seq = strtoul(in+19, NULL, 16);
|
||||
cp = in+24;
|
||||
buf[2] = 0;
|
||||
for (i=0; i < 6; i++) {
|
||||
buf[0] = *cp++;
|
||||
buf[1] = *cp++;
|
||||
uuid.node[i] = strtoul(buf, NULL, 16);
|
||||
}
|
||||
|
||||
uuid_pack(&uuid, uu);
|
||||
return 0;
|
||||
}
|
||||
125
deps/libuuid/randutils.c
vendored
Normal file
125
deps/libuuid/randutils.c
vendored
Normal file
@ -0,0 +1,125 @@
|
||||
/*
|
||||
* General purpose random utilities
|
||||
*
|
||||
* Based on libuuid code.
|
||||
*
|
||||
* This file may be redistributed under the terms of the
|
||||
* GNU Lesser General Public License.
|
||||
*/
|
||||
#include <stdio.h>
|
||||
#include <unistd.h>
|
||||
#include <fcntl.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <sys/time.h>
|
||||
|
||||
#include <sys/syscall.h>
|
||||
|
||||
#include "randutils.h"
|
||||
|
||||
#ifdef HAVE_TLS
|
||||
#define THREAD_LOCAL static __thread
|
||||
#else
|
||||
#define THREAD_LOCAL static
|
||||
#endif
|
||||
|
||||
#if defined(__linux__) && defined(__NR_gettid) && defined(HAVE_JRAND48)
|
||||
#define DO_JRAND_MIX
|
||||
THREAD_LOCAL unsigned short ul_jrand_seed[3];
|
||||
#endif
|
||||
|
||||
int random_get_fd(void)
|
||||
{
|
||||
int i, fd;
|
||||
struct timeval tv;
|
||||
|
||||
gettimeofday(&tv, 0);
|
||||
fd = open("/dev/urandom", O_RDONLY);
|
||||
if (fd == -1)
|
||||
fd = open("/dev/random", O_RDONLY | O_NONBLOCK);
|
||||
if (fd >= 0) {
|
||||
i = fcntl(fd, F_GETFD);
|
||||
if (i >= 0)
|
||||
fcntl(fd, F_SETFD, i | FD_CLOEXEC);
|
||||
}
|
||||
srand((getpid() << 16) ^ getuid() ^ tv.tv_sec ^ tv.tv_usec);
|
||||
|
||||
#ifdef DO_JRAND_MIX
|
||||
ul_jrand_seed[0] = getpid() ^ (tv.tv_sec & 0xFFFF);
|
||||
ul_jrand_seed[1] = getppid() ^ (tv.tv_usec & 0xFFFF);
|
||||
ul_jrand_seed[2] = (tv.tv_sec ^ tv.tv_usec) >> 16;
|
||||
#endif
|
||||
/* Crank the random number generator a few times */
|
||||
gettimeofday(&tv, 0);
|
||||
for (i = (tv.tv_sec ^ tv.tv_usec) & 0x1F; i > 0; i--)
|
||||
rand();
|
||||
return fd;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Generate a stream of random nbytes into buf.
|
||||
* Use /dev/urandom if possible, and if not,
|
||||
* use glibc pseudo-random functions.
|
||||
*/
|
||||
void random_get_bytes(void *buf, size_t nbytes)
|
||||
{
|
||||
size_t i, n = nbytes;
|
||||
int fd = random_get_fd();
|
||||
int lose_counter = 0;
|
||||
unsigned char *cp = (unsigned char *) buf;
|
||||
|
||||
if (fd >= 0) {
|
||||
while (n > 0) {
|
||||
ssize_t x = read(fd, cp, n);
|
||||
if (x <= 0) {
|
||||
if (lose_counter++ > 16)
|
||||
break;
|
||||
continue;
|
||||
}
|
||||
n -= x;
|
||||
cp += x;
|
||||
lose_counter = 0;
|
||||
}
|
||||
|
||||
close(fd);
|
||||
}
|
||||
|
||||
/*
|
||||
* We do this all the time, but this is the only source of
|
||||
* randomness if /dev/random/urandom is out to lunch.
|
||||
*/
|
||||
for (cp = buf, i = 0; i < nbytes; i++)
|
||||
*cp++ ^= (rand() >> 7) & 0xFF;
|
||||
|
||||
#ifdef DO_JRAND_MIX
|
||||
{
|
||||
unsigned short tmp_seed[3];
|
||||
|
||||
memcpy(tmp_seed, ul_jrand_seed, sizeof(tmp_seed));
|
||||
ul_jrand_seed[2] = ul_jrand_seed[2] ^ syscall(__NR_gettid);
|
||||
for (cp = buf, i = 0; i < nbytes; i++)
|
||||
*cp++ ^= (jrand48(tmp_seed) >> 7) & 0xFF;
|
||||
memcpy(ul_jrand_seed, tmp_seed,
|
||||
sizeof(ul_jrand_seed)-sizeof(unsigned short));
|
||||
}
|
||||
#endif
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
#ifdef TEST_PROGRAM
|
||||
int main(int argc __attribute__ ((__unused__)),
|
||||
char *argv[] __attribute__ ((__unused__)))
|
||||
{
|
||||
unsigned int v, i;
|
||||
|
||||
/* generate and print 10 random numbers */
|
||||
for (i = 0; i < 10; i++) {
|
||||
random_get_bytes(&v, sizeof(v));
|
||||
printf("%d\n", v);
|
||||
}
|
||||
|
||||
return EXIT_SUCCESS;
|
||||
}
|
||||
#endif /* TEST_PROGRAM */
|
||||
12
deps/libuuid/randutils.h
vendored
Normal file
12
deps/libuuid/randutils.h
vendored
Normal file
@ -0,0 +1,12 @@
|
||||
#ifndef UTIL_LINUX_RANDUTILS
|
||||
#define UTIL_LINUX_RANDUTILS
|
||||
|
||||
#ifdef HAVE_SRANDOM
|
||||
#define srand(x) srandom(x)
|
||||
#define rand() random()
|
||||
#endif
|
||||
|
||||
extern int random_get_fd(void);
|
||||
extern void random_get_bytes(void *buf, size_t nbytes);
|
||||
|
||||
#endif
|
||||
180
deps/libuuid/test_uuid.c
vendored
Normal file
180
deps/libuuid/test_uuid.c
vendored
Normal file
@ -0,0 +1,180 @@
|
||||
/*
|
||||
* tst_uuid.c --- test program from the UUID library
|
||||
*
|
||||
* Copyright (C) 1996, 1997, 1998 Theodore Ts'o.
|
||||
*
|
||||
* %Begin-Header%
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, and the entire permission notice in its entirety,
|
||||
* including the disclaimer of warranties.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. The name of the author may not be used to endorse or promote
|
||||
* products derived from this software without specific prior
|
||||
* written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
||||
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
|
||||
* WHICH ARE HEREBY DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE
|
||||
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
|
||||
* OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
|
||||
* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
||||
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
|
||||
* USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
|
||||
* DAMAGE.
|
||||
* %End-Header%
|
||||
*/
|
||||
|
||||
#ifdef _WIN32
|
||||
#define _WIN32_WINNT 0x0500
|
||||
#include <windows.h>
|
||||
#define UUID MYUUID
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "uuid.h"
|
||||
|
||||
static int test_uuid(const char * uuid, int isValid)
|
||||
{
|
||||
static const char * validStr[2] = {"invalid", "valid"};
|
||||
uuid_t uuidBits;
|
||||
int parsedOk;
|
||||
|
||||
parsedOk = uuid_parse(uuid, uuidBits) == 0;
|
||||
|
||||
printf("%s is %s", uuid, validStr[isValid]);
|
||||
if (parsedOk != isValid) {
|
||||
printf(" but uuid_parse says %s\n", validStr[parsedOk]);
|
||||
return 1;
|
||||
}
|
||||
printf(", OK\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef __GNUC__
|
||||
#define ATTR(x) __attribute__(x)
|
||||
#else
|
||||
#define ATTR(x)
|
||||
#endif
|
||||
|
||||
int
|
||||
main(int argc ATTR((unused)) , char **argv ATTR((unused)))
|
||||
{
|
||||
uuid_t buf, tst;
|
||||
char str[100];
|
||||
struct timeval tv;
|
||||
time_t time_reg;
|
||||
unsigned char *cp;
|
||||
int i;
|
||||
int failed = 0;
|
||||
int type, variant;
|
||||
|
||||
uuid_generate(buf);
|
||||
uuid_unparse(buf, str);
|
||||
printf("UUID generate = %s\n", str);
|
||||
printf("UUID: ");
|
||||
for (i=0, cp = (unsigned char *) &buf; i < 16; i++) {
|
||||
printf("%02x", *cp++);
|
||||
}
|
||||
printf("\n");
|
||||
type = uuid_type(buf); variant = uuid_variant(buf);
|
||||
printf("UUID type = %d, UUID variant = %d\n", type, variant);
|
||||
if (variant != UUID_VARIANT_DCE) {
|
||||
printf("Incorrect UUID Variant; was expecting DCE!\n");
|
||||
failed++;
|
||||
}
|
||||
printf("\n");
|
||||
|
||||
uuid_generate_random(buf);
|
||||
uuid_unparse(buf, str);
|
||||
printf("UUID random string = %s\n", str);
|
||||
printf("UUID: ");
|
||||
for (i=0, cp = (unsigned char *) &buf; i < 16; i++) {
|
||||
printf("%02x", *cp++);
|
||||
}
|
||||
printf("\n");
|
||||
type = uuid_type(buf); variant = uuid_variant(buf);
|
||||
printf("UUID type = %d, UUID variant = %d\n", type, variant);
|
||||
if (variant != UUID_VARIANT_DCE) {
|
||||
printf("Incorrect UUID Variant; was expecting DCE!\n");
|
||||
failed++;
|
||||
}
|
||||
if (type != 4) {
|
||||
printf("Incorrect UUID type; was expecting "
|
||||
"4 (random type)!\n");
|
||||
failed++;
|
||||
}
|
||||
printf("\n");
|
||||
|
||||
uuid_generate_time(buf);
|
||||
uuid_unparse(buf, str);
|
||||
printf("UUID string = %s\n", str);
|
||||
printf("UUID time: ");
|
||||
for (i=0, cp = (unsigned char *) &buf; i < 16; i++) {
|
||||
printf("%02x", *cp++);
|
||||
}
|
||||
printf("\n");
|
||||
type = uuid_type(buf); variant = uuid_variant(buf);
|
||||
printf("UUID type = %d, UUID variant = %d\n", type, variant);
|
||||
if (variant != UUID_VARIANT_DCE) {
|
||||
printf("Incorrect UUID Variant; was expecting DCE!\n");
|
||||
failed++;
|
||||
}
|
||||
if (type != 1) {
|
||||
printf("Incorrect UUID type; was expecting "
|
||||
"1 (time-based type)!\\n");
|
||||
failed++;
|
||||
}
|
||||
tv.tv_sec = 0;
|
||||
tv.tv_usec = 0;
|
||||
time_reg = uuid_time(buf, &tv);
|
||||
printf("UUID time is: (%ld, %ld): %s\n", tv.tv_sec, tv.tv_usec,
|
||||
ctime(&time_reg));
|
||||
uuid_parse(str, tst);
|
||||
if (!uuid_compare(buf, tst))
|
||||
printf("UUID parse and compare succeeded.\n");
|
||||
else {
|
||||
printf("UUID parse and compare failed!\n");
|
||||
failed++;
|
||||
}
|
||||
uuid_clear(tst);
|
||||
if (uuid_is_null(tst))
|
||||
printf("UUID clear and is null succeeded.\n");
|
||||
else {
|
||||
printf("UUID clear and is null failed!\n");
|
||||
failed++;
|
||||
}
|
||||
uuid_copy(buf, tst);
|
||||
if (!uuid_compare(buf, tst))
|
||||
printf("UUID copy and compare succeeded.\n");
|
||||
else {
|
||||
printf("UUID copy and compare failed!\n");
|
||||
failed++;
|
||||
}
|
||||
failed += test_uuid("84949cc5-4701-4a84-895b-354c584a981b", 1);
|
||||
failed += test_uuid("84949CC5-4701-4A84-895B-354C584A981B", 1);
|
||||
failed += test_uuid("84949cc5-4701-4a84-895b-354c584a981bc", 0);
|
||||
failed += test_uuid("84949cc5-4701-4a84-895b-354c584a981", 0);
|
||||
failed += test_uuid("84949cc5x4701-4a84-895b-354c584a981b", 0);
|
||||
failed += test_uuid("84949cc504701-4a84-895b-354c584a981b", 0);
|
||||
failed += test_uuid("84949cc5-470104a84-895b-354c584a981b", 0);
|
||||
failed += test_uuid("84949cc5-4701-4a840895b-354c584a981b", 0);
|
||||
failed += test_uuid("84949cc5-4701-4a84-895b0354c584a981b", 0);
|
||||
failed += test_uuid("g4949cc5-4701-4a84-895b-354c584a981b", 0);
|
||||
failed += test_uuid("84949cc5-4701-4a84-895b-354c584a981g", 0);
|
||||
|
||||
if (failed) {
|
||||
printf("%d failures.\n", failed);
|
||||
exit(1);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
63
deps/libuuid/unpack.c
vendored
Normal file
63
deps/libuuid/unpack.c
vendored
Normal file
@ -0,0 +1,63 @@
|
||||
/*
|
||||
* Internal routine for unpacking UUID
|
||||
*
|
||||
* Copyright (C) 1996, 1997 Theodore Ts'o.
|
||||
*
|
||||
* %Begin-Header%
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, and the entire permission notice in its entirety,
|
||||
* including the disclaimer of warranties.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. The name of the author may not be used to endorse or promote
|
||||
* products derived from this software without specific prior
|
||||
* written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
||||
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
|
||||
* WHICH ARE HEREBY DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE
|
||||
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
|
||||
* OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
|
||||
* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
||||
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
|
||||
* USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
|
||||
* DAMAGE.
|
||||
* %End-Header%
|
||||
*/
|
||||
|
||||
#include <string.h>
|
||||
#include "uuidP.h"
|
||||
|
||||
void uuid_unpack(const uuid_t in, struct uuid *uu)
|
||||
{
|
||||
const uint8_t *ptr = in;
|
||||
uint32_t tmp;
|
||||
|
||||
tmp = *ptr++;
|
||||
tmp = (tmp << 8) | *ptr++;
|
||||
tmp = (tmp << 8) | *ptr++;
|
||||
tmp = (tmp << 8) | *ptr++;
|
||||
uu->time_low = tmp;
|
||||
|
||||
tmp = *ptr++;
|
||||
tmp = (tmp << 8) | *ptr++;
|
||||
uu->time_mid = tmp;
|
||||
|
||||
tmp = *ptr++;
|
||||
tmp = (tmp << 8) | *ptr++;
|
||||
uu->time_hi_and_version = tmp;
|
||||
|
||||
tmp = *ptr++;
|
||||
tmp = (tmp << 8) | *ptr++;
|
||||
uu->clock_seq = tmp;
|
||||
|
||||
memcpy(uu->node, ptr, 6);
|
||||
}
|
||||
|
||||
76
deps/libuuid/unparse.c
vendored
Normal file
76
deps/libuuid/unparse.c
vendored
Normal file
@ -0,0 +1,76 @@
|
||||
/*
|
||||
* unparse.c -- convert a UUID to string
|
||||
*
|
||||
* Copyright (C) 1996, 1997 Theodore Ts'o.
|
||||
*
|
||||
* %Begin-Header%
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, and the entire permission notice in its entirety,
|
||||
* including the disclaimer of warranties.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. The name of the author may not be used to endorse or promote
|
||||
* products derived from this software without specific prior
|
||||
* written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
||||
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
|
||||
* WHICH ARE HEREBY DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE
|
||||
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
|
||||
* OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
|
||||
* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
||||
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
|
||||
* USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
|
||||
* DAMAGE.
|
||||
* %End-Header%
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
#include "uuidP.h"
|
||||
|
||||
static const char *fmt_lower =
|
||||
"%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x";
|
||||
|
||||
static const char *fmt_upper =
|
||||
"%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X";
|
||||
|
||||
#ifdef UUID_UNPARSE_DEFAULT_UPPER
|
||||
#define FMT_DEFAULT fmt_upper
|
||||
#else
|
||||
#define FMT_DEFAULT fmt_lower
|
||||
#endif
|
||||
|
||||
static void uuid_unparse_x(const uuid_t uu, char *out, const char *fmt)
|
||||
{
|
||||
struct uuid uuid;
|
||||
|
||||
uuid_unpack(uu, &uuid);
|
||||
sprintf(out, fmt,
|
||||
uuid.time_low, uuid.time_mid, uuid.time_hi_and_version,
|
||||
uuid.clock_seq >> 8, uuid.clock_seq & 0xFF,
|
||||
uuid.node[0], uuid.node[1], uuid.node[2],
|
||||
uuid.node[3], uuid.node[4], uuid.node[5]);
|
||||
}
|
||||
|
||||
void uuid_unparse_lower(const uuid_t uu, char *out)
|
||||
{
|
||||
uuid_unparse_x(uu, out, fmt_lower);
|
||||
}
|
||||
|
||||
void uuid_unparse_upper(const uuid_t uu, char *out)
|
||||
{
|
||||
uuid_unparse_x(uu, out, fmt_upper);
|
||||
}
|
||||
|
||||
void uuid_unparse(const uuid_t uu, char *out)
|
||||
{
|
||||
uuid_unparse_x(uu, out, FMT_DEFAULT);
|
||||
}
|
||||
104
deps/libuuid/uuid.h
vendored
Normal file
104
deps/libuuid/uuid.h
vendored
Normal file
@ -0,0 +1,104 @@
|
||||
/*
|
||||
* Public include file for the UUID library
|
||||
*
|
||||
* Copyright (C) 1996, 1997, 1998 Theodore Ts'o.
|
||||
*
|
||||
* %Begin-Header%
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, and the entire permission notice in its entirety,
|
||||
* including the disclaimer of warranties.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. The name of the author may not be used to endorse or promote
|
||||
* products derived from this software without specific prior
|
||||
* written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
||||
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
|
||||
* WHICH ARE HEREBY DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE
|
||||
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
|
||||
* OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
|
||||
* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
||||
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
|
||||
* USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
|
||||
* DAMAGE.
|
||||
* %End-Header%
|
||||
*/
|
||||
|
||||
#ifndef _UUID_UUID_H
|
||||
#define _UUID_UUID_H
|
||||
|
||||
#include <sys/types.h>
|
||||
#ifndef _WIN32
|
||||
#include <sys/time.h>
|
||||
#endif
|
||||
#include <time.h>
|
||||
|
||||
typedef unsigned char uuid_t[16];
|
||||
|
||||
/* UUID Variant definitions */
|
||||
#define UUID_VARIANT_NCS 0
|
||||
#define UUID_VARIANT_DCE 1
|
||||
#define UUID_VARIANT_MICROSOFT 2
|
||||
#define UUID_VARIANT_OTHER 3
|
||||
|
||||
/* UUID Type definitions */
|
||||
#define UUID_TYPE_DCE_TIME 1
|
||||
#define UUID_TYPE_DCE_RANDOM 4
|
||||
|
||||
/* Allow UUID constants to be defined */
|
||||
#ifdef __GNUC__
|
||||
#define UUID_DEFINE(name,u0,u1,u2,u3,u4,u5,u6,u7,u8,u9,u10,u11,u12,u13,u14,u15) \
|
||||
static const uuid_t name __attribute__ ((unused)) = {u0,u1,u2,u3,u4,u5,u6,u7,u8,u9,u10,u11,u12,u13,u14,u15}
|
||||
#else
|
||||
#define UUID_DEFINE(name,u0,u1,u2,u3,u4,u5,u6,u7,u8,u9,u10,u11,u12,u13,u14,u15) \
|
||||
static const uuid_t name = {u0,u1,u2,u3,u4,u5,u6,u7,u8,u9,u10,u11,u12,u13,u14,u15}
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
/* clear.c */
|
||||
void uuid_clear(uuid_t uu);
|
||||
|
||||
/* compare.c */
|
||||
int uuid_compare(const uuid_t uu1, const uuid_t uu2);
|
||||
|
||||
/* copy.c */
|
||||
void uuid_copy(uuid_t dst, const uuid_t src);
|
||||
|
||||
/* gen_uuid.c */
|
||||
void uuid_generate(uuid_t out);
|
||||
void uuid_generate_random(uuid_t out);
|
||||
void uuid_generate_time(uuid_t out);
|
||||
int uuid_generate_time_safe(uuid_t out);
|
||||
|
||||
/* isnull.c */
|
||||
int uuid_is_null(const uuid_t uu);
|
||||
|
||||
/* parse.c */
|
||||
int uuid_parse(const char *in, uuid_t uu);
|
||||
|
||||
/* unparse.c */
|
||||
void uuid_unparse(const uuid_t uu, char *out);
|
||||
void uuid_unparse_lower(const uuid_t uu, char *out);
|
||||
void uuid_unparse_upper(const uuid_t uu, char *out);
|
||||
|
||||
/* uuid_time.c */
|
||||
time_t uuid_time(const uuid_t uu, struct timeval *ret_tv);
|
||||
int uuid_type(const uuid_t uu);
|
||||
int uuid_variant(const uuid_t uu);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* _UUID_UUID_H */
|
||||
11
deps/libuuid/uuid.pc.in
vendored
Normal file
11
deps/libuuid/uuid.pc.in
vendored
Normal file
@ -0,0 +1,11 @@
|
||||
prefix=@prefix@
|
||||
exec_prefix=@exec_prefix@
|
||||
libdir=@libdir@
|
||||
includedir=@includedir@
|
||||
|
||||
Name: uuid
|
||||
Description: Universally unique id library
|
||||
Version: @LIBUUID_VERSION@
|
||||
Requires:
|
||||
Cflags: -I${includedir}/uuid
|
||||
Libs: -L${libdir} -luuid
|
||||
61
deps/libuuid/uuidP.h
vendored
Normal file
61
deps/libuuid/uuidP.h
vendored
Normal file
@ -0,0 +1,61 @@
|
||||
/*
|
||||
* uuid.h -- private header file for uuids
|
||||
*
|
||||
* Copyright (C) 1996, 1997 Theodore Ts'o.
|
||||
*
|
||||
* %Begin-Header%
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, and the entire permission notice in its entirety,
|
||||
* including the disclaimer of warranties.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. The name of the author may not be used to endorse or promote
|
||||
* products derived from this software without specific prior
|
||||
* written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
||||
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
|
||||
* WHICH ARE HEREBY DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE
|
||||
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
|
||||
* OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
|
||||
* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
||||
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
|
||||
* USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
|
||||
* DAMAGE.
|
||||
* %End-Header%
|
||||
*/
|
||||
|
||||
#include <inttypes.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
#include "uuid.h"
|
||||
|
||||
#define LIBUUID_CLOCK_FILE "/var/lib/libuuid/clock.txt"
|
||||
|
||||
/*
|
||||
* Offset between 15-Oct-1582 and 1-Jan-70
|
||||
*/
|
||||
#define TIME_OFFSET_HIGH 0x01B21DD2
|
||||
#define TIME_OFFSET_LOW 0x13814000
|
||||
|
||||
struct uuid {
|
||||
uint32_t time_low;
|
||||
uint16_t time_mid;
|
||||
uint16_t time_hi_and_version;
|
||||
uint16_t clock_seq;
|
||||
uint8_t node[6];
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
* prototypes
|
||||
*/
|
||||
void uuid_pack(const struct uuid *uu, uuid_t ptr);
|
||||
void uuid_unpack(const uuid_t in, struct uuid *uu);
|
||||
171
deps/libuuid/uuid_time.c
vendored
Normal file
171
deps/libuuid/uuid_time.c
vendored
Normal file
@ -0,0 +1,171 @@
|
||||
/*
|
||||
* uuid_time.c --- Interpret the time field from a uuid. This program
|
||||
* violates the UUID abstraction barrier by reaching into the guts
|
||||
* of a UUID and interpreting it.
|
||||
*
|
||||
* Copyright (C) 1998, 1999 Theodore Ts'o.
|
||||
*
|
||||
* %Begin-Header%
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, and the entire permission notice in its entirety,
|
||||
* including the disclaimer of warranties.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. The name of the author may not be used to endorse or promote
|
||||
* products derived from this software without specific prior
|
||||
* written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
||||
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
|
||||
* WHICH ARE HEREBY DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE
|
||||
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
|
||||
* OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
|
||||
* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
||||
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
|
||||
* USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
|
||||
* DAMAGE.
|
||||
* %End-Header%
|
||||
*/
|
||||
|
||||
#ifdef _WIN32
|
||||
#define _WIN32_WINNT 0x0500
|
||||
#include <windows.h>
|
||||
#define UUID MYUUID
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
#ifdef HAVE_UNISTD_H
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
#include <stdlib.h>
|
||||
#include <sys/types.h>
|
||||
#ifdef HAVE_SYS_TIME_H
|
||||
#include <sys/time.h>
|
||||
#endif
|
||||
#include <time.h>
|
||||
|
||||
#include "uuidP.h"
|
||||
|
||||
time_t uuid_time(const uuid_t uu, struct timeval *ret_tv)
|
||||
{
|
||||
struct timeval tv;
|
||||
struct uuid uuid;
|
||||
uint32_t high;
|
||||
uint64_t clock_reg;
|
||||
|
||||
uuid_unpack(uu, &uuid);
|
||||
|
||||
high = uuid.time_mid | ((uuid.time_hi_and_version & 0xFFF) << 16);
|
||||
clock_reg = uuid.time_low | ((uint64_t) high << 32);
|
||||
|
||||
clock_reg -= (((uint64_t) 0x01B21DD2) << 32) + 0x13814000;
|
||||
tv.tv_sec = clock_reg / 10000000;
|
||||
tv.tv_usec = (clock_reg % 10000000) / 10;
|
||||
|
||||
if (ret_tv)
|
||||
*ret_tv = tv;
|
||||
|
||||
return tv.tv_sec;
|
||||
}
|
||||
|
||||
int uuid_type(const uuid_t uu)
|
||||
{
|
||||
struct uuid uuid;
|
||||
|
||||
uuid_unpack(uu, &uuid);
|
||||
return ((uuid.time_hi_and_version >> 12) & 0xF);
|
||||
}
|
||||
|
||||
int uuid_variant(const uuid_t uu)
|
||||
{
|
||||
struct uuid uuid;
|
||||
int var;
|
||||
|
||||
uuid_unpack(uu, &uuid);
|
||||
var = uuid.clock_seq;
|
||||
|
||||
if ((var & 0x8000) == 0)
|
||||
return UUID_VARIANT_NCS;
|
||||
if ((var & 0x4000) == 0)
|
||||
return UUID_VARIANT_DCE;
|
||||
if ((var & 0x2000) == 0)
|
||||
return UUID_VARIANT_MICROSOFT;
|
||||
return UUID_VARIANT_OTHER;
|
||||
}
|
||||
|
||||
#ifdef DEBUG
|
||||
static const char *variant_string(int variant)
|
||||
{
|
||||
switch (variant) {
|
||||
case UUID_VARIANT_NCS:
|
||||
return "NCS";
|
||||
case UUID_VARIANT_DCE:
|
||||
return "DCE";
|
||||
case UUID_VARIANT_MICROSOFT:
|
||||
return "Microsoft";
|
||||
default:
|
||||
return "Other";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
main(int argc, char **argv)
|
||||
{
|
||||
uuid_t buf;
|
||||
time_t time_reg;
|
||||
struct timeval tv;
|
||||
int type, variant;
|
||||
|
||||
if (argc != 2) {
|
||||
fprintf(stderr, "Usage: %s uuid\n", argv[0]);
|
||||
exit(1);
|
||||
}
|
||||
if (uuid_parse(argv[1], buf)) {
|
||||
fprintf(stderr, "Invalid UUID: %s\n", argv[1]);
|
||||
exit(1);
|
||||
}
|
||||
variant = uuid_variant(buf);
|
||||
type = uuid_type(buf);
|
||||
time_reg = uuid_time(buf, &tv);
|
||||
|
||||
printf("UUID variant is %d (%s)\n", variant, variant_string(variant));
|
||||
if (variant != UUID_VARIANT_DCE) {
|
||||
printf("Warning: This program only knows how to interpret "
|
||||
"DCE UUIDs.\n\tThe rest of the output is likely "
|
||||
"to be incorrect!!\n");
|
||||
}
|
||||
printf("UUID type is %d", type);
|
||||
switch (type) {
|
||||
case 1:
|
||||
printf(" (time based)\n");
|
||||
break;
|
||||
case 2:
|
||||
printf(" (DCE)\n");
|
||||
break;
|
||||
case 3:
|
||||
printf(" (name-based)\n");
|
||||
break;
|
||||
case 4:
|
||||
printf(" (random)\n");
|
||||
break;
|
||||
default:
|
||||
printf("\n");
|
||||
}
|
||||
if (type != 1) {
|
||||
printf("Warning: not a time-based UUID, so UUID time "
|
||||
"decoding will likely not work!\n");
|
||||
}
|
||||
printf("UUID time is: (%ld, %ld): %s\n", tv.tv_sec, tv.tv_usec,
|
||||
ctime(&time_reg));
|
||||
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
54
deps/libuuid/uuidd.h
vendored
Normal file
54
deps/libuuid/uuidd.h
vendored
Normal file
@ -0,0 +1,54 @@
|
||||
/*
|
||||
* Definitions used by the uuidd daemon
|
||||
*
|
||||
* Copyright (C) 2007 Theodore Ts'o.
|
||||
*
|
||||
* %Begin-Header%
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, and the entire permission notice in its entirety,
|
||||
* including the disclaimer of warranties.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. The name of the author may not be used to endorse or promote
|
||||
* products derived from this software without specific prior
|
||||
* written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
||||
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
|
||||
* WHICH ARE HEREBY DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE
|
||||
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
|
||||
* OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
|
||||
* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
||||
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
|
||||
* USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
|
||||
* DAMAGE.
|
||||
* %End-Header%
|
||||
*/
|
||||
|
||||
#ifndef _UUID_UUIDD_H
|
||||
#define _UUID_UUIDD_H
|
||||
|
||||
#define UUIDD_DIR _PATH_LOCALSTATEDIR "/uuidd"
|
||||
#define UUIDD_SOCKET_PATH UUIDD_DIR "/request"
|
||||
#define UUIDD_PIDFILE_PATH UUIDD_DIR "/uuidd.pid"
|
||||
#define UUIDD_PATH "/usr/sbin/uuidd"
|
||||
|
||||
#define UUIDD_OP_GETPID 0
|
||||
#define UUIDD_OP_GET_MAXOP 1
|
||||
#define UUIDD_OP_TIME_UUID 2
|
||||
#define UUIDD_OP_RANDOM_UUID 3
|
||||
#define UUIDD_OP_BULK_TIME_UUID 4
|
||||
#define UUIDD_OP_BULK_RANDOM_UUID 5
|
||||
#define UUIDD_MAX_OP UUIDD_OP_BULK_RANDOM_UUID
|
||||
|
||||
extern int __uuid_generate_time(uuid_t out, int *num);
|
||||
extern void __uuid_generate_random(uuid_t out, int *num);
|
||||
|
||||
#endif /* _UUID_UUID_H */
|
||||
9
dist/config/mnet.cfg.example
vendored
Normal file
9
dist/config/mnet.cfg.example
vendored
Normal file
@ -0,0 +1,9 @@
|
||||
MYNODE 1
|
||||
|
||||
IMHUB TRUE
|
||||
|
||||
INDIR /home/andrew/MagickaBBS/mnet/in
|
||||
OUTDIR /home/andrew/MagickaBBS/mnet/out
|
||||
|
||||
MSGAREA 1, /home/andrew/MagickaBBS/msgs/mnet_general, 2, 3, 4
|
||||
|
||||
1
dist/magicka.strings
vendored
1
dist/magicka.strings
vendored
@ -286,3 +286,4 @@ Read Now ? (Y / N):
|
||||
\r\n\r\n\e[1;37mEnter a title:\e[0m
|
||||
\e[1;30m[\e[1;34;44m%5d\e[1;30;40m]\e[1;31m!\e[1;37m%-24.24s \e[1;32m%-15.15s \e[1;33m%-15.15s \e[1;35m%02d:%02d %02d-%02d-%02d\e[K\e[0m\r\n
|
||||
\e[1;30m[\e[1;34m%5d\e[1;30m]\e[1;31m!\e[1;37m%-24.24s \e[1;32m%-15.15s \e[1;33m%-15.15s \e[1;35m%02d:%02d %02d-%02d-%02d\e[K\e[0m\r\n
|
||||
\e[2J\e[1;1H\e[1;32mFrom : \e[1;37m%s (@%d)\r\n
|
||||
|
||||
@ -7,6 +7,7 @@ LUA = ../deps/lua/liblua.a
|
||||
ODOORS = ../deps/odoors/libs-`uname -s`/libODoors.a
|
||||
JSMN = ../deps/jsmn/libjsmn.a
|
||||
CDK = ../deps/cdk-5-20161210/libcdk.a
|
||||
UUID = ../deps/libuuid/.libs/libuuid.a
|
||||
|
||||
all: magicka magimail magiedit ticproc mgpost magichat filecenter dosbox_shim magiftpd reset_pass
|
||||
|
||||
@ -29,11 +30,15 @@ $(CDK):
|
||||
cd ../deps/cdk-5.0-20161210/ && export CPPFLAGS=-I/usr/local/include && ./configure --with-ncurses
|
||||
cd ../deps/cdk-5.0-20161210/ && $(MAKE)
|
||||
|
||||
$(UUID):
|
||||
cd ../deps/libuuid/ && ./configure
|
||||
cd ../deps/libuuid/ && $(MAKE)
|
||||
|
||||
OBJ = inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o chat_system.o email.o files.o settings.o lua_glue.o strings.o bluewave.o hashmap/hashmap.o menus.o nodelist.o blog.o
|
||||
%.o: %.c $(DEPS)
|
||||
$(CC) -c -o $@ $< $(CFLAGS)
|
||||
|
||||
magicka: $(OBJ) ${LUA} ${JAMLIB} ${ZMODEM} ${JSMN}
|
||||
magicka: $(OBJ) ${LUA} ${JAMLIB} ${ZMODEM} ${JSMN} ${UUID}
|
||||
$(CC) -o ../magicka $^ $(CFLAGS) -L/usr/local/lib -lsqlite3 -lutil -lm -lssl -lcrypto -lssh -liconv
|
||||
|
||||
magimail: $(JAMLIB)
|
||||
|
||||
@ -9,6 +9,7 @@ MICROHTTPD=-lmicrohttpd
|
||||
ODOORS = ../deps/odoors/libs-`uname -s`/libODoors.a
|
||||
JSMN = ../deps/jsmn/libjsmn.a
|
||||
CDK = ../deps/cdk-5-20161210/libcdk.a
|
||||
UUID = ../deps/libuuid/.libs/libuuid.a
|
||||
|
||||
all: magicka magimail magiedit ticproc mgpost magichat filecenter dosbox_shim magiftpd reset_pass
|
||||
|
||||
@ -34,11 +35,15 @@ $(CDK):
|
||||
cd ../deps/cdk-5.0-20161210/ && export CPPFLAGS=-I/usr/local/include && ./configure --with-ncurses
|
||||
cd ../deps/cdk-5.0-20161210/ && $(MAKE)
|
||||
|
||||
$(UUID):
|
||||
cd ../deps/libuuid/ && ./configure
|
||||
cd ../deps/libuuid/ && $(MAKE)
|
||||
|
||||
OBJ = ../deps/aha/aha.o ../deps/hashids/hashids.o inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o chat_system.o email.o files.o settings.o lua_glue.o strings.o bluewave.o www.o www_email.o www_msgs.o www_last10.o www_blog.o www_files.o hashmap/hashmap.o menus.o nodelist.o blog.o
|
||||
%.o: %.c $(DEPS)
|
||||
$(CC) -c -o $@ $< $(CFLAGS)
|
||||
|
||||
magicka: $(OBJ) ${LUA} ${ZMODEM} ${JAMLIB} ${B64} ${JSMN}
|
||||
magicka: $(OBJ) ${LUA} ${ZMODEM} ${JAMLIB} ${B64} ${JSMN} ${UUID}
|
||||
$(CC) -o ../magicka $^ $(CFLAGS) -L/usr/local/lib -lsqlite3 -lutil -lm -lssl -lcrypto -lssh -liconv $(MICROHTTPD)
|
||||
|
||||
magimail: $(JAMLIB)
|
||||
|
||||
@ -7,6 +7,7 @@ LUA = ../deps/lua/liblua.a
|
||||
ODOORS = ../deps/odoors/libs-`uname -s`/libODoors.a
|
||||
JSMN = ../deps/jsmn/libjsmn.a
|
||||
CDK = ../deps/cdk-5-20161210/libcdk.a
|
||||
UUID = ../deps/libuuid/.libs/libuuid.a
|
||||
|
||||
all: magicka magimail magiedit ticproc mgpost magichat filecenter dosbox_shim magiftpd reset_pass
|
||||
|
||||
@ -29,12 +30,15 @@ $(CDK):
|
||||
cd ../deps/cdk-5.0-20161210/ && ./configure
|
||||
cd ../deps/cdk-5.0-20161210/ && $(MAKE)
|
||||
|
||||
$(UUID):
|
||||
cd ../deps/libuuid/ && ./configure
|
||||
cd ../deps/libuuid/ && $(MAKE)
|
||||
|
||||
OBJ = inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o chat_system.o email.o files.o settings.o lua_glue.o strings.o bluewave.o hashmap/hashmap.o menus.o nodelist.o blog.o
|
||||
%.o: %.c $(DEPS)
|
||||
$(CC) -c -o $@ $< $(CFLAGS)
|
||||
|
||||
magicka: $(OBJ) ${LUA} ${ZMODEM} ${JAMLIB} ${JSMN}
|
||||
magicka: $(OBJ) ${LUA} ${ZMODEM} ${JAMLIB} ${JSMN} ${UUID}
|
||||
$(CC) -o ../magicka $^ $(CFLAGS) -L/usr/local/lib -lsqlite3 -lutil -lm -ldl -lssl -lcrypto -lssh
|
||||
|
||||
magimail: $(JAMLIB)
|
||||
|
||||
@ -9,6 +9,7 @@ MICROHTTPD=-lmicrohttpd
|
||||
ODOORS = ../deps/odoors/libs-`uname -s`/libODoors.a
|
||||
JSMN = ../deps/jsmn/libjsmn.a
|
||||
CDK = ../deps/cdk-5-20161210/libcdk.a
|
||||
UUID = ../deps/libuuid/.libs/libuuid.a
|
||||
|
||||
all: magicka magimail magiedit ticproc mgpost magichat filecenter dosbox_shim magiftpd reset_pass
|
||||
|
||||
@ -34,11 +35,15 @@ $(CDK):
|
||||
cd ../deps/cdk-5.0-20161210/ && ./configure
|
||||
cd ../deps/cdk-5.0-20161210/ && $(MAKE)
|
||||
|
||||
$(UUID):
|
||||
cd ../deps/libuuid/ && ./configure
|
||||
cd ../deps/libuuid/ && $(MAKE)
|
||||
|
||||
OBJ = ../deps/aha/aha.o ../deps/hashids/hashids.o inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o chat_system.o email.o files.o settings.o lua_glue.o strings.o www.o www_email.o www_msgs.o www_last10.o www_blog.o www_files.o bluewave.o hashmap/hashmap.o menus.o nodelist.o blog.o
|
||||
%.o: %.c $(DEPS)
|
||||
$(CC) -c -o $@ $< $(CFLAGS)
|
||||
|
||||
magicka: $(OBJ) ${LUA} ${JAMLIB} ${ZMODEM} ${B64} ${JSMN}
|
||||
magicka: $(OBJ) ${LUA} ${JAMLIB} ${ZMODEM} ${B64} ${JSMN} ${UUID}
|
||||
$(CC) -o ../magicka $^ $(CFLAGS) -L/usr/local/lib -lsqlite3 -lutil -lm -ldl -lssl -lcrypto -lssh $(MICROHTTPD)
|
||||
|
||||
magimail: $(JAMLIB)
|
||||
|
||||
@ -7,6 +7,7 @@ LUA = ../deps/lua/liblua.a
|
||||
ODOORS = ../deps/odoors/libs-`uname -s`/libODoors.a
|
||||
JSMN = ../deps/jsmn/libjsmn.a
|
||||
CDK = ../deps/cdk-5-20161210/libcdk.a
|
||||
UUID = ../deps/libuuid/.libs/libuuid.a
|
||||
|
||||
all: magicka magimail magiedit ticproc mgpost magichat filecenter dosbox_shim magiftpd reset_pass
|
||||
|
||||
@ -29,11 +30,15 @@ $(CDK):
|
||||
cd ../deps/cdk-5.0-20161210/ && export CPPFLAGS=-I/usr/pkg/include && ./configure --with-ncurses
|
||||
cd ../deps/cdk-5.0-20161210/ && $(MAKE)
|
||||
|
||||
$(UUID):
|
||||
cd ../deps/libuuid/ && ./configure
|
||||
cd ../deps/libuuid/ && $(MAKE)
|
||||
|
||||
OBJ = inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o chat_system.o email.o files.o settings.o lua_glue.o strings.o bluewave.o hashmap/hashmap.o menus.o nodelist.o blog.o
|
||||
%.o: %.c $(DEPS)
|
||||
$(CC) -c -o $@ $< $(CFLAGS)
|
||||
|
||||
magicka: $(OBJ) ${LUA} ${ZMODEM} ${JAMLIB} ${JSMN}
|
||||
magicka: $(OBJ) ${LUA} ${ZMODEM} ${JAMLIB} ${JSMN} ${UUID}
|
||||
$(CC) -o ../magicka $^ $(CFLAGS) -R/usr/pkg/lib -L/usr/pkg/lib -lsqlite3 -lutil -lm -lssl -lcrypto -lssh -liconv
|
||||
|
||||
magiedit: $(ODOORS)
|
||||
|
||||
@ -9,6 +9,7 @@ MICROHTTPD=-lmicrohttpd
|
||||
ODOORS = ../deps/odoors/libs-`uname -s`/libODoors.a
|
||||
JSMN = ../deps/jsmn/libjsmn.a
|
||||
CDK = ../deps/cdk-5-20161210/libcdk.a
|
||||
UUID = ../deps/libuuid/.libs/libuuid.a
|
||||
|
||||
all: magicka magimail magiedit ticproc mgpost magichat filecenter dosbox_shim magiftpd reset_pass
|
||||
|
||||
@ -34,11 +35,15 @@ $(CDK):
|
||||
cd ../deps/cdk-5.0-20161210/ && export CPPFLAGS=-I/usr/pkg/include && ./configure --with-ncurses
|
||||
cd ../deps/cdk-5.0-20161210/ && $(MAKE)
|
||||
|
||||
$(UUID):
|
||||
cd ../deps/libuuid/ && ./configure
|
||||
cd ../deps/libuuid/ && $(MAKE)
|
||||
|
||||
OBJ = ../deps/aha/aha.o ../deps/hashids/hashids.o inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o chat_system.o email.o files.o settings.o lua_glue.o strings.o bluewave.o www.o www_email.o www_msgs.o www_last10.o www_files.o www_blog.o hashmap/hashmap.o menus.o nodelist.o blog.o
|
||||
%.o: %.c $(DEPS)
|
||||
$(CC) -c -o $@ $< $(CFLAGS)
|
||||
|
||||
magicka: $(OBJ) ${LUA} ${ZMODEM} ${JAMLIB} ${B64} ${JSMN}
|
||||
magicka: $(OBJ) ${LUA} ${ZMODEM} ${JAMLIB} ${B64} ${JSMN} ${UUID}
|
||||
$(CC) -o ../magicka $^ $(CFLAGS) -R/usr/pkg/lib -L/usr/pkg/lib -lsqlite3 -lutil -lm -lssl -lcrypto -lssh -liconv $(MICROHTTPD)
|
||||
|
||||
magiedit: $(ODOORS)
|
||||
|
||||
@ -7,6 +7,7 @@ LUA = ../deps/lua/liblua.a
|
||||
ODOORS = ../deps/odoors/libs-`uname -s`/libODoors.a
|
||||
JSMN = ../deps/jsmn/libjsmn.a
|
||||
CDK = ../deps/cdk-5-20161210/libcdk.a
|
||||
UUID = ../deps/libuuid/.libs/libuuid.a
|
||||
|
||||
all: magicka magimail magiedit ticproc mgpost magichat filecenter dosbox_shim magiftpd reset_pass
|
||||
|
||||
@ -29,11 +30,15 @@ $(CDK):
|
||||
cd ../deps/cdk-5.0-20161210/ && export CPPFLAGS=-I/usr/local/include && ./configure --with-ncurses
|
||||
cd ../deps/cdk-5.0-20161210/ && $(MAKE)
|
||||
|
||||
$(UUID):
|
||||
cd ../deps/libuuid/ && ./configure
|
||||
cd ../deps/libuuid/ && $(MAKE)
|
||||
|
||||
OBJ = inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o chat_system.o email.o files.o settings.o lua_glue.o strings.o bluewave.o hashmap/hashmap.o menus.o nodelist.o blog.o
|
||||
%.o: %.c $(DEPS)
|
||||
$(CC) -c -o $@ $< $(CFLAGS)
|
||||
|
||||
magicka: $(OBJ) ${LUA} ${ZMODEM} ${JAMLIB} ${JSMN}
|
||||
magicka: $(OBJ) ${LUA} ${ZMODEM} ${JAMLIB} ${JSMN} ${UUID}
|
||||
$(CC) -o ../magicka $^ $(CFLAGS) -L/usr/local/lib -lsqlite3 -lutil -lm -lssl -lcrypto -lssh -liconv
|
||||
|
||||
magiedit: $(ODOORS)
|
||||
|
||||
@ -9,6 +9,7 @@ MICROHTTPD=-lmicrohttpd
|
||||
ODOORS = ../deps/odoors/libs-`uname -s`/libODoors.a
|
||||
JSMN = ../deps/jsmn/libjsmn.a
|
||||
CDK = ../deps/cdk-5-20161210/libcdk.a
|
||||
UUID = ../deps/libuuid/.libs/libuuid.a
|
||||
|
||||
all: magicka magimail magiedit ticproc mgpost magichat filecenter dosbox_shim magiftpd reset_pass
|
||||
|
||||
@ -34,11 +35,15 @@ $(CDK):
|
||||
cd ../deps/cdk-5.0-20161210/ && export CPPFLAGS=-I/usr/local/include && ./configure --with-ncurses
|
||||
cd ../deps/cdk-5.0-20161210/ && $(MAKE)
|
||||
|
||||
$(UUID):
|
||||
cd ../deps/libuuid/ && ./configure
|
||||
cd ../deps/libuuid/ && $(MAKE)
|
||||
|
||||
OBJ = ../deps/aha/aha.o ../deps/hashids/hashids.o inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o chat_system.o email.o files.o settings.o lua_glue.o strings.o bluewave.o www.o www_email.o www_msgs.o www_last10.o www_files.o www_blog.o hashmap/hashmap.o menus.o nodelist.o blog.o
|
||||
%.o: %.c $(DEPS)
|
||||
$(CC) -c -o $@ $< $(CFLAGS)
|
||||
|
||||
magicka: $(OBJ) ${LUA} ${ZMODEM} ${JAMLIB} ${B64} ${JSMN}
|
||||
magicka: $(OBJ) ${LUA} ${ZMODEM} ${JAMLIB} ${B64} ${JSMN} ${UUID}
|
||||
$(CC) -o ../magicka $^ $(CFLAGS) -L/usr/local/lib -lsqlite3 -lutil -lm -lssl -lcrypto -lssh -liconv $(MICROHTTPD)
|
||||
|
||||
magiedit: $(ODOORS)
|
||||
|
||||
@ -7,6 +7,7 @@ LUA = ../deps/lua/liblua.a
|
||||
ODOORS = ../deps/odoors/libs-`uname -s`/libODoors.a
|
||||
JSMN = ../deps/jsmn/libjsmn.a
|
||||
CDK = ../deps/cdk-5-20161210/libcdk.a
|
||||
UUID = ../deps/libuuid/.libs/libuuid.a
|
||||
|
||||
OBJ = inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o chat_system.o email.o files.o settings.o lua_glue.o strings.o bluewave.o hashmap/hashmap.o menus.o nodelist.o blog.o
|
||||
|
||||
@ -31,10 +32,14 @@ $(CDK):
|
||||
cd ../deps/cdk-5.0-20161210/ && ./configure
|
||||
cd ../deps/cdk-5.0-20161210/ && $(MAKE)
|
||||
|
||||
$(UUID):
|
||||
cd ../deps/libuuid/ && ./configure
|
||||
cd ../deps/libuuid/ && $(MAKE)
|
||||
|
||||
%.o: %.c $(DEPS)
|
||||
$(CC) -c -o $@ $< $(CFLAGS)
|
||||
|
||||
magicka: $(OBJ) ${LUA} ${ZMODEM} ${JAMLIB} ${JSMN}
|
||||
magicka: $(OBJ) ${LUA} ${ZMODEM} ${JAMLIB} ${JSMN} ${UUID}
|
||||
$(CC) -o ../magicka $^ $(CFLAGS) -L/opt/local/lib -lsqlite3 -lutil -lm -ldl -lssl -lcrypto -lssh -liconv
|
||||
|
||||
magimail: $(JAMLIB)
|
||||
|
||||
@ -9,6 +9,7 @@ MICROHTTPD=-lmicrohttpd
|
||||
ODOORS = ../deps/odoors/libs-`uname -s`/libODoors.a
|
||||
JSMN = ../deps/jsmn/libjsmn.a
|
||||
CDK = ../deps/cdk-5-20161210/libcdk.a
|
||||
UUID = ../deps/libuuid/.libs/libuuid.a
|
||||
|
||||
all: magicka magimail magiedit ticproc mgpost magichat filecenter dosbox_shim magiftpd reset_pass
|
||||
|
||||
@ -34,11 +35,15 @@ $(CDK):
|
||||
cd ../deps/cdk-5.0-20161210/ && ./configure
|
||||
cd ../deps/cdk-5.0-20161210/ && $(MAKE)
|
||||
|
||||
$(UUID):
|
||||
cd ../deps/libuuid/ && ./configure
|
||||
cd ../deps/libuuid/ && $(MAKE)
|
||||
|
||||
OBJ = ../deps/aha/aha.o ../deps/hashids/hashids.o inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o chat_system.o email.o files.o settings.o lua_glue.o strings.o www.o www_email.o www_msgs.o www_last10.o www_files.o www_blog.o bluewave.o hashmap/hashmap.o menus.o nodelist.o blog.o
|
||||
%.o: %.c $(DEPS)
|
||||
$(CC) -c -o $@ $< $(CFLAGS)
|
||||
|
||||
magicka: $(OBJ) ${LUA} ${ZMODEM} ${JAMLIB} ${B64} ${JSMN}
|
||||
magicka: $(OBJ) ${LUA} ${ZMODEM} ${JAMLIB} ${B64} ${JSMN} ${UUID}
|
||||
$(CC) -o ../magicka $^ $(CFLAGS) -L/opt/local/lib -lsqlite3 -lutil -lm -ldl -lssl -lcrypto -lssh -liconv $(MICROHTTPD)
|
||||
|
||||
magimail: $(JAMLIB)
|
||||
|
||||
@ -7,6 +7,7 @@ LUA = ../deps/lua/liblua.a
|
||||
ODOORS = ../deps/odoors/libs-`uname -s`/libODoors.a
|
||||
JSMN = ../deps/jsmn/libjsmn.a
|
||||
CDK = ../deps/cdk-5-20161210/libcdk.a
|
||||
UUID = ../deps/libuuid/.libs/libuuid.a
|
||||
|
||||
all: magicka magimail magiedit ticproc mgpost magichat filecenter dosbox_shim magiftpd reset_pass
|
||||
|
||||
@ -29,12 +30,15 @@ $(CDK):
|
||||
cd ../deps/cdk-5.0-20161210/ && ./configure
|
||||
cd ../deps/cdk-5.0-20161210/ && $(MAKE)
|
||||
|
||||
$(UUID):
|
||||
cd ../deps/libuuid/ && ./configure
|
||||
cd ../deps/libuuid/ && $(MAKE)
|
||||
|
||||
OBJ = inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o chat_system.o email.o files.o settings.o lua_glue.o strings.o bluewave.o hashmap/hashmap.o menus.o os/sunos.o nodelist.o blog.o
|
||||
%.o: %.c $(DEPS)
|
||||
$(CC) -c -o $@ $< $(CFLAGS)
|
||||
|
||||
magicka: $(OBJ) ${LUA} ${ZMODEM} ${JAMLIB} ${JSMN}
|
||||
magicka: $(OBJ) ${LUA} ${ZMODEM} ${JAMLIB} ${JSMN} ${UUID}
|
||||
$(CC) -o ../magicka $^ $(CFLAGS) -L/usr/local/lib -lsqlite3 -lm -ldl -lssl -lcrypto -lssh -lnsl -lsocket
|
||||
|
||||
magimail: $(JAMLIB)
|
||||
|
||||
@ -9,6 +9,7 @@ MICROHTTPD=-lmicrohttpd
|
||||
ODOORS = ../deps/odoors/libs-`uname -s`/libODoors.a
|
||||
JSMN = ../deps/jsmn/libjsmn.a
|
||||
CDK = ../deps/cdk-5-20161210/libcdk.a
|
||||
UUID = ../deps/libuuid/.libs/libuuid.a
|
||||
|
||||
all: magicka magimail magiedit ticproc mgpost magichat filecenter magiftpd reset_pass
|
||||
|
||||
@ -34,11 +35,15 @@ $(CDK):
|
||||
cd ../deps/cdk-5.0-20161210/ && ./configure
|
||||
cd ../deps/cdk-5.0-20161210/ && $(MAKE)
|
||||
|
||||
$(UUID):
|
||||
cd ../deps/libuuid/ && ./configure
|
||||
cd ../deps/libuuid/ && $(MAKE)
|
||||
|
||||
OBJ = ../deps/aha/aha.o ../deps/hashids/hashids.o inih/ini.o bbs.o main.o users.o main_menu.o mail_menu.o doors.o bbs_list.o chat_system.o email.o files.o settings.o lua_glue.o strings.o www.o www_email.o www_msgs.o www_last10.o bluewave.o www_files.o www_blog.o hashmap/hashmap.o menus.o os/sunos.o nodelist.o blog.o
|
||||
%.o: %.c $(DEPS)
|
||||
$(CC) -c -o $@ $< $(CFLAGS)
|
||||
|
||||
magicka: $(OBJ) ${LUA} ${JAMLIB} ${ZMODEM} ${B64} ${JSMN}
|
||||
magicka: $(OBJ) ${LUA} ${JAMLIB} ${ZMODEM} ${B64} ${JSMN} ${UUID}
|
||||
$(CC) -o ../magicka $^ $(CFLAGS) -L/usr/local/lib -lsqlite3 -lm -ldl -lssl -lcrypto -lssh $(MICROHTTPD) -lnsl -lsocket
|
||||
|
||||
magimail: $(JAMLIB)
|
||||
|
||||
@ -17,6 +17,7 @@
|
||||
|
||||
#define NETWORK_FIDO 1
|
||||
#define NETWORK_WWIV 2
|
||||
#define NETWORK_MAGI 3
|
||||
|
||||
#define TYPE_LOCAL_AREA 0
|
||||
#define TYPE_NETMAIL_AREA 1
|
||||
@ -80,6 +81,7 @@ struct mail_conference {
|
||||
struct mail_area **mail_areas;
|
||||
struct fido_addr *fidoaddr;
|
||||
int wwivnode;
|
||||
int maginode;
|
||||
};
|
||||
|
||||
struct file_sub {
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
#include "bluewave.h"
|
||||
#include "jamlib/jam.h"
|
||||
#include "bbs.h"
|
||||
#include "libuuid/uuid.h"
|
||||
|
||||
extern struct bbs_config conf;
|
||||
extern struct user_record *gUser;
|
||||
@ -573,6 +574,7 @@ int bwave_add_message(int confr, int area, unsigned int dwritten, char *to, char
|
||||
s_JamSubfield jsf;
|
||||
int z;
|
||||
char buffer[256];
|
||||
uuid_t magi_msgid;
|
||||
|
||||
jb = open_jam_base(conf.mail_conferences[confr]->mail_areas[area]->path);
|
||||
if (!jb) {
|
||||
@ -623,36 +625,56 @@ int bwave_add_message(int confr, int area, unsigned int dwritten, char *to, char
|
||||
if (conf.mail_conferences[confr]->mail_areas[area]->type == TYPE_ECHOMAIL_AREA || conf.mail_conferences[confr]->mail_areas[area]->type == TYPE_NEWSGROUP_AREA) {
|
||||
jmh.Attribute |= JAM_MSG_TYPEECHO;
|
||||
|
||||
if (conf.mail_conferences[confr]->fidoaddr->point) {
|
||||
sprintf(buffer, "%d:%d/%d.%d", conf.mail_conferences[confr]->fidoaddr->zone,
|
||||
conf.mail_conferences[confr]->fidoaddr->net,
|
||||
conf.mail_conferences[confr]->fidoaddr->node,
|
||||
conf.mail_conferences[confr]->fidoaddr->point);
|
||||
} else {
|
||||
sprintf(buffer, "%d:%d/%d", conf.mail_conferences[confr]->fidoaddr->zone,
|
||||
conf.mail_conferences[confr]->fidoaddr->net,
|
||||
conf.mail_conferences[confr]->fidoaddr->node);
|
||||
}
|
||||
jsf.LoID = JAMSFLD_OADDRESS;
|
||||
jsf.HiID = 0;
|
||||
jsf.DatLen = strlen(buffer);
|
||||
jsf.Buffer = (char *)buffer;
|
||||
JAM_PutSubfield(jsp, &jsf);
|
||||
|
||||
sprintf(buffer, "%d:%d/%d.%d %08lx", conf.mail_conferences[confr]->fidoaddr->zone,
|
||||
if (conf.mail_conferences[confr]->nettype == NETWORK_FIDO) {
|
||||
if (conf.mail_conferences[confr]->fidoaddr->point) {
|
||||
sprintf(buffer, "%d:%d/%d.%d", conf.mail_conferences[confr]->fidoaddr->zone,
|
||||
conf.mail_conferences[confr]->fidoaddr->net,
|
||||
conf.mail_conferences[confr]->fidoaddr->node,
|
||||
conf.mail_conferences[confr]->fidoaddr->point,
|
||||
generate_msgid());
|
||||
conf.mail_conferences[confr]->fidoaddr->point);
|
||||
} else {
|
||||
sprintf(buffer, "%d:%d/%d", conf.mail_conferences[confr]->fidoaddr->zone,
|
||||
conf.mail_conferences[confr]->fidoaddr->net,
|
||||
conf.mail_conferences[confr]->fidoaddr->node);
|
||||
}
|
||||
jsf.LoID = JAMSFLD_OADDRESS;
|
||||
jsf.HiID = 0;
|
||||
jsf.DatLen = strlen(buffer);
|
||||
jsf.Buffer = (char *)buffer;
|
||||
JAM_PutSubfield(jsp, &jsf);
|
||||
|
||||
jsf.LoID = JAMSFLD_MSGID;
|
||||
jsf.HiID = 0;
|
||||
jsf.DatLen = strlen(buffer);
|
||||
jsf.Buffer = (char *)buffer;
|
||||
JAM_PutSubfield(jsp, &jsf);
|
||||
jmh.MsgIdCRC = JAM_Crc32(buffer, strlen(buffer));
|
||||
sprintf(buffer, "%d:%d/%d.%d %08lx", conf.mail_conferences[confr]->fidoaddr->zone,
|
||||
conf.mail_conferences[confr]->fidoaddr->net,
|
||||
conf.mail_conferences[confr]->fidoaddr->node,
|
||||
conf.mail_conferences[confr]->fidoaddr->point,
|
||||
generate_msgid());
|
||||
|
||||
} else if (conf.mail_conferences[confr]->mail_areas[confr]->type == TYPE_NETMAIL_AREA) {
|
||||
jsf.LoID = JAMSFLD_MSGID;
|
||||
jsf.HiID = 0;
|
||||
jsf.DatLen = strlen(buffer);
|
||||
jsf.Buffer = (char *)buffer;
|
||||
JAM_PutSubfield(jsp, &jsf);
|
||||
jmh.MsgIdCRC = JAM_Crc32(buffer, strlen(buffer));
|
||||
} else if (conf.mail_conferences[confr]->nettype == NETWORK_MAGI) {
|
||||
sprintf(buffer, "%d", conf.mail_conferences[confr]->maginode);
|
||||
jsf.LoID = JAMSFLD_OADDRESS;
|
||||
jsf.HiID = 0;
|
||||
jsf.DatLen = strlen(buffer);
|
||||
jsf.Buffer = (char *)buffer;
|
||||
JAM_PutSubfield(jsp, &jsf);
|
||||
|
||||
|
||||
uuid_generate(magi_msgid);
|
||||
uuid_unparse_lower(magi_msgid, buffer);
|
||||
|
||||
jsf.LoID = JAMSFLD_MSGID;
|
||||
jsf.HiID = 0;
|
||||
jsf.DatLen = strlen(buffer);
|
||||
jsf.Buffer = (char *)buffer;
|
||||
JAM_PutSubfield(jsp, &jsf);
|
||||
jmh.MsgIdCRC = JAM_Crc32(buffer, strlen(buffer));
|
||||
}
|
||||
} else if (conf.mail_conferences[confr]->mail_areas[area]->type == TYPE_NETMAIL_AREA && conf.mail_conferences[confr]->nettype == NETWORK_FIDO) {
|
||||
jmh.Attribute |= JAM_MSG_TYPENET;
|
||||
jmh.Attribute |= JAM_MSG_PRIVATE;
|
||||
|
||||
@ -1013,8 +1035,10 @@ void bwave_upload_reply() {
|
||||
conf.mail_conferences[confr]->fidoaddr->node,
|
||||
conf.mail_conferences[confr]->fidoaddr->point);
|
||||
}
|
||||
} else if (conf.mail_conferences[confr]->nettype == NETWORK_MAGI) {
|
||||
snprintf(originlinebuffer, 256, "\r--- %s\r * Origin: %s (@%d)\r", upl_hdr.reader_tear, tagline, conf.mail_conferences[confr]->maginode);
|
||||
} else {
|
||||
snprintf(originlinebuffer, 256, "\r--- %s\r * Origin: %s \r", upl_hdr.reader_tear, tagline);
|
||||
snprintf(originlinebuffer, 256, "\r");
|
||||
}
|
||||
|
||||
if (stat(msgbuffer, &s) != 0) {
|
||||
|
||||
110
src/mail_menu.c
110
src/mail_menu.c
@ -13,6 +13,8 @@
|
||||
#include "lua/lua.h"
|
||||
#include "lua/lualib.h"
|
||||
#include "lua/lauxlib.h"
|
||||
#include "libuuid/uuid.h"
|
||||
|
||||
#ifdef __sun
|
||||
#include "os/sunos.h"
|
||||
#endif
|
||||
@ -140,6 +142,7 @@ int msg_is_to(struct user_record *user, char *addressed_to, char *address, int t
|
||||
char *myname;
|
||||
struct fido_addr *dest;
|
||||
int j;
|
||||
int magi_dest;
|
||||
if (rn) {
|
||||
myname = (char *)malloc(strlen(user->firstname) + strlen(user->lastname) + 2);
|
||||
sprintf(myname, "%s %s", user->firstname, user->lastname);
|
||||
@ -161,6 +164,16 @@ int msg_is_to(struct user_record *user, char *addressed_to, char *address, int t
|
||||
}
|
||||
free(myname);
|
||||
return 0;
|
||||
} else if (type == NETWORK_MAGI && address != NULL) {
|
||||
if (strcasecmp(myname, addressed_to) == 0) {
|
||||
magi_dest = atoi(address);
|
||||
if (magi_dest == conf.mail_conferences[msgconf]->maginode) {
|
||||
free(myname);
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
free(myname);
|
||||
return 0;
|
||||
} else {
|
||||
if (strcasecmp(myname, addressed_to) == 0) {
|
||||
free(myname);
|
||||
@ -175,13 +188,15 @@ int msg_is_from(struct user_record *user, char *addressed_from, char *address, i
|
||||
char *myname;
|
||||
struct fido_addr *orig;
|
||||
int j;
|
||||
int magi_orig;
|
||||
|
||||
if (rn) {
|
||||
myname = (char *)malloc(strlen(user->firstname) + strlen(user->lastname) + 2);
|
||||
sprintf(myname, "%s %s", user->firstname, user->lastname);
|
||||
} else {
|
||||
myname = strdup(user->loginname);
|
||||
}
|
||||
if (type == NETWORK_FIDO) {
|
||||
if (type == NETWORK_FIDO && address != NULL) {
|
||||
if (strcasecmp(myname, addressed_from) == 0) {
|
||||
orig = parse_fido_addr(address);
|
||||
if (conf.mail_conferences[msgconf]->fidoaddr->zone == orig->zone &&
|
||||
@ -196,6 +211,16 @@ int msg_is_from(struct user_record *user, char *addressed_from, char *address, i
|
||||
}
|
||||
free(myname);
|
||||
return 0;
|
||||
} else if (type == NETWORK_MAGI && address != NULL) {
|
||||
if (strcasecmp(myname, addressed_from) == 0) {
|
||||
magi_orig = atoi(address);
|
||||
if (magi_orig == conf.mail_conferences[msgconf]->maginode) {
|
||||
free(myname);
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
free(myname);
|
||||
return 0;
|
||||
} else {
|
||||
if (strcasecmp(myname, addressed_from) == 0) {
|
||||
free(myname);
|
||||
@ -528,8 +553,10 @@ char *external_editor(struct user_record *user, char *to, char *from, char *quot
|
||||
conf.mail_conferences[user->cur_mail_conf]->fidoaddr->node,
|
||||
conf.mail_conferences[user->cur_mail_conf]->fidoaddr->point);
|
||||
}
|
||||
} else if (conf.mail_conferences[user->cur_mail_conf]->nettype == NETWORK_MAGI && !email) {
|
||||
snprintf(buffer, 256, "\r--- MagickaBBS v%d.%d%s (%s/%s)\r * Origin: %s (@%d)\r", VERSION_MAJOR, VERSION_MINOR, VERSION_STR, name.sysname, name.machine, tagline, conf.mail_conferences[user->cur_mail_conf]->maginode);
|
||||
} else {
|
||||
snprintf(buffer, 256, "\r--- MagickaBBS v%d.%d%s (%s/%s)\r * Origin: %s \r", VERSION_MAJOR, VERSION_MINOR, VERSION_STR, name.sysname, name.machine, tagline);
|
||||
snprintf(buffer, 256, "\r");
|
||||
}
|
||||
if (user->autosig) {
|
||||
body2 = (char *)malloc(totlen + 3 + strlen(buffer) + strlen(user->signature));
|
||||
@ -662,8 +689,10 @@ char *editor(struct user_record *user, char *quote, int quotelen, char *from, in
|
||||
conf.mail_conferences[user->cur_mail_conf]->fidoaddr->node,
|
||||
conf.mail_conferences[user->cur_mail_conf]->fidoaddr->point);
|
||||
}
|
||||
} else if (conf.mail_conferences[user->cur_mail_conf]->nettype == NETWORK_MAGI && !email) {
|
||||
snprintf(buffer, 256, "\r--- MagickaBBS v%d.%d%s (%s/%s)\r * Origin: %s (@%d)\r", VERSION_MAJOR, VERSION_MINOR, VERSION_STR, name.sysname, name.machine, tagline, conf.mail_conferences[user->cur_mail_conf]->maginode);
|
||||
} else {
|
||||
snprintf(buffer, 256, "\r--- MagickaBBS v%d.%d%s (%s/%s)\r * Origin: %s \r", VERSION_MAJOR, VERSION_MINOR, VERSION_STR, name.sysname, name.machine, tagline);
|
||||
snprintf(buffer, 256, "\r");
|
||||
}
|
||||
if (user->autosig) {
|
||||
size += 3;
|
||||
@ -1525,6 +1554,7 @@ int read_message(struct user_record *user, struct msg_headers *msghs, int mailno
|
||||
int should_break;
|
||||
int position;
|
||||
int y;
|
||||
uuid_t magi_msgid;
|
||||
|
||||
jb = open_jam_base(conf.mail_conferences[user->cur_mail_conf]->mail_areas[user->cur_mail_area]->path);
|
||||
if (!jb) {
|
||||
@ -1549,6 +1579,8 @@ int read_message(struct user_record *user, struct msg_headers *msghs, int mailno
|
||||
from_addr = parse_fido_addr(msghs->msgs[mailno]->oaddress);
|
||||
s_printf(get_string(105), msghs->msgs[mailno]->from, from_addr->zone, from_addr->net, from_addr->node, from_addr->point);
|
||||
free(from_addr);
|
||||
} else if (msghs->msgs[mailno]->oaddress != NULL && conf.mail_conferences[user->cur_mail_conf]->nettype == NETWORK_MAGI) {
|
||||
s_printf(get_string(288), msghs->msgs[mailno]->from, atoi(msghs->msgs[mailno]->oaddress));
|
||||
} else {
|
||||
s_printf(get_string(106), msghs->msgs[mailno]->from);
|
||||
}
|
||||
@ -1806,14 +1838,40 @@ int read_message(struct user_record *user, struct msg_headers *msghs, int mailno
|
||||
|
||||
if (msghs->msgs[mailno]->msgid != NULL) {
|
||||
sprintf(buffer, "%s", msghs->msgs[mailno]->msgid);
|
||||
jsf.LoID = JAMSFLD_REPLYID;
|
||||
jsf.HiID = 0;
|
||||
jsf.DatLen = strlen(buffer);
|
||||
jsf.Buffer = (char *)buffer;
|
||||
JAM_PutSubfield(jsp, &jsf);
|
||||
jmh.ReplyCRC = JAM_Crc32(buffer, strlen(buffer));
|
||||
}
|
||||
|
||||
jsf.LoID = JAMSFLD_REPLYID;
|
||||
|
||||
} else if (conf.mail_conferences[user->cur_mail_conf]->nettype == NETWORK_MAGI) {
|
||||
sprintf(buffer, "%d", conf.mail_conferences[user->cur_mail_conf]->maginode);
|
||||
jsf.LoID = JAMSFLD_OADDRESS;
|
||||
jsf.HiID = 0;
|
||||
jsf.DatLen = strlen(buffer);
|
||||
jsf.Buffer = (char *)buffer;
|
||||
JAM_PutSubfield(jsp, &jsf);
|
||||
jmh.ReplyCRC = JAM_Crc32(buffer, strlen(buffer));
|
||||
|
||||
uuid_generate(magi_msgid);
|
||||
uuid_unparse_lower(magi_msgid, buffer);
|
||||
|
||||
jsf.LoID = JAMSFLD_MSGID;
|
||||
jsf.HiID = 0;
|
||||
jsf.DatLen = strlen(buffer);
|
||||
jsf.Buffer = (char *)buffer;
|
||||
JAM_PutSubfield(jsp, &jsf);
|
||||
if (msghs->msgs[mailno]->msgid != NULL) {
|
||||
sprintf(buffer, "%s", msghs->msgs[mailno]->msgid);
|
||||
jsf.LoID = JAMSFLD_REPLYID;
|
||||
jsf.HiID = 0;
|
||||
jsf.DatLen = strlen(buffer);
|
||||
jsf.Buffer = (char *)buffer;
|
||||
JAM_PutSubfield(jsp, &jsf);
|
||||
jmh.ReplyCRC = JAM_Crc32(buffer, strlen(buffer));
|
||||
}
|
||||
}
|
||||
} else if (conf.mail_conferences[user->cur_mail_conf]->mail_areas[user->cur_mail_area]->type == TYPE_NETMAIL_AREA) {
|
||||
jmh.Attribute |= JAM_MSG_TYPENET;
|
||||
@ -1871,14 +1929,13 @@ int read_message(struct user_record *user, struct msg_headers *msghs, int mailno
|
||||
jmh.MsgIdCRC = JAM_Crc32(buffer, strlen(buffer));
|
||||
if (msghs->msgs[mailno]->msgid != NULL) {
|
||||
sprintf(buffer, "%s", msghs->msgs[mailno]->msgid);
|
||||
jsf.LoID = JAMSFLD_REPLYID;
|
||||
jsf.HiID = 0;
|
||||
jsf.DatLen = strlen(buffer);
|
||||
jsf.Buffer = (char *)buffer;
|
||||
JAM_PutSubfield(jsp, &jsf);
|
||||
jmh.ReplyCRC = JAM_Crc32(buffer, strlen(buffer));
|
||||
}
|
||||
|
||||
jsf.LoID = JAMSFLD_REPLYID;
|
||||
jsf.HiID = 0;
|
||||
jsf.DatLen = strlen(buffer);
|
||||
jsf.Buffer = (char *)buffer;
|
||||
JAM_PutSubfield(jsp, &jsf);
|
||||
jmh.ReplyCRC = JAM_Crc32(buffer, strlen(buffer));
|
||||
}
|
||||
}
|
||||
|
||||
@ -2108,6 +2165,7 @@ void post_message(struct user_record *user) {
|
||||
int z;
|
||||
int sem_fd;
|
||||
char *bbsname;
|
||||
uuid_t magi_msgid;
|
||||
|
||||
s_JamBase *jb;
|
||||
s_JamMsgHeader jmh;
|
||||
@ -2128,14 +2186,7 @@ void post_message(struct user_record *user) {
|
||||
if (strlen(buffer) == 0) {
|
||||
strcpy(buffer, "ALL");
|
||||
}
|
||||
/*
|
||||
if (conf.mail_conferences[user->cur_mail_conf]->networked == 0 && strcasecmp(buffer, "ALL") != 0) {
|
||||
if (check_user(buffer)) {
|
||||
s_printf(get_string(55));
|
||||
return;
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
if (conf.mail_conferences[user->cur_mail_conf]->mail_areas[user->cur_mail_area]->type == TYPE_NETMAIL_AREA) {
|
||||
s_printf(get_string(121));
|
||||
s_readstring(buffer2, 32);
|
||||
@ -2257,6 +2308,25 @@ void post_message(struct user_record *user) {
|
||||
JAM_PutSubfield(jsp, &jsf);
|
||||
jmh.MsgIdCRC = JAM_Crc32(buffer, strlen(buffer));
|
||||
|
||||
} else if (conf.mail_conferences[user->cur_mail_conf]->nettype == NETWORK_MAGI) {
|
||||
sprintf(buffer, "%d", conf.mail_conferences[user->cur_mail_conf]->maginode);
|
||||
jsf.LoID = JAMSFLD_OADDRESS;
|
||||
jsf.HiID = 0;
|
||||
jsf.DatLen = strlen(buffer);
|
||||
jsf.Buffer = (char *)buffer;
|
||||
JAM_PutSubfield(jsp, &jsf);
|
||||
|
||||
|
||||
uuid_generate(magi_msgid);
|
||||
uuid_unparse_lower(magi_msgid, buffer);
|
||||
|
||||
jsf.LoID = JAMSFLD_MSGID;
|
||||
jsf.HiID = 0;
|
||||
jsf.DatLen = strlen(buffer);
|
||||
jsf.Buffer = (char *)buffer;
|
||||
JAM_PutSubfield(jsp, &jsf);
|
||||
jmh.MsgIdCRC = JAM_Crc32(buffer, strlen(buffer));
|
||||
|
||||
}
|
||||
} else
|
||||
if (conf.mail_conferences[user->cur_mail_conf]->mail_areas[user->cur_mail_area]->type == TYPE_NETMAIL_AREA) {
|
||||
|
||||
@ -335,11 +335,15 @@ static int mail_area_handler(void* user, const char* section, const char* name,
|
||||
if (strcasecmp(name, "type") == 0) {
|
||||
if (strcasecmp(value, "fido") == 0) {
|
||||
mc->nettype = NETWORK_FIDO;
|
||||
} else if (strcasecmp(value, "magi") == 0) {
|
||||
mc->nettype = NETWORK_MAGI;
|
||||
}
|
||||
} else if (strcasecmp(name, "fido node") == 0) {
|
||||
mc->fidoaddr = parse_fido_addr(value);
|
||||
} else if (strcasecmp(name, "domain") == 0) {
|
||||
mc->domain = strdup(value);
|
||||
} else if (strcasecmp(name, "magi node") == 0) {
|
||||
mc->maginode = atoi(value);
|
||||
}
|
||||
} else {
|
||||
// check if it's partially filled in
|
||||
|
||||
@ -8,6 +8,7 @@
|
||||
#include <iconv.h>
|
||||
#include "bbs.h"
|
||||
#include "jamlib/jam.h"
|
||||
#include "libuuid/uuid.h"
|
||||
|
||||
#define IN 0
|
||||
#define OUT 1
|
||||
@ -862,11 +863,15 @@ int www_send_msg(struct user_record *user, char *to, char *subj, int conference,
|
||||
struct utsname name;
|
||||
int pos;
|
||||
char *body3;
|
||||
|
||||
iconv_t ic;
|
||||
size_t inc;
|
||||
size_t ouc;
|
||||
size_t sz;
|
||||
char *inbuf, *oubuf;
|
||||
|
||||
uuid_t magi_msgid;
|
||||
|
||||
if (conference < 0 || conference >= conf.mail_conference_count || area < 0 || area >= conf.mail_conferences[conference]->mail_area_count) {
|
||||
return 0;
|
||||
}
|
||||
@ -884,17 +889,9 @@ int www_send_msg(struct user_record *user, char *to, char *subj, int conference,
|
||||
jmh.Attribute |= JAM_MSG_LOCAL;
|
||||
|
||||
if (conf.mail_conferences[conference]->realnames == 0) {
|
||||
if (conf.mail_conferences[conference]->nettype == NETWORK_WWIV) {
|
||||
sprintf(buffer, "%s #%d @%d", user->loginname, user->id, conf.mail_conferences[conference]->wwivnode);
|
||||
} else {
|
||||
strcpy(buffer, user->loginname);
|
||||
}
|
||||
strcpy(buffer, user->loginname);
|
||||
} else {
|
||||
if (conf.mail_conferences[conference]->nettype == NETWORK_WWIV) {
|
||||
sprintf(buffer, "%s #%d @%d (%s)", user->loginname, user->id, conf.mail_conferences[conference]->wwivnode, user->firstname);
|
||||
} else {
|
||||
sprintf(buffer, "%s %s", user->firstname, user->lastname);
|
||||
}
|
||||
sprintf(buffer, "%s %s", user->firstname, user->lastname);
|
||||
}
|
||||
jsp = JAM_NewSubPacket();
|
||||
|
||||
@ -949,6 +946,32 @@ int www_send_msg(struct user_record *user, char *to, char *subj, int conference,
|
||||
JAM_PutSubfield(jsp, &jsf);
|
||||
jmh.MsgIdCRC = JAM_Crc32(buffer, strlen(buffer));
|
||||
|
||||
if (strcasecmp(replyid, "NULL") != 0) {
|
||||
jsf.LoID = JAMSFLD_REPLYID;
|
||||
jsf.HiID = 0;
|
||||
jsf.DatLen = strlen(replyid);
|
||||
jsf.Buffer = (char *)replyid;
|
||||
JAM_PutSubfield(jsp, &jsf);
|
||||
jmh.ReplyCRC = JAM_Crc32(buffer, strlen(replyid));
|
||||
}
|
||||
} else if (conf.mail_conferences[conference]->nettype == NETWORK_MAGI) {
|
||||
sprintf(buffer, "%d", conf.mail_conferences[conference]->maginode);
|
||||
jsf.LoID = JAMSFLD_OADDRESS;
|
||||
jsf.HiID = 0;
|
||||
jsf.DatLen = strlen(buffer);
|
||||
jsf.Buffer = (char *)buffer;
|
||||
JAM_PutSubfield(jsp, &jsf);
|
||||
|
||||
uuid_generate(magi_msgid);
|
||||
uuid_unparse_lower(magi_msgid, buffer);
|
||||
|
||||
jsf.LoID = JAMSFLD_MSGID;
|
||||
jsf.HiID = 0;
|
||||
jsf.DatLen = strlen(buffer);
|
||||
jsf.Buffer = (char *)buffer;
|
||||
JAM_PutSubfield(jsp, &jsf);
|
||||
jmh.MsgIdCRC = JAM_Crc32(buffer, strlen(buffer));
|
||||
|
||||
if (strcasecmp(replyid, "NULL") != 0) {
|
||||
jsf.LoID = JAMSFLD_REPLYID;
|
||||
jsf.HiID = 0;
|
||||
@ -998,8 +1021,10 @@ int www_send_msg(struct user_record *user, char *to, char *subj, int conference,
|
||||
conf.mail_conferences[conference]->fidoaddr->node,
|
||||
conf.mail_conferences[conference]->fidoaddr->point);
|
||||
}
|
||||
} else if (conf.mail_conferences[conference]->nettype == NETWORK_MAGI) {
|
||||
snprintf(buffer, 256, "\r\r--- MagickaBBS v%d.%d%s (%s/%s)\r * Origin: %s (@%d)\r", VERSION_MAJOR, VERSION_MINOR, VERSION_STR, name.sysname, name.machine, tagline, conf.mail_conferences[conference]->maginode);
|
||||
} else {
|
||||
snprintf(buffer, 256, "\r\r--- MagickaBBS v%d.%d%s (%s/%s)\r * Origin: %s \r", VERSION_MAJOR, VERSION_MINOR, VERSION_STR, name.sysname, name.machine, tagline);
|
||||
snprintf(buffer, 256, "\r");
|
||||
}
|
||||
body2 = www_wordwrap(body, 73);
|
||||
if (body2 == NULL) {
|
||||
|
||||
21
utils/mnetscan/Makefile
Normal file
21
utils/mnetscan/Makefile
Normal file
@ -0,0 +1,21 @@
|
||||
CC=cc
|
||||
CFLAGS=-I/usr/local/include -I../../deps/
|
||||
DEPS = mnetscan.c
|
||||
JAMLIB = ../../deps/jamlib/jamlib.a
|
||||
OBJ = mnetscan.o
|
||||
|
||||
all: mnetscan
|
||||
|
||||
%.o: %.c $(DEPS)
|
||||
$(CC) -c -o $@ $< $(CFLAGS)
|
||||
|
||||
$(JAMLIB):
|
||||
cd ../../deps/jamlib && make -f Makefile.linux
|
||||
|
||||
mnetscan: $(OBJ) $(JAMLIB)
|
||||
$(CC) -o mnetscan $^ $(CFLAGS) -L/usr/local/lib
|
||||
|
||||
.PHONY: clean
|
||||
|
||||
clean:
|
||||
rm -f $(OBJ) mnetscan
|
||||
335
utils/mnetscan/mnetscan.c
Normal file
335
utils/mnetscan/mnetscan.c
Normal file
@ -0,0 +1,335 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <limits.h>
|
||||
#include <sys/stat.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include "jamlib/jam.h"
|
||||
|
||||
char *baseoutdir = NULL;
|
||||
|
||||
struct msgarea_t {
|
||||
int id;
|
||||
char *basedir;
|
||||
int *links;
|
||||
int link_count;
|
||||
};
|
||||
|
||||
struct msg_t {
|
||||
int area;
|
||||
char from[32];
|
||||
char to[32];
|
||||
char subject[64];
|
||||
uint32_t timedate;
|
||||
int oaddr;
|
||||
int daddr;
|
||||
char reply[36];
|
||||
} __attribute__ ((packed));
|
||||
|
||||
struct msgarea_t **areas;
|
||||
int area_count;
|
||||
|
||||
s_JamBase *open_jam_base(char *path) {
|
||||
int ret;
|
||||
s_JamBase *jb;
|
||||
|
||||
ret = JAM_OpenMB((char *)path, &jb);
|
||||
|
||||
if (ret != 0) {
|
||||
if (ret == JAM_IO_ERROR) {
|
||||
free(jb);
|
||||
ret = JAM_CreateMB((char *)path, 1, &jb);
|
||||
if (ret != 0) {
|
||||
free(jb);
|
||||
return NULL;
|
||||
}
|
||||
} else {
|
||||
free(jb);
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
return jb;
|
||||
}
|
||||
|
||||
size_t trimwhitespace(char *out, size_t len, const char *str) {
|
||||
if(len == 0)
|
||||
return 0;
|
||||
|
||||
const char *end;
|
||||
size_t out_size;
|
||||
|
||||
// Trim leading space
|
||||
while(isspace((unsigned char)*str)) str++;
|
||||
|
||||
if(*str == 0) {
|
||||
*out = 0;
|
||||
return 1;
|
||||
}
|
||||
|
||||
// Trim trailing space
|
||||
end = str + strlen(str) - 1;
|
||||
while(end > str && isspace((unsigned char)*end)) end--;
|
||||
end++;
|
||||
|
||||
// Set output size to minimum of trimmed string length and buffer size minus 1
|
||||
out_size = (end - str) < len-1 ? (end - str) : len-1;
|
||||
|
||||
// Copy trimmed string and add null terminator
|
||||
memcpy(out, str, out_size);
|
||||
out[out_size] = 0;
|
||||
|
||||
return out_size;
|
||||
}
|
||||
|
||||
int parse_config_file(char *filename) {
|
||||
FILE *fptr;
|
||||
char buffer[256];
|
||||
char bufferw[256];
|
||||
char *ptr;
|
||||
struct msgarea_t *newarea;
|
||||
|
||||
area_count = 0;
|
||||
|
||||
fptr = fopen(filename, "r");
|
||||
if (!fptr) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
fgets(buffer, 256, fptr);
|
||||
while (!feof(fptr)) {
|
||||
if (buffer[0] != ';') {
|
||||
if (buffer[strlen(buffer) - 1] == '\n'){
|
||||
buffer[strlen(buffer) - 1] = '\0';
|
||||
|
||||
if (strncasecmp(buffer, "OUTDIR", 6) == 0) {
|
||||
trimwhitespace(bufferw, 256, &buffer[7]);
|
||||
baseoutdir = strdup(bufferw);
|
||||
} else if (strncasecmp(buffer, "MSGAREA", 7) == 0) {
|
||||
newarea = NULL;
|
||||
ptr = strtok(&buffer[8], ",");
|
||||
|
||||
if (ptr != NULL) {
|
||||
newarea = (struct msgarea_t *)malloc(sizeof(struct msgarea_t));
|
||||
trimwhitespace(bufferw, 256, ptr);
|
||||
newarea->id = atoi(bufferw);
|
||||
newarea->link_count = 0;
|
||||
ptr = strtok(NULL, ",");
|
||||
if (ptr != NULL) {
|
||||
trimwhitespace(bufferw, 256, ptr);
|
||||
newarea->basedir = strdup(bufferw);
|
||||
ptr = strtok(NULL, ",");
|
||||
while (ptr != NULL) {
|
||||
trimwhitespace(bufferw, 256, ptr);
|
||||
if (newarea->link_count == 0) {
|
||||
newarea->links = (int *)malloc(sizeof(int));
|
||||
} else {
|
||||
newarea->links = (int *)realloc(newarea->links, sizeof(int) * (newarea->link_count + 1));
|
||||
}
|
||||
newarea->links[newarea->link_count] = atoi(bufferw);
|
||||
newarea->link_count++;
|
||||
ptr = strtok(NULL, ",");
|
||||
}
|
||||
}
|
||||
}
|
||||
if (newarea != NULL) {
|
||||
if (area_count == 0) {
|
||||
areas = (struct msgarea_t **)malloc(sizeof(struct msgarea_t *));
|
||||
} else {
|
||||
areas = (struct msgarea_t **)realloc(areas, sizeof(struct msgarea_t *) * (area_count + 1));
|
||||
}
|
||||
areas[area_count] = newarea;
|
||||
area_count++;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
fclose(fptr);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
fgets(buffer, 256, fptr);
|
||||
}
|
||||
|
||||
fclose(fptr);
|
||||
return 1;
|
||||
}
|
||||
|
||||
int export_messages(int area) {
|
||||
s_JamBase *jb;
|
||||
s_JamBaseHeader jbh;
|
||||
s_JamMsgHeader jmh;
|
||||
s_JamSubPacket* jsp;
|
||||
|
||||
FILE *fptr;
|
||||
|
||||
char buffer[PATH_MAX];
|
||||
|
||||
int i;
|
||||
int z;
|
||||
int len;
|
||||
int n;
|
||||
int scanned = 0;
|
||||
|
||||
struct msg_t msg;
|
||||
char msgid[37];
|
||||
|
||||
char *body;
|
||||
struct stat st;
|
||||
|
||||
jb = open_jam_base(areas[area]->basedir);
|
||||
if (!jb) {
|
||||
return 0;
|
||||
}
|
||||
JAM_ReadMBHeader(jb, &jbh);
|
||||
if (jbh.ActiveMsgs > 0) {
|
||||
for (i=0;i<jbh.ActiveMsgs;i++) {
|
||||
memset(&msg, 0, sizeof(struct msg_t));
|
||||
memset(&jmh, 0, sizeof(s_JamMsgHeader));
|
||||
z = JAM_ReadMsgHeader(jb, i, &jmh, &jsp);
|
||||
|
||||
if (z != 0) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (jmh.Attribute & JAM_MSG_DELETED) {
|
||||
JAM_DelSubPacket(jsp);
|
||||
continue;
|
||||
}
|
||||
|
||||
if ((jmh.Attribute & JAM_MSG_SENT) || !(jmh.Attribute & JAM_MSG_LOCAL)) {
|
||||
JAM_DelSubPacket(jsp);
|
||||
continue;
|
||||
} else {
|
||||
for (z=0;z<jsp->NumFields;z++) {
|
||||
if (jsp->Fields[z]->LoID == JAMSFLD_SUBJECT) {
|
||||
if (jsp->Fields[z]->DatLen > 63) {
|
||||
len = 64;
|
||||
} else {
|
||||
len = jsp->Fields[z]->DatLen;
|
||||
}
|
||||
memcpy(msg.subject, jsp->Fields[z]->Buffer, len);
|
||||
}
|
||||
if (jsp->Fields[z]->LoID == JAMSFLD_SENDERNAME) {
|
||||
if (jsp->Fields[z]->DatLen > 61) {
|
||||
len = 32;
|
||||
} else {
|
||||
len = jsp->Fields[z]->DatLen;
|
||||
}
|
||||
memcpy(msg.from, jsp->Fields[z]->Buffer, len);
|
||||
}
|
||||
if (jsp->Fields[z]->LoID == JAMSFLD_RECVRNAME) {
|
||||
if (jsp->Fields[z]->DatLen > 61) {
|
||||
len = 32;
|
||||
} else {
|
||||
len = jsp->Fields[z]->DatLen;
|
||||
}
|
||||
memcpy(msg.to, jsp->Fields[z]->Buffer, len);
|
||||
}
|
||||
if (jsp->Fields[z]->LoID == JAMSFLD_DADDRESS) {
|
||||
msg.daddr = atoi(jsp->Fields[z]->Buffer);
|
||||
}
|
||||
if (jsp->Fields[z]->LoID == JAMSFLD_OADDRESS) {
|
||||
msg.oaddr = atoi(jsp->Fields[z]->Buffer);
|
||||
}
|
||||
if (jsp->Fields[z]->LoID == JAMSFLD_MSGID) {
|
||||
memset(msgid, 0, 37);
|
||||
memcpy(msgid, jsp->Fields[z]->Buffer, (jsp->Fields[z]->DatLen > 36 ? 36 : jsp->Fields[z]->DatLen));
|
||||
}
|
||||
if (jsp->Fields[z]->LoID == JAMSFLD_REPLYID) {
|
||||
memcpy(msg.reply, jsp->Fields[z]->Buffer, (jsp->Fields[z]->DatLen > 36 ? 36 : jsp->Fields[z]->DatLen));
|
||||
}
|
||||
}
|
||||
msg.timedate = jmh.DateWritten;
|
||||
body = (char *)malloc(jmh.TxtLen + 1);
|
||||
memset(body, 0, jmh.TxtLen + 1);
|
||||
JAM_ReadMsgText(jb, jmh.TxtOffset, jmh.TxtLen, (char *)body);
|
||||
|
||||
jmh.Attribute |= JAM_MSG_SENT;
|
||||
|
||||
while (1) {
|
||||
z = JAM_LockMB(jb, 100);
|
||||
if (z == 0) {
|
||||
break;
|
||||
} else if (z == JAM_LOCK_FAILED) {
|
||||
sleep(1);
|
||||
} else {
|
||||
free(body);
|
||||
JAM_DelSubPacket(jsp);
|
||||
JAM_CloseMB(jb);
|
||||
free(jb);
|
||||
fprintf(stderr, "Error locking JAM base!\n");
|
||||
return scanned;
|
||||
}
|
||||
}
|
||||
n =JAM_ChangeMsgHeader(jb, i, &jmh);
|
||||
if (n != 0) {
|
||||
fprintf(stderr, "Error updating message header %d %d\n", n, JAM_Errno(jb));
|
||||
}
|
||||
JAM_UnlockMB(jb);
|
||||
JAM_DelSubPacket(jsp);
|
||||
|
||||
msg.area = areas[area]->id;
|
||||
|
||||
for (n = 0; n < areas[area]->link_count; n++) {
|
||||
snprintf(buffer, PATH_MAX, "%s/%d/", baseoutdir, areas[area]->links[n]);
|
||||
if (stat(buffer, &st) != 0) {
|
||||
if (mkdir(buffer, 0755) != 0) {
|
||||
fprintf(stderr, "Error making directory %s\n", buffer);
|
||||
continue;
|
||||
}
|
||||
}
|
||||
snprintf(buffer, PATH_MAX, "%s/%d/%s.message", baseoutdir, areas[area]->links[n], msgid);
|
||||
fptr = fopen(buffer, "wb");
|
||||
if (fptr == NULL) {
|
||||
fprintf(stderr, "Error creating file %s\n", buffer);
|
||||
continue;
|
||||
}
|
||||
|
||||
fwrite(&msg, sizeof(struct msg_t), 1, fptr);
|
||||
fwrite(body, strlen(body), 1, fptr);
|
||||
fclose(fptr);
|
||||
}
|
||||
scanned++;
|
||||
}
|
||||
}
|
||||
}
|
||||
JAM_CloseMB(jb);
|
||||
free(jb);
|
||||
|
||||
return scanned;
|
||||
}
|
||||
|
||||
int main(int argc, char **argv) {
|
||||
int i;
|
||||
int l;
|
||||
|
||||
if (argc < 2) {
|
||||
fprintf(stderr, "Usage ./mnetscan mnet.cfg\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (!parse_config_file(argv[1])) {
|
||||
fprintf(stderr, "Error parsing config file: %s\n", argv[1]);
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (baseoutdir == NULL) {
|
||||
fprintf(stderr, "OUTDIR must be defined\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
printf("Out Base Dir: %s\n", baseoutdir);
|
||||
|
||||
for (i=0;i<area_count;i++) {
|
||||
printf("MsgArea: %d\n", areas[i]->id);
|
||||
printf(" - path %s\n", areas[i]->basedir);
|
||||
printf(" - links: ");
|
||||
for (l=0;l<areas[i]->link_count;l++) {
|
||||
printf("%d, ", areas[i]->links[l]);
|
||||
}
|
||||
printf("\n");
|
||||
|
||||
printf("\nExported %d messages\n", export_messages(i));
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
21
utils/mnettoss/Makefile
Normal file
21
utils/mnettoss/Makefile
Normal file
@ -0,0 +1,21 @@
|
||||
CC=cc
|
||||
CFLAGS=-I/usr/local/include -I../../deps/
|
||||
DEPS = mnettoss.c
|
||||
JAMLIB = ../../deps/jamlib/jamlib.a
|
||||
OBJ = mnettoss.o
|
||||
|
||||
all: mnettoss
|
||||
|
||||
%.o: %.c $(DEPS)
|
||||
$(CC) -c -o $@ $< $(CFLAGS)
|
||||
|
||||
$(JAMLIB):
|
||||
cd ../../deps/jamlib && make -f Makefile.linux
|
||||
|
||||
mnettoss: $(OBJ) $(JAMLIB)
|
||||
$(CC) -o mnettoss $^ $(CFLAGS) -L/usr/local/lib
|
||||
|
||||
.PHONY: clean
|
||||
|
||||
clean:
|
||||
rm -f $(OBJ) mnettoss
|
||||
466
utils/mnettoss/mnettoss.c
Normal file
466
utils/mnettoss/mnettoss.c
Normal file
@ -0,0 +1,466 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <limits.h>
|
||||
#include <sys/stat.h>
|
||||
#include <unistd.h>
|
||||
#include <dirent.h>
|
||||
#include "jamlib/jam.h"
|
||||
|
||||
char *baseindir = NULL;
|
||||
char *baseoutdir = NULL;
|
||||
|
||||
int imhub = 0;
|
||||
|
||||
struct msgarea_t {
|
||||
int id;
|
||||
char *basedir;
|
||||
int *links;
|
||||
int link_count;
|
||||
};
|
||||
|
||||
struct msg_t {
|
||||
int area;
|
||||
char from[32];
|
||||
char to[32];
|
||||
char subject[64];
|
||||
uint32_t timedate;
|
||||
int oaddr;
|
||||
int daddr;
|
||||
char reply[36];
|
||||
} __attribute__ ((packed));
|
||||
|
||||
struct msgarea_t **areas;
|
||||
int area_count;
|
||||
int mynode = 0;
|
||||
|
||||
int copy_file(char *src, char *dest) {
|
||||
FILE *src_file;
|
||||
FILE *dest_file;
|
||||
|
||||
char c;
|
||||
|
||||
src_file = fopen(src, "rb");
|
||||
if (!src_file) {
|
||||
return -1;
|
||||
}
|
||||
dest_file = fopen(dest, "wb");
|
||||
if (!dest_file) {
|
||||
fclose(src_file);
|
||||
return -1;
|
||||
}
|
||||
|
||||
while(1) {
|
||||
c = fgetc(src_file);
|
||||
if (!feof(src_file)) {
|
||||
fputc(c, dest_file);
|
||||
} else {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
fclose(src_file);
|
||||
fclose(dest_file);
|
||||
return 0;
|
||||
}
|
||||
|
||||
s_JamBase *open_jam_base(char *path) {
|
||||
int ret;
|
||||
s_JamBase *jb;
|
||||
|
||||
ret = JAM_OpenMB((char *)path, &jb);
|
||||
|
||||
if (ret != 0) {
|
||||
if (ret == JAM_IO_ERROR) {
|
||||
free(jb);
|
||||
ret = JAM_CreateMB((char *)path, 1, &jb);
|
||||
if (ret != 0) {
|
||||
free(jb);
|
||||
return NULL;
|
||||
}
|
||||
} else {
|
||||
free(jb);
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
return jb;
|
||||
}
|
||||
|
||||
size_t trimwhitespace(char *out, size_t len, const char *str) {
|
||||
if(len == 0)
|
||||
return 0;
|
||||
|
||||
const char *end;
|
||||
size_t out_size;
|
||||
|
||||
// Trim leading space
|
||||
while(isspace((unsigned char)*str)) str++;
|
||||
|
||||
if(*str == 0) {
|
||||
*out = 0;
|
||||
return 1;
|
||||
}
|
||||
|
||||
// Trim trailing space
|
||||
end = str + strlen(str) - 1;
|
||||
while(end > str && isspace((unsigned char)*end)) end--;
|
||||
end++;
|
||||
|
||||
// Set output size to minimum of trimmed string length and buffer size minus 1
|
||||
out_size = (end - str) < len-1 ? (end - str) : len-1;
|
||||
|
||||
// Copy trimmed string and add null terminator
|
||||
memcpy(out, str, out_size);
|
||||
out[out_size] = 0;
|
||||
|
||||
return out_size;
|
||||
}
|
||||
|
||||
int parse_config_file(char *filename) {
|
||||
FILE *fptr;
|
||||
char buffer[256];
|
||||
char bufferw[256];
|
||||
char *ptr;
|
||||
struct msgarea_t *newarea;
|
||||
|
||||
area_count = 0;
|
||||
|
||||
fptr = fopen(filename, "r");
|
||||
if (!fptr) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
fgets(buffer, 256, fptr);
|
||||
while (!feof(fptr)) {
|
||||
if (buffer[0] != ';') {
|
||||
if (buffer[strlen(buffer) - 1] == '\n'){
|
||||
buffer[strlen(buffer) - 1] = '\0';
|
||||
if (strncasecmp(buffer, "IMHUB", 5) == 0) {
|
||||
trimwhitespace(bufferw, 256, &buffer[6]);
|
||||
if (strcasecmp(bufferw, "TRUE") == 0) {
|
||||
imhub = 1;
|
||||
}
|
||||
} else if (strncasecmp(buffer, "INDIR", 5) == 0) {
|
||||
trimwhitespace(bufferw, 256, &buffer[6]);
|
||||
baseindir = strdup(bufferw);
|
||||
} else if (strncasecmp(buffer, "OUTDIR", 6) == 0) {
|
||||
trimwhitespace(bufferw, 256, &buffer[7]);
|
||||
baseoutdir = strdup(bufferw);
|
||||
} else if (strncasecmp(buffer, "MYNODE", 6) == 0) {
|
||||
trimwhitespace(bufferw, 256, &buffer[7]);
|
||||
mynode = atoi(bufferw);
|
||||
} else if (strncasecmp(buffer, "MSGAREA", 7) == 0) {
|
||||
newarea = NULL;
|
||||
ptr = strtok(&buffer[8], ",");
|
||||
|
||||
if (ptr != NULL) {
|
||||
newarea = (struct msgarea_t *)malloc(sizeof(struct msgarea_t));
|
||||
trimwhitespace(bufferw, 256, ptr);
|
||||
newarea->id = atoi(bufferw);
|
||||
newarea->link_count = 0;
|
||||
ptr = strtok(NULL, ",");
|
||||
if (ptr != NULL) {
|
||||
trimwhitespace(bufferw, 256, ptr);
|
||||
newarea->basedir = strdup(bufferw);
|
||||
ptr = strtok(NULL, ",");
|
||||
while (ptr != NULL) {
|
||||
trimwhitespace(bufferw, 256, ptr);
|
||||
if (newarea->link_count == 0) {
|
||||
newarea->links = (int *)malloc(sizeof(int));
|
||||
} else {
|
||||
newarea->links = (int *)realloc(newarea->links, sizeof(int) * (newarea->link_count + 1));
|
||||
}
|
||||
newarea->links[newarea->link_count] = atoi(bufferw);
|
||||
newarea->link_count++;
|
||||
ptr = strtok(NULL, ",");
|
||||
}
|
||||
}
|
||||
}
|
||||
if (newarea != NULL) {
|
||||
if (area_count == 0) {
|
||||
areas = (struct msgarea_t **)malloc(sizeof(struct msgarea_t *));
|
||||
} else {
|
||||
areas = (struct msgarea_t **)realloc(areas, sizeof(struct msgarea_t *) * (area_count + 1));
|
||||
}
|
||||
areas[area_count] = newarea;
|
||||
area_count++;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
fclose(fptr);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
fgets(buffer, 256, fptr);
|
||||
}
|
||||
|
||||
fclose(fptr);
|
||||
return 1;
|
||||
}
|
||||
|
||||
int isdupe(struct msg_t *msg, char *uuid) {
|
||||
s_JamBase *jb;
|
||||
s_JamBaseHeader jbh;
|
||||
s_JamMsgHeader jmh;
|
||||
s_JamSubPacket* jsp;
|
||||
|
||||
int areaid;
|
||||
int i;
|
||||
int z;
|
||||
|
||||
for (i=0;i<area_count;i++) {
|
||||
if (msg->area == areas[i]->id) {
|
||||
areaid = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
jb = open_jam_base(areas[areaid]->basedir);
|
||||
if (!jb) {
|
||||
return -1;
|
||||
}
|
||||
JAM_ReadMBHeader(jb, &jbh);
|
||||
if (jbh.ActiveMsgs > 0) {
|
||||
for (i=0;i<jbh.ActiveMsgs;i++) {
|
||||
memset(&jmh, 0, sizeof(s_JamMsgHeader));
|
||||
z = JAM_ReadMsgHeader(jb, i, &jmh, &jsp);
|
||||
|
||||
if (z != 0) {
|
||||
continue;
|
||||
}
|
||||
for (z=0;z<jsp->NumFields;z++) {
|
||||
if (jsp->Fields[z]->LoID == JAMSFLD_MSGID) {
|
||||
if (strncasecmp(uuid, jsp->Fields[z]->Buffer, 36) == 0) {
|
||||
JAM_DelSubPacket(jsp);
|
||||
JAM_CloseMB(jb);
|
||||
free(jb);
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
JAM_CloseMB(jb);
|
||||
free(jb);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int import(char *filename) {
|
||||
FILE *fptr;
|
||||
char buffer[PATH_MAX];
|
||||
char buffer2[PATH_MAX];
|
||||
char uuid[37];
|
||||
struct msg_t msg;
|
||||
int ret;
|
||||
int areaid;
|
||||
struct stat st;
|
||||
int z;
|
||||
int i;
|
||||
char *body;
|
||||
s_JamBase *jb;
|
||||
s_JamBaseHeader jbh;
|
||||
s_JamMsgHeader jmh;
|
||||
s_JamSubPacket* jsp;
|
||||
s_JamSubfield jsf;
|
||||
|
||||
snprintf(buffer, PATH_MAX, "%s/%s", baseindir, filename);
|
||||
strncpy(uuid, filename, 36);
|
||||
|
||||
uuid[36] = '\0';
|
||||
|
||||
if (stat(buffer, &st) != 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
fptr = fopen(buffer, "rb");
|
||||
if (!fptr) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
fread(&msg, sizeof(struct msg_t), 1, fptr);
|
||||
|
||||
body = malloc(st.st_size - sizeof(struct msg_t) + 1);
|
||||
|
||||
memset(body, 0, st.st_size - sizeof(struct msg_t) + 1);
|
||||
|
||||
fread(body, st.st_size - sizeof(struct msg_t), 1, fptr);
|
||||
|
||||
fclose(fptr);
|
||||
|
||||
|
||||
for (i=0;i<area_count;i++) {
|
||||
if (msg.area == areas[i]->id) {
|
||||
areaid = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (imhub) {
|
||||
for (i=0;i<areas[areaid]->link_count;i++) {
|
||||
if (areas[areaid]->links[i] == msg.oaddr) {
|
||||
continue;
|
||||
}
|
||||
snprintf(buffer2, PATH_MAX, "%s/%d/", baseoutdir, areas[areaid]->links[i]);
|
||||
if (stat(buffer2, &st) != 0) {
|
||||
if (mkdir(buffer2, 0755) != 0) {
|
||||
fprintf(stderr, "Error making directory %s\n", buffer2);
|
||||
continue;
|
||||
}
|
||||
}
|
||||
snprintf(buffer2, PATH_MAX, "%s/%d/%s", baseoutdir, areas[areaid]->links[i], filename);
|
||||
copy_file(buffer, buffer2);
|
||||
}
|
||||
}
|
||||
|
||||
ret = isdupe(&msg, uuid);
|
||||
if (ret == -1) {
|
||||
free(body);
|
||||
fclose(fptr);
|
||||
return 0;
|
||||
} else if (ret == 1) {
|
||||
free(body);
|
||||
fclose(fptr);
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
JAM_ClearMsgHeader(&jmh);
|
||||
jmh.DateWritten = msg.timedate;
|
||||
jmh.Attribute |= JAM_MSG_TYPEECHO;
|
||||
|
||||
jsp = JAM_NewSubPacket();
|
||||
|
||||
jsf.LoID = JAMSFLD_SENDERNAME;
|
||||
jsf.HiID = 0;
|
||||
jsf.DatLen = strlen(msg.from);
|
||||
jsf.Buffer = msg.from;
|
||||
JAM_PutSubfield(jsp, &jsf);
|
||||
|
||||
jsf.LoID = JAMSFLD_RECVRNAME;
|
||||
jsf.HiID = 0;
|
||||
jsf.DatLen = strlen(msg.to);
|
||||
jsf.Buffer = msg.to;
|
||||
JAM_PutSubfield(jsp, &jsf);
|
||||
|
||||
jsf.LoID = JAMSFLD_SUBJECT;
|
||||
jsf.HiID = 0;
|
||||
jsf.DatLen = strlen(msg.subject);
|
||||
jsf.Buffer = msg.subject;
|
||||
JAM_PutSubfield(jsp, &jsf);
|
||||
|
||||
sprintf(buffer, "%d", msg.oaddr);
|
||||
jsf.LoID = JAMSFLD_OADDRESS;
|
||||
jsf.HiID = 0;
|
||||
jsf.DatLen = strlen(buffer);
|
||||
jsf.Buffer = buffer;
|
||||
JAM_PutSubfield(jsp, &jsf);
|
||||
|
||||
jsf.LoID = JAMSFLD_MSGID;
|
||||
jsf.HiID = 0;
|
||||
jsf.DatLen = strlen(uuid);
|
||||
jsf.Buffer = uuid;
|
||||
JAM_PutSubfield(jsp, &jsf);
|
||||
|
||||
if (strlen(msg.reply)> 0) {
|
||||
jsf.LoID = JAMSFLD_REPLYID;
|
||||
jsf.HiID = 0;
|
||||
jsf.DatLen = strlen(msg.reply);
|
||||
jsf.Buffer = msg.reply;
|
||||
JAM_PutSubfield(jsp, &jsf);
|
||||
jmh.ReplyCRC = JAM_Crc32(msg.reply, strlen(msg.reply));
|
||||
}
|
||||
|
||||
jb = open_jam_base(areas[areaid]->basedir);
|
||||
if (!jb) {
|
||||
return 0;
|
||||
}
|
||||
while (1) {
|
||||
z = JAM_LockMB(jb, 100);
|
||||
if (z == 0) {
|
||||
break;
|
||||
} else if (z == JAM_LOCK_FAILED) {
|
||||
sleep(1);
|
||||
} else {
|
||||
free(body);
|
||||
JAM_DelSubPacket(jsp);
|
||||
JAM_CloseMB(jb);
|
||||
free(jb);
|
||||
fprintf(stderr, "Error locking JAM base!\n");
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
if (JAM_AddMessage(jb, &jmh, jsp, body, strlen(body))) {
|
||||
JAM_UnlockMB(jb);
|
||||
JAM_DelSubPacket(jsp);
|
||||
JAM_CloseMB(jb);
|
||||
free(jb);
|
||||
fprintf(stderr, "Error Adding Message!\n");
|
||||
free(body);
|
||||
return 0;
|
||||
}
|
||||
JAM_UnlockMB(jb);
|
||||
JAM_DelSubPacket(jsp);
|
||||
JAM_CloseMB(jb);
|
||||
free(jb);
|
||||
|
||||
free(body);
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
int main(int argc, char **argv) {
|
||||
int i;
|
||||
int l;
|
||||
int processed = 0;
|
||||
DIR *indir;
|
||||
struct dirent *dent;
|
||||
char buffer[PATH_MAX];
|
||||
|
||||
if (argc < 2) {
|
||||
fprintf(stderr, "Usage ./mnettoss mnet.cfg\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (!parse_config_file(argv[1])) {
|
||||
fprintf(stderr, "Error parsing config file: %s\n", argv[1]);
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (baseoutdir == NULL) {
|
||||
fprintf(stderr, "OUTDIR must be defined\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (baseindir == NULL) {
|
||||
fprintf(stderr, "INDIR must be defined\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
printf("In Base Dir: %s\n", baseindir);
|
||||
|
||||
indir = opendir(baseindir);
|
||||
if (!indir) {
|
||||
fprintf(stderr, "Error opening inbound directory!\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
while ((dent = readdir(indir)) != NULL) {
|
||||
if (strlen(dent->d_name) < 8) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (strcasecmp(&dent->d_name[strlen(dent->d_name) - 8], ".message") == 0) {
|
||||
if (import(dent->d_name)) {
|
||||
processed++;
|
||||
snprintf(buffer, PATH_MAX, "%s/%s", baseindir, dent->d_name);
|
||||
unlink(buffer);
|
||||
rewinddir(indir);
|
||||
}
|
||||
}
|
||||
}
|
||||
closedir(indir);
|
||||
|
||||
printf("Processed %d Messages\n", processed);
|
||||
return 0;
|
||||
}
|
||||
Reference in New Issue
Block a user