diff options
| author | 2009-04-13 08:48:00 -0700 | |
|---|---|---|
| committer | 2009-04-13 08:48:00 -0700 | |
| commit | 6671ca3d6de6a1fd27853e3b1ce7a81d568703f0 (patch) | |
| tree | 735c5ace7ed57cd4e19f2fde423b22e6104eaa98 /src/usbmux.c | |
| parent | bd31783d7fde0b5bd101f4a3f97ca1aca2aa6fab (diff) | |
| parent | 288929f45cb2641690879b52ec514097995cd41a (diff) | |
| download | libimobiledevice-6671ca3d6de6a1fd27853e3b1ce7a81d568703f0.tar.gz libimobiledevice-6671ca3d6de6a1fd27853e3b1ce7a81d568703f0.tar.bz2 | |
Merged in Jonathan's libplist libiphone. [#2 state:resolved]
Diffstat (limited to 'src/usbmux.c')
| -rw-r--r-- | src/usbmux.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/usbmux.c b/src/usbmux.c index d8e6b44..22ce588 100644 --- a/src/usbmux.c +++ b/src/usbmux.c | |||
| @@ -38,7 +38,7 @@ static int clients = 0; | |||
| 38 | * | 38 | * |
| 39 | * @return A USBMux packet | 39 | * @return A USBMux packet |
| 40 | */ | 40 | */ |
| 41 | usbmux_tcp_header *new_mux_packet(uint16 s_port, uint16 d_port) | 41 | usbmux_tcp_header *new_mux_packet(uint16_t s_port, uint16_t d_port) |
| 42 | { | 42 | { |
| 43 | usbmux_tcp_header *conn = (usbmux_tcp_header *) malloc(sizeof(usbmux_tcp_header)); | 43 | usbmux_tcp_header *conn = (usbmux_tcp_header *) malloc(sizeof(usbmux_tcp_header)); |
| 44 | conn->type = htonl(6); | 44 | conn->type = htonl(6); |
| @@ -314,6 +314,7 @@ iphone_error_t iphone_mux_recv(iphone_umux_client_t client, char *data, uint32_t | |||
| 314 | } else { | 314 | } else { |
| 315 | memcpy(data, client->recv_buffer, client->r_len); | 315 | memcpy(data, client->recv_buffer, client->r_len); |
| 316 | free(client->recv_buffer); // don't need to deal with anymore, but... | 316 | free(client->recv_buffer); // don't need to deal with anymore, but... |
| 317 | client->recv_buffer = NULL; | ||
| 317 | offset = client->r_len; // see #2b, above | 318 | offset = client->r_len; // see #2b, above |
| 318 | client->r_len = 0; | 319 | client->r_len = 0; |
| 319 | } | 320 | } |
