| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
When there are standardized headers, use these instead of the bloated
os_compat.h.
|
|
|
|
|
|
| |
The assertion on "!client_is_expired(client)" was wrong, because
writing the command response may cause the client to become expired.
Replace that assertion with a check.
|
|
|
|
| |
Remove one comparison by changing branch order.
|
|
|
|
|
|
|
|
|
| |
Since the caller chain doesn't care about the return value (except for
COMMAND_RETURN_KILL, COMMAND_RETURN_CLOSE), just return 0 if there is
nothing special. This saves one local variable initialization, and
one access to it.
Also remove one unreachable "return 1" from client_read().
|
|
|
|
|
|
|
| |
Don't close the client within client_process_line(), return
COMMAND_RETURN_CLOSE instead. This is the signal for the caller chain
to actually close it. This makes dealing with the client pointer a
lot safer, since the caller always knows whether it is still valid.
|
|
|
|
| |
It's easier to reuse the variable if it has a more generic name.
|
|
|
|
| |
Don't update client data if it is going to be closed anyway.
|
|
|
|
|
|
| |
Don't pass a pointer to client->permission to processCommand(), better
let the code in command.c use the new permission getter/setter
functions.
|
|
|
|
|
| |
The code in command.c shouldn't mess with a pointer to
client->permission. Provide an API for accessing this value.
|
|
|
|
|
|
| |
All callers of fdprintf() have been converted to client_printf() or
fprintf(); it is time to remove this clumsy hack now. We can also
remove client_print() which took a file descriptor as parameter.
|
|
|
|
|
|
| |
Now that we have removed all invocations of client_get_fd(), we can
safely remove this transitional function. All access to the file
descriptor is now hidden behind the interface declared in client.h.
|
|
|
|
|
|
|
| |
These two functions take a client struct instead of the file
descriptor. We will now begin passing the client struct around
instead of a raw file descriptor (which needed a linear lookup in the
client list to be useful).
|
|
|
|
|
|
| |
Based on client_puts(), client_printf() is the successor of
fdprintf(). As soon as all fdprintf() callers have been rewritten to
use client_printf(), we can remove fdprintf().
|
|
|
|
|
|
| |
client_write() writes a buffer to the client and buffers it if
required. client_puts() does the same for a C string. The next patch
will add more tools which will replace fdprintf() later.
|
|
|
|
| |
As usual, include only headers which are really needed.
|
|
|
|
|
| |
client->fd becomes -1 when the client expires. Don't use FD_ISSET()
with this expired client; doing so would cause a crash due to SIGBUS.
|
|
|
|
|
|
| |
Since client->fd==-1 has become our "expired" flag, it may already be
-1 when client_close() is called. Don't assert that it is still
non-negative, and call client_set_expired() instead.
|
|
|
|
|
|
|
| |
Instead of passing the pointer to the "expired" flag to
processListOfCommands(), this function should use the client API to
check this flag. We can now remove the "global_expired" hack
introduced recently.
|
|
|
|
|
|
|
|
| |
Start exporting the client struct as an opaque struct. For now, pass
it only to processCommand() and processListOfCommands(), and provide a
function to extract the socket handle. Later, we will propagate the
pointer to all command implementations, and of course to
client_print() etc.
|
|
|
|
|
|
| |
The old code tried to write a response to the client, without even
checking if it was already closed. Now that we have added more
assertions, these may fail... perform the "expired" check earlier.
|
|
|
|
|
|
|
|
|
|
| |
Patch bdeb8e14 ("client: moved "expired" accesses into inline
function") was created under the wrong assumption that
processListOfCommands() could modify the expired flag, which is not
the case. Although "expired" is a non-const pointer,
processListOfCommands() just reads it, using it as the break condition
in a "while" loop. I will address this issue with a better overall
solution, but for now provide a pointer to a global "expired" flag.
|
|
|
|
|
|
| |
client_defer_output() was modified so that it can create the
deferred_send list. With this patch, the assertion on
"deferred_send!=NULL" has become invalid. Remove it.
|
| |
|
|
|
|
| |
Why waste 4 bytes for a flag which we can hide in another variable.
|
|
|
|
| |
Hiding this flag allows us later to remove it easily.
|
|
|
|
|
| |
Unclutter the client_new() constructor by moving unrelated complex
code into a separate function.
|
|
|
|
|
|
| |
The last patch removed the "continue" directive, and now the while
loop is without function. Remove it. Also make client_manager_io()
return 0.
|
|
|
|
|
|
|
| |
Previously, when select() failed, we assumed that there was an invalid
file descriptor in one of the client structs. Thus we tried select()
one by one. This is bogus, because we should never have invalid file
descriptors. Remove it, and make select() errors fatal.
|
|
|
|
|
| |
Eliminate duplicated code, call client_defer_output() which we
splitted from client_write_output() earlier.
|
|
|
|
|
| |
Move the second part of client_write_output() into a separate
function.
|
|
|
|
|
|
| |
client_defer_output() was designed to add new buffers to an existing
deferred_send buffer. Tweak it and allow it to create a new buffer
list.
|
|
|
|
|
| |
Exit the function when an error occurs, and move the rest of the
following code one indent level left.
|
|
|
|
|
| |
Split the large function client_write_output() into two parts; this is
the first code moving patch.
|
|
|
|
|
|
| |
All of the client's resources are freed in client_close(). It is
enough to set the "expired" flag, no need to duplicate lots of
destruction code again and again.
|
|
|
|
|
|
| |
Due to the large buffers in the client struct, the static client array
eats several megabytes of RAM with a maximum of only 10 clients. Stop
this waste and allocate each client struct from the heap.
|
|
|
|
|
| |
The code becomes less complex and more readable when we move this
linear search into a separate mini function.
|
|
|
|
| |
This saves one level of indent.
|
|
|
|
|
|
| |
Functions which operate on the whole client list are prefixed with
"client_manager_", and functions which handle just one client just get
"client_".
|
|
|
|
|
| |
Rename all static functions, variables and macros which have
"interface" in their name to something nicer prefixed with "client_".
|
|
|
|
|
|
|
| |
Second patch: rename the internal struct name. We will eventually
export this type as an opaque forward-declared struct later, so we
can pass a struct pointer instead of a file descriptor, which would
save us an expensive linear lookup.
|
|
I don't believe "interface" is a good name for something like
"connection by a client to MPD", let's call it "client". This is the
first patch in the series which changes the name, beginning with the
file name.
|