summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix multiple printf format problemsDaniel P. Berrange2012-04-259-18/+16
| | | | | | | | | | | | | | | | All printf var-args style methods should be annotation with their format. All format strings must be const strings. * client/application.cpp, client/cmd_line_parser.cpp, client/hot_keys.cpp: Avoid non-const format * client/client_net_socket.cpp: Fix broken format specifier * client/red_peer.cpp: Fix missing format specifier * client/platform.h: Add SPICE_GNUC_PRINTF annotation to term_printf * client/utils.h: Add SPICE_GNUC_PRINTF annotation to string_printf * server/glz_encoder_config.h, server/red_worker.c: Add SPICE_GNUC_PRINTF annotation to warning callbacks Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
* Fix const-ness violationsDaniel P. Berrange2012-04-252-3/+3
| | | | | | | * server/red_worker.c: Add missing const for return type * server/reds.c: Static strings must be declared const Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
* Don't do arithmetic on void * type, use uint8_t insteadDaniel P. Berrange2012-04-251-6/+6
| | | | | | | | Arithmetic on void * types is non-portable & trivially avoided * server/dispatcher.c: Use uint8_t for arithmetic Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
* spice-common: update submodule to verify_subject MSVC++ fixAlon Levy2012-04-181-0/+0
|
* spice-common: update submoduleAlon Levy2012-04-181-0/+0
|
* update spice-common for MSVC++ build fixesAlon Levy2012-04-181-0/+0
|
* update visual studio project fileAric Stewart2012-04-181-36/+36
| | | | | | | | Note, there may be line-ending issues here is we are not careful. This file is a msdos formatted file. There was some inconsistencies in those line-ending that I have normalized. Signed-off-by: Aric Stewart <aric@codeweavers.com>
* client/windows/redc.vcproj: switch to unix EOL (dos2unix)Alon Levy2012-04-181-1001/+1001
|
* Update win32 generate(1).bat files to match modern usageAric Stewart2012-04-182-4/+4
| | | | | | | | | This involves: generating .c instead of .cpp files Not including "common.h" Standardizing some parameters Signed-off-by: Aric Stewart <aric@codeweavers.com>
* we do not need afxres.h included in redc.rcAric Stewart2012-04-181-1/+1
| | | | | It is not an MFC project so simply including windef.h is better and allows for compiling with the Express editions of Visual Studio.
* fix error-path return in snd_set_record_peer()Michael Tokarev2012-04-181-2/+2
| | | | | | The error_{1,2} labels in this functions are backwards. Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
* Copy getopt.h from old common/win/my_getopt-1.5/my_getoptAric Stewart2012-04-171-0/+56
| | | | | This patch completes the copy from 4d8f39020ac83602c1647d4af04e8b19bf74ed6e which missed this file.
* update windows client generate.bat and generate1.batAric Stewart2012-04-172-4/+4
| | | | | the python script is now in spice-common and client_marshallers.h needs to be included instead of marshallers.h
* server: allow failure in getvirtAlon Levy2012-04-055-89/+240
| | | | | | | This patch changed getvirt to continue working even if spice_critical doesn't abort (i.e. SPICE_ABORT_LEVEL != -1). This is in preparation to make getvirt not abort at all. The reason is that getvirt is run on guest provided memory, so a bad driver can crash the vm.
* Replace sprintf with snprintf useChristophe Fergeau2012-04-021-1/+1
| | | | | | The hotkey parser was generating a string with sprintf and data it got from the controller socket (ie data which can have an arbitrary length). Using sprintf there is a bad idea, replace it with snprintf.
* spice-common: update to fix quic-encode warningsMarc-André Lureau2012-03-281-0/+0
|
* server: export spice_server_is_server_mouse predicateAlon Levy2012-03-263-1/+13
| | | | To be used by qemu query-spice / info spice commands.
* Remove files moved to spice-commonMarc-André Lureau2012-03-2610-5504/+0
|
* Copy common/win/my_getopt-1.5/my_getopt client/windowsMarc-André Lureau2012-03-252-21/+352
|
* Use the spice-common logging functionsMarc-André Lureau2012-03-2521-908/+907
| | | | | It will abort by default for critical level messages. That behaviour can be tuned at runtime.
* Use the spice-common submoduleMarc-André Lureau2012-03-25126-27873/+252
| | | | | | | | | | | | | | | | | | This patch will replace the common/ directory with the spice-common project. It is for now a simple project subdirectory shared with spice-gtk, but the goal is to make it a proper library later on. With this change, the spice-server build is broken. The following commits fix the build, and have been seperated to ease the review. v2 - moves all the generated marshallers to spice-common library - don't attempt to fix windows VS build, which should somehow be splitted with spice-common (or built from tarball only to avoid generation tools/libs deps) v3 - uses libspice-common-client - fix a mutex.h inclusion reported by Alon
* sasl: small refactoring, check memcheck != NULLMarc-André Lureau2012-03-231-10/+8
|
* Use spice_strdup() to avoid crashing on NULLMarc-André Lureau2012-03-233-10/+10
| | | | | qemu can call spice_server_set_name(s, NULL) when the name is not given. Let's not crash in this case
* server/tests: add resolution changes testerAlon Levy2012-03-222-6/+80
|
* server/tests/test_display_base: add CommandAlon Levy2012-03-222-45/+101
| | | | add parameters to the commands used for display tests.
* server/tests/test_display_base: remove 64bit arch assumptionsAlon Levy2012-03-211-5/+5
|
* server/red_memslots: don't assume 64 bit environmentAlon Levy2012-03-212-7/+10
| | | | | | assumption that unsigned long == QXLPHYSICAL causes get_virt to compute the wrong slot. Fix by replacing addr variables to be of type QXLPHYSICAL.
* server/red_worker: fix for case where ASSERT is compiled outAlon Levy2012-03-211-2/+1
|
* server/red_memslots: use QXLPHYSICAL for addressesAlon Levy2012-03-212-3/+3
| | | | | Cannot assume unsigned long == QXLPHYSICAL, not true for 32 bit architectures.
* server/red_memslots: drop two unused functionsAlon Levy2012-03-212-19/+0
| | | | | | | | | | | | | | cb_get_virt and cb_validate_virt have disappeared a long time ago, not needed since: commit 5ac88aa79fa6445f96e5419d8bf4fce81da63b90 Author: Gerd Hoffmann <kraxel@redhat.com> Date: Thu Jul 1 17:55:33 2010 +0200 Properly parse QXLImage to the new-world SpiceImage SpiceImage now replaces RedImage and has all image types in it. All image data are now chunked (and as such not copied when demarshalling).
* Don't truncate SPICE_FOREIGN_MENU_SOCKETChristophe Fergeau2012-03-201-5/+8
| | | | | | | When we get the socket name for the foreign menu socket from an environment variable, we cannot make assumptions about its length. Currently, we are strncpying to a 50 byte buffer which is easily too small.
* Don't limit spice controller socket name to 50 charsChristophe Fergeau2012-03-201-6/+4
| | | | | | | | | | | | | | | | | | The spice controller socket name used to be hardcoded to /tmp/SpiceController-%lu.uds and generated using snprintf. A 50 bytes buffer was enough for that, but this was changed in commit 79fffbf95 because this was predictable and allowed other users on the system to sniff the browser/client communication. spicec now uses the value of the environment SPICE_XPI_SOCKET as the name of the socket to use. However, since the name that is used is no longer generated by spicec, no assumption can be made about its size. Currently, the socket is created inside the user home directory, which means that if the user name is too long, spicec will not be able to read the controller socket name. This commit directly uses the string from getenv as he name of the controller socket (on Linux) instead of limiting its size to 50 characters, which should fix this issue. This fixes rhbz #804561
* Remove unused Canvas membersChristophe Fergeau2012-03-204-8/+0
| | | | | The various Canvas have _max and _base variables which are not used, better to remove them.
* server/red_worker: don't typedef SpiceWatch twiceAlon Levy2012-03-201-2/+2
| | | | First defined in spice.h, fixes build failure with gcc 4.4.6
* red_worker: Check for NULL watchesHans de Goede2012-03-131-2/+13
| | | | | | | | If we run out of watches slots, we return NULL from watch_add, which means that the other watch_foo functions may get called with a NULL parameter, protect them against this. Signed-off-by: Hans de Goede <hdegoede@redhat.com>
* server: remove superfluous checkNahum Shalman2012-03-121-3/+0
| | | | no need to duplicate the check that the fd isn't -1
* server: listen on a pre-opened file descriptorNahum Shalman2012-03-123-0/+23
| | | | | | | Allow applications to pre-open a file descriptor and have spice listen on it. Thanks to Daniel Berrange for his comments
* server: don't fail on ENOPROTOOPT from setsockoptNahum Shalman2012-03-122-2/+2
| | | | | | If we allow listening on arbitrary sockets like unix sockets, we can get ENOPROTOOPT errors from setsockopt calls that set TCP specific options. This should be allowed to happen.
* red_channel: remove pre_disconnect hookHans de Goede2012-03-122-4/+0
| | | | | | Now that red_worker's EventListener is gone there are no more users of it. Signed-off-by: Hans de Goede <hdegoede@redhat.com>
* red_worker: Rework poll code to use the watch interfaceHans de Goede2012-03-121-91/+79
| | | | | | | | | | | | | | | | | | | | | | | | | Commit 143a1df24e83e9c1e173c16aeb76d61ffdce9598 changed red_worker_main from epoll to poll. But epoll has edge triggered semantics (when requested and we requested them), where as poll is always level triggered. And red_worker was relying on the edge triggered semantics, as it was always polling for POLLOUT, which, when edge triggered, would only cause poll to register an event after we had blocked on a write. But after the switch to regular poll, with its level triggered semantics, the POLLOUT condition would almost always be true, causing red_worker_main to not block on the poll and burn CPU as fast as it can as soon as a client was connected. Luckily we already have a mechanism to switch from polling for read only to polling for read+write and back again in the form of watches. So this patch changes the red_worker dummy watch implementation into a proper watch implementation, and drops the entire EventListener concept since that then is no longer needed. This fixes spice-server using 400% CPU on my quad core machine as soon as a client was connected to a multi head vm, and as an added bonus is a nice cleanup IMHO. Signed-off-by: Hans de Goede <hdegoede@redhat.com>
* red_channel: Use the channel core to remove the stream watch on disconnectHans de Goede2012-03-121-0/+4
| | | | | | | | | | | | | | | | | We allow channels to have different core implementations, but we were relying on reds_stream_free to remove the stream watch on disconnect, and reds_stream_free always uses the qemu core implementation. So far we were getting away with this since all the alternative core implementations always return NULL from watch_add. But: 1) The code before this patch clearly was not correct, since it was matching a channel-core watch_add with a qemu-core watch_remove 2) I plan to move red_worker over to actually using an alternative watch implementation at which point this becomes a real problem Signed-off-by: Hans de Goede <hdegoede@redhat.com>
* red_worker: Remove ref counting from the EventListener structHans de Goede2012-03-101-34/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The red_worker EventListener struct is either embedded in one of: 1) DisplayChannelClient 2) CursorChannelClient 3) RedWorker And as such gets destroyed when these get destroyed, in case 1 & 2 through a call to red_channel_client_destroy(). So free-ing it when the ref-count becomes 0 is wrong, for cases: 1) and 2) this will lead to a double free; 3) this will lead to passing memory to free which was not returned by malloc. This is not causing any issues as the ref-count never gets decremented, other then in red_worker_main where it gets incremented before it gets decremented, so it never becomes 0. So we might just as well completely remove it. Notes: 1) This is mainly a preparation patch for fixing issues introduced by the move from epoll to poll 2) Since removing the ref-counting removes the one code path where listeners would get set to NULL, this patch moves the setting of NULL to pre_disconnect, where it should have been done in the first place since red_client_destroy calls red_channel_client_disconnect (through the dispatcher) followed by red_channel_client_destroy, so after pre_disconnect the listener may be gone. Signed-off-by: Hans de Goede <hdegoede@redhat.com>
* Ensure all members of ChannelCbs and ClientCbs are either assigned or NULLHans de Goede2012-03-109-21/+15
| | | | | | | | | | | | | | | While git-bisecting another issue I ended up hitting and not recognizing the bug fixed by commit 7a079b452b026d6ce38f95dcc397fa64b059fffb. While fixing this (again) I noticed that (even after the fix) not all users of ChannelCbs first zero it. So this patch ensures that all users of ChannelCbs first zero it, and does the same for ClientCbs while at it. Since before this patch there were multiple zero-ing styles, some using memset and other using a zero initializer this patch also unifies all the zero-ing to use a NULL initializer for the first element. Signed-off-by: Hans de Goede <hdegoede@redhat.com>
* server/red_worker: fix use after free for listenersAlon Levy2012-03-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a core dumped observed once by repeated migration. So far 100 migrations and no recurrence. Core was generated by `/home/alon/spice/upstream/bin/qemu-system-x86_64 --enable-kvm -qmp unix:/tmp/mi'. Program terminated with signal 11, Segmentation fault. 11197 if (evt_listener && evt_listener->refs > 1) { Missing separate debuginfos, use: debuginfo-install bluez-libs-4.98-3.fc17.x86_64 brlapi-0.5.6-4.fc17.x86_64 bzip2-libs-1.0.6-4.fc17.x86_64 cryptopp-5.6.1-6.fc17.x86_64 keyutils-libs-1.5.5-2.fc17.x86_64 libssh2-1.4.0-1.fc17.x86_64 nss-softokn-freebl-3.13.1-20.fc17.x86_64 xen-libs-4.1.2-11.fc17.x86_64 xz-libs-5.1.1-2alpha.fc17.x86_64 (gdb) bt (gdb) l 11192 for (i = 0; i < MAX_EVENT_SOURCES; i++) { 11193 struct pollfd *pfd = worker.poll_fds + i; 11194 if (pfd->revents) { 11195 EventListener *evt_listener = worker.listeners[i]; 11196 11197 if (evt_listener && evt_listener->refs > 1) { 11198 evt_listener->action(evt_listener, pfd); 11199 if (--evt_listener->refs) { 11200 continue; 11201 } (gdb) p evt_listener $1 = (EventListener *) 0x7f15a9a5d1e0 (gdb) p *evt_listener Cannot access memory at address 0x7f15a9a5d1e0 (gdb) p i $2 = 2 (gdb) p worker.listeners $3 = {0x7f15bc832520, 0x7f15a406e1a0, 0x7f15a9a5d1e0, 0x0 <repeats 17 times>}
* Use SPICE_FOREIGN_MENU_SOCKET if it's availableMarc-André Lureau2012-03-052-2/+8
| | | | | | | | | | | If specified, use SPICE_FOREIGN_MENU_SOCKET environment variable over snprintf(pipe_name, PIPE_NAME_MAX_LEN, PIPE_NAME, Platform::get_process_id()); since it's impossible to guess the client pid when spice-xpi launches the client as a grand-child (via script etc). This is also more aligned with the way we handle SPICE_XPI_SOCKET location.
* Fix spice-protocol referenceMarc-André Lureau2012-03-051-0/+0
|
* Send name & uuid to capable clientsMarc-André Lureau2012-03-059-1/+118
| | | | | | | | | Add spice_server_set_name() and spice_server_set_uuid() that allows the client to identify a Spice server (useful to associate settings with a particular server) The SPICE_MSG_MAIN_NAME and SPICE_MSG_MAIN_UUID messages are only sent to capable clients, announcing SPICE_MAIN_CAP_NAME_AND_UUID.
* demarshal: fixed-size array are missing __nelementsMarc-André Lureau2012-03-051-1/+1
| | | | | | A message with a fixed-size array, such as uint8 uuid[16] will generate an invalid code, missing the __nelements variable. Make sure that variable is defined.
* server: more logging about certificates usedChristophe Fergeau2012-03-051-4/+10
| | | | | | | This commit adds some log messages indicating which certificates could be loaded (or not). Fixes rhbz#787678
* Add log for invalid/expired ticketsChristophe Fergeau2012-03-051-0/+5
| | | | | | | Currently, when a ticket has already expired, or is invalid, there is no qemu log to tell what went wrong. This commit adds such a log. Fixes rhbz#787669