80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Merge pull request #4251 from Cacodemon345/modem_emu

Browse Source 
netsockets: Swap port number
This commit is contained in:
Miran Grča
2024-03-13 12:33:45 +01:00
committed by GitHub
parent 4d3f294f99 b2a4d7457e
commit 20db196437
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/network/net_modem.c
View File

@@ -113,6 +113,7 @@ typedef struct modem_t
bool echo, numericresponse; bool echo, numericresponse;
bool tcpIpMode, tcpIpConnInProgress; bool tcpIpMode, tcpIpConnInProgress;
bool telnet_mode; bool telnet_mode;
bool dtrstate;
uint32_t tcpIpConnCounter; uint32_t tcpIpConnCounter;
int doresponse; int doresponse;
@@ -957,6 +958,7 @@ void
modem_dtr_callback(serial_t* serial, int status, void *priv) modem_dtr_callback(serial_t* serial, int status, void *priv)
{ {
modem_t *dev = (modem_t *) priv; modem_t *dev = (modem_t *) priv;
dev->dtrstate = !!status;
if (status == 1) if (status == 1)
timer_disable(&dev->dtr_timer); timer_disable(&dev->dtr_timer);
else if (!timer_is_enabled(&dev->dtr_timer)) else if (!timer_is_enabled(&dev->dtr_timer))
@@ -1207,7 +1209,7 @@ modem_cmdpause_timer_callback(void *priv)
if (!modem->connected && modem->waitingclientsocket == -1 && modem->serversocket != -1) { if (!modem->connected && modem->waitingclientsocket == -1 && modem->serversocket != -1) {
modem->waitingclientsocket = plat_netsocket_accept(modem->serversocket); modem->waitingclientsocket = plat_netsocket_accept(modem->serversocket);
if (modem->waitingclientsocket != -1) { if (modem->waitingclientsocket != -1) {
if (!(modem->serial->mctrl & 1) && modem->dtrmode != 0) { if (modem->dtrstate == 0 && modem->dtrmode != 0) {
modem_enter_idle_state(modem); modem_enter_idle_state(modem);
} else { } else {
modem->ringing = true; modem->ringing = true;

2
src/unix/unix_netsocket.c
View File

@@ -64,7 +64,7 @@ SOCKET plat_netsocket_create_server(int type, unsigned short port)
sock_addr.sin_family = AF_INET; sock_addr.sin_family = AF_INET;
sock_addr.sin_addr.s_addr = INADDR_ANY; sock_addr.sin_addr.s_addr = INADDR_ANY;
sock_addr.sin_port = port; sock_addr.sin_port = htons(port);
if (bind(fd, (struct sockaddr *)&sock_addr, sizeof(struct sockaddr_in)) == -1) { if (bind(fd, (struct sockaddr *)&sock_addr, sizeof(struct sockaddr_in)) == -1) {
plat_netsocket_close(fd); plat_netsocket_close(fd);

2
src/win/win_netsocket.c
View File

@@ -53,7 +53,7 @@ SOCKET plat_netsocket_create_server(int type, unsigned short port)
sock_addr.sin_family = AF_INET; sock_addr.sin_family = AF_INET;
sock_addr.sin_addr.s_addr = INADDR_ANY; sock_addr.sin_addr.s_addr = INADDR_ANY;
sock_addr.sin_port = port; sock_addr.sin_port = htons(port);
if (bind(socket, (struct sockaddr *)&sock_addr, sizeof(struct sockaddr_in)) == SOCKET_ERROR) { if (bind(socket, (struct sockaddr *)&sock_addr, sizeof(struct sockaddr_in)) == SOCKET_ERROR) {
plat_netsocket_close(socket); plat_netsocket_close(socket);