Commit 84b31826 authored by Stefan Monnier's avatar Stefan Monnier
Browse files

(Fmake_network_process): Fix up the tests for

"connectionless socket", so they DTRT for seqpacket sockets as well.
parent f00c449b
...@@ -354,6 +354,8 @@ the variable `byte-compile-compatibility') has been removed. ...@@ -354,6 +354,8 @@ the variable `byte-compile-compatibility') has been removed.
* Lisp changes in Emacs 23.2 * Lisp changes in Emacs 23.2
** make-network-socket can now also create `seqpacket' Unix sockets.
** New function `completion-in-region' to use the standard completion ** New function `completion-in-region' to use the standard completion
facilities on a particular region of text. facilities on a particular region of text.
......
2009-12-03 Daniel Hackney <dan@haxney.org> (tiny change)
* process.c (Fmake_network_process): Fix up the tests for
"connectionless socket", so they DTRT for seqpacket sockets as well.
2009-12-03 Stefan Monnier <monnier@iro.umontreal.ca> 2009-12-03 Stefan Monnier <monnier@iro.umontreal.ca>
   
* process.c (Qseqpacket): New symbol. * process.c (Qseqpacket): New symbol.
......
...@@ -3333,7 +3333,7 @@ usage: (make-network-process &rest ARGS) */) ...@@ -3333,7 +3333,7 @@ usage: (make-network-process &rest ARGS) */)
QCaddress = is_server ? QClocal : QCremote; QCaddress = is_server ? QClocal : QCremote;
/* :nowait BOOL */ /* :nowait BOOL */
if (!is_server && socktype == SOCK_STREAM if (!is_server && socktype != SOCK_DGRAM
&& (tem = Fplist_get (contact, QCnowait), !NILP (tem))) && (tem = Fplist_get (contact, QCnowait), !NILP (tem)))
{ {
#ifndef NON_BLOCKING_CONNECT #ifndef NON_BLOCKING_CONNECT
...@@ -3428,7 +3428,7 @@ usage: (make-network-process &rest ARGS) */) ...@@ -3428,7 +3428,7 @@ usage: (make-network-process &rest ARGS) */)
Some kernels have a bug which causes retrying connect to fail Some kernels have a bug which causes retrying connect to fail
after a connect. Polling can interfere with gethostbyname too. */ after a connect. Polling can interfere with gethostbyname too. */
#ifdef POLL_FOR_INPUT #ifdef POLL_FOR_INPUT
if (socktype == SOCK_STREAM) if (socktype != SOCK_DGRAM)
{ {
record_unwind_protect (unwind_stop_other_atimers, Qnil); record_unwind_protect (unwind_stop_other_atimers, Qnil);
bind_polling_period (10); bind_polling_period (10);
...@@ -3631,7 +3631,7 @@ usage: (make-network-process &rest ARGS) */) ...@@ -3631,7 +3631,7 @@ usage: (make-network-process &rest ARGS) */)
} }
#endif #endif
if (socktype == SOCK_STREAM && listen (s, backlog)) if (socktype != SOCK_DGRAM && listen (s, backlog))
report_file_error ("Cannot listen on server socket", Qnil); report_file_error ("Cannot listen on server socket", Qnil);
break; break;
...@@ -3794,7 +3794,7 @@ usage: (make-network-process &rest ARGS) */) ...@@ -3794,7 +3794,7 @@ usage: (make-network-process &rest ARGS) */)
p->pid = 0; p->pid = 0;
p->infd = inch; p->infd = inch;
p->outfd = outch; p->outfd = outch;
if (is_server && socktype == SOCK_STREAM) if (is_server && socktype != SOCK_DGRAM)
p->status = Qlisten; p->status = Qlisten;
/* Make the process marker point into the process buffer (if any). */ /* Make the process marker point into the process buffer (if any). */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment