Commit Graph

2614 Commits

Author SHA1 Message Date
bolt
c6e1af7ff4 Fix compile time warning on enum compare 2020-04-09 15:07:29 +02:00
bolt
767b97311b Add the strings from commit 00f02d9d0c to user_strings.h 2020-04-09 14:50:07 +02:00
asvitkine
a4a2c88ed7
Merge pull request #190 from fragglet/patch-1
configure: Enable /dev/ptmx for Linux, Darwin.
2020-03-15 19:04:20 -04:00
asvitkine
1918557e78
Merge pull request #192 from anabate123/patch-1
Added more Mac models to the ModelID string
2020-03-15 19:04:08 -04:00
anabate123
00f02d9d0c
Added more Mac models to the ModelID string 2020-03-14 18:59:27 -04:00
Simon Howard
507508b66d
configure: Enable /dev/ptmx for Linux, Darwin.
Both of these systems have /dev/ptmx for creating pseudoterminals.
OS X Leopard (10.5) added it in 2007, and Linux has had support for
it since v2.1 (1998).

This fixes a bug with pseudoterminal creation on Linux and macOS
where a new pseudoterminal cannot be created because the wrong
method is being used to find one.
2020-01-25 01:05:52 -05:00
asvitkine
01052ca89d
Merge pull request #181 from atsampson/scsifix
Remove obsolete sg.h workaround.
2019-04-05 01:12:49 -04:00
asvitkine
9a3bd0b258
Merge pull request #183 from phcoder/master
sigsegv.cpp: Add addr32 decode
2019-04-05 01:12:11 -04:00
Vladimir Serbinenko
6267af0315 sigsegv.cpp: Add addr32 decode
With this fix I can compile with ./configure --enable-addressing=direct,0x100000
and then I don't need to change vm.mmap_min_addr and hence without root
privileges
2019-03-21 15:13:53 +01:00
Adam Sampson
668c2ba107 Remove obsolete sg.h workaround.
This is no longer necessary as of glibc 2.2 (released in November 2000),
and it causes breakage when /usr/include/linux is installed using a
symlink-based system like stow.
2018-10-31 12:43:55 +00:00
asvitkine
143b0827dd
Merge pull request #180 from atsampson/vdefix
Make vdeplug support optional.
2018-10-31 08:40:58 -04:00
Adam Sampson
5d77f86575 Make vdeplug support optional.
Linking with -lvdeplug without checking whether it exists causes
failures from later configure tests; this makes it an optional
dependency in the same way as other libraries.
2018-10-31 12:36:35 +00:00
asvitkine
507813529e
Merge pull request #179 from MSharq/MSharq
added VDE functionality
2018-10-29 20:58:20 -04:00
MSharq
e583d05868 fixed vde_sock pointer 2018-10-29 21:14:25 +01:00
MSharq
242e8af3a7 fixed a bug 2018-10-29 15:44:53 +01:00
MSharq
2bc581d4f6 fixed indentation ether_unix 2018-10-28 19:42:04 +01:00
MSharq
cf406ec953 fixed indentation ether_unix 2018-10-28 19:40:08 +01:00
Christian Bauer
76c5a97efe Fix libreadline detection. 2018-10-28 13:28:06 +01:00
Christian Bauer
ddf1bcf094 Fix const-ness of main() parameters. 2018-10-27 22:48:58 +02:00
MSharq
0c622863cf fixed a bug 2018-10-23 15:37:09 +02:00
MSharq
30fdd103a2 changed vde switch to vde_switch in the usage function 2018-10-20 15:11:40 +02:00
MSharq
50c98de60f a few indentation fixes 2018-10-20 15:07:38 +02:00
MSharq
320fae37a4 printfs for the selected ethernet device 2018-10-20 11:37:07 +02:00
MSharq
e4332cc72a added the printf statement for all Ethernet devices 2018-10-20 11:18:08 +02:00
asvitkine
5f04c95b79
adding static to VDECONN
Co-Authored-By: MSharq <mdshrq7@gmail.com>
2018-10-20 09:59:57 +02:00
asvitkine
f7023246d9
Update BasiliskII/src/Unix/ether_unix.cpp
Co-Authored-By: MSharq <mdshrq7@gmail.com>
2018-10-20 09:49:42 +02:00
MSharq
90b65715ae added VDE functionality 2018-09-28 16:14:14 +02:00
asvitkine
2e302d60a3
Merge pull request #163 from atmaxinger/fix-devpollcdrom
Mac GUI: don't show /dev/poll/cdrom if it is configured as cdrom
2018-02-25 12:51:13 -05:00
atmaxinger
e791a1fdd6 fix identation 2018-02-25 17:44:08 +01:00
atmaxinger
4f14c44837 Fix formatting 2018-02-25 17:01:12 +01:00
atmaxinger
a2e163fea9 fix whitespaces 2018-02-22 23:08:57 +01:00
atmaxinger
f25821d067 Fix CD ROM entries appearing multiple times 2018-02-22 23:06:23 +01:00
atmaxinger
515746d584 Only remove item at index 2018-02-22 11:32:57 +01:00
atmaxinger
f2fcfffabb Always save the cdrom entries from /dev/ 2018-02-22 11:11:11 +01:00
atmaxinger
4ba1c48ec8 Always write /dev/poll/cdrom to preferences 2018-02-22 10:36:36 +01:00
atmaxinger
85bcff03d4 Block all CDROMs in /dev/ 2018-02-21 16:24:20 +01:00
atmaxinger
787661f80f Always save the default entry "cdrom /dev/poll/cdrom" 2018-02-21 15:24:29 +01:00
atmaxinger
3931036d87
Fix whitespace 2018-02-20 12:39:59 +01:00
atmaxinger
581ce7d971 Mac GUI: don't show /dev/poll/cdrom if it is configured as cdrom 2018-02-20 11:54:55 +01:00
Alexei Svitkine
588a2ae9cd don't try to run diskutil eject (null) 2018-01-01 15:42:53 -05:00
asvitkine
62eaaee1b2
Merge pull request #161 from dcoshea/X11-icon
Basilisk II: Add icons for X11 based on the MacOS X icons (fixes #160).
2017-12-31 01:43:05 -05:00
David O'Shea
9e2fc30ecd Basilisk II: Add icons for X11 based on the MacOS X icons (fixes #160).
Note that it appears that a 'make clean' may be required due to the
change in user_strings_unix.h failing to cause all of the modules that
include it to be rebuilt.
2017-12-31 12:10:30 +10:30
asvitkine
ff129e8649
Merge pull request #158 from rickyzhang82/pr-travis-ci
Add Travis CI configuration file and README.md status.
2017-12-28 20:43:13 -05:00
asvitkine
b54b25f67d
Merge pull request #159 from dcoshea/README-Linux-bridging
Basilisk II: Update README to cover bridging tun interfaces.
2017-12-28 20:42:39 -05:00
David O'Shea
802224630d Basilisk II: Update README to cover bridging tun interfaces.
Now that issue #154 has been fixed, when Basilisk II is configured to
use "tun" for networking, the generated tunN interface can be bridged,
enabling AppleTalk frames to be forwarded without the Linux host
needing to be able to route AppleTalk.

This commit updates the README to discuss this possibility and briefly
outline how it can be achieved.  A number of spelling corrections and
other minor clarifications are made in the same area.
2017-12-29 11:49:37 +10:30
Ricky Zhang
8c64ebfd03 Add Travis CI configuration file and README.md status. 2017-12-28 20:06:35 -05:00
asvitkine
461332cbf7
Merge pull request #157 from dcoshea/issue-154
Avoid an all-zero Ethernet/MAC address when using TUN/TAP (fixes #154).
2017-12-28 13:31:41 -05:00
asvitkine
86c5613701
Merge pull request #155 from dcoshea/issue-153
Fix TUN/TAP detection on CentOS 7 (#include <sys/socket.h>) (fixes #153).
2017-12-28 13:31:00 -05:00
asvitkine
3bcb0d4556
Merge pull request #156 from dcoshea/issue-152
Fix link error due to missing X11 libraries (fixes #152).
2017-12-28 13:29:58 -05:00
David O'Shea
385b49ba8e Avoid an all-zero Ethernet/MAC address when using TUN/TAP (fixes #154).
Previously, when "ether tun" configuration was used on a Linux host,
packets were sent with Ethernet/MAC address 00:00:00:00:00:00.  Under
CentOS 7 at least, this did not appear to cause any issues where the
tun interface on the host was configured with an IP address, but when
an attempt was made to bridge the tun interface, it was no longer
possible to establish IP communication between the emulated machine
and either the Linux host or a Windows NT Server 4 VM.

This fix causes an Ethernet/MAC address to be generated in the same
way when using TUN/TAP as is done for ethertap.
2017-12-28 22:49:01 +10:30