diff -Nru freshplayerplugin-0.2.4+git20150504~webupd8~trusty0/3rdparty/CMakeLists.txt freshplayerplugin-0.2.4+git20150505~webupd8~trusty0/3rdparty/CMakeLists.txt --- freshplayerplugin-0.2.4+git20150504~webupd8~trusty0/3rdparty/CMakeLists.txt 2015-03-17 11:58:53.000000000 +0000 +++ freshplayerplugin-0.2.4+git20150505~webupd8~trusty0/3rdparty/CMakeLists.txt 2015-05-05 08:38:19.000000000 +0000 @@ -1 +1 @@ -add_library(parson-obj OBJECT parson/parson.c) +add_subdirectory(parson) diff -Nru freshplayerplugin-0.2.4+git20150504~webupd8~trusty0/3rdparty/parson/CMakeLists.txt freshplayerplugin-0.2.4+git20150505~webupd8~trusty0/3rdparty/parson/CMakeLists.txt --- freshplayerplugin-0.2.4+git20150504~webupd8~trusty0/3rdparty/parson/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ freshplayerplugin-0.2.4+git20150505~webupd8~trusty0/3rdparty/parson/CMakeLists.txt 2015-05-05 08:38:19.000000000 +0000 @@ -0,0 +1 @@ +add_library(parson-obj OBJECT parson.c) diff -Nru freshplayerplugin-0.2.4+git20150504~webupd8~trusty0/debian/changelog freshplayerplugin-0.2.4+git20150505~webupd8~trusty0/debian/changelog --- freshplayerplugin-0.2.4+git20150504~webupd8~trusty0/debian/changelog 2015-05-04 09:25:00.000000000 +0000 +++ freshplayerplugin-0.2.4+git20150505~webupd8~trusty0/debian/changelog 2015-05-05 08:39:09.000000000 +0000 @@ -1,4 +1,10 @@ -freshplayerplugin (0.2.4+git20150504~webupd8~trusty0) trusty; urgency=medium +freshplayerplugin (0.2.4+git20150505~webupd8~trusty0) trusty; urgency=medium + + * new git pull + + -- Alin Andrei Tue, 05 May 2015 11:38:19 +0200 + +freshplayerplugin (0.2.4+git20150504~webupd8~precise0) precise; urgency=medium * new git pull diff -Nru freshplayerplugin-0.2.4+git20150504~webupd8~trusty0/src/async_network.c freshplayerplugin-0.2.4+git20150505~webupd8~trusty0/src/async_network.c --- freshplayerplugin-0.2.4+git20150504~webupd8~trusty0/src/async_network.c 2015-05-04 09:23:39.000000000 +0000 +++ freshplayerplugin-0.2.4+git20150505~webupd8~trusty0/src/async_network.c 2015-05-05 08:38:19.000000000 +0000 @@ -422,7 +422,7 @@ return; } - socklen_t len = 0; + socklen_t len = sizeof(us->addr_from.data); int32_t retval = recvfrom(sock, task->buffer, task->bufsize, 0, (struct sockaddr *)us->addr_from.data, &len); us->addr_from.size = len; @@ -496,7 +496,7 @@ } // need to wait - struct event *ev = event_new(event_b, us->sock, EV_READ, handle_udp_send_stage2, task); + struct event *ev = event_new(event_b, us->sock, EV_WRITE, handle_udp_send_stage2, task); add_event_mapping(task, ev); event_add(ev, NULL); } @@ -531,7 +531,7 @@ for (int k = 0; k < count; k ++) { struct sockaddr_in sai = { .sin_family = AF_INET, - .sin_port = task->port, + .sin_port = htons(task->port), }; memcpy(&sai.sin_addr, &ipv4_addrs[k], sizeof(struct in_addr)); @@ -548,7 +548,7 @@ for (int k = 0; k < count; k ++) { struct sockaddr_in6 sai6 = { .sin6_family = AF_INET6, - .sin6_port = task->port, + .sin6_port = htons(task->port), }; memcpy(&sai6.sin6_addr, &ipv6_addrs[k], sizeof(struct in6_addr)); diff -Nru freshplayerplugin-0.2.4+git20150504~webupd8~trusty0/src/ppb_flash_fullscreen.c freshplayerplugin-0.2.4+git20150505~webupd8~trusty0/src/ppb_flash_fullscreen.c --- freshplayerplugin-0.2.4+git20150504~webupd8~trusty0/src/ppb_flash_fullscreen.c 2015-05-04 09:23:39.000000000 +0000 +++ freshplayerplugin-0.2.4+git20150505~webupd8~trusty0/src/ppb_flash_fullscreen.c 2015-05-05 08:38:19.000000000 +0000 @@ -261,6 +261,8 @@ pthread_mutex_lock(&display.lock); pp_i->is_fullscreen = 1; + pp_i->fs_width = wnd_size; + pp_i->fs_height = wnd_size; pthread_mutex_unlock(&display.lock); while (1) { @@ -282,23 +284,22 @@ break; case ConfigureNotify: - // ignore ConfigureNotify events for (wnd_size x wnd_size) - if (ev.xconfigure.width != wnd_size || ev.xconfigure.height != wnd_size) { - pthread_mutex_lock(&display.lock); - pp_i->fs_width = ev.xconfigure.width; - pp_i->fs_height = ev.xconfigure.height; - pthread_mutex_unlock(&display.lock); - ppb_core_call_on_main_thread2(0, PP_MakeCCB(update_instance_view_comt, pp_i), - PP_OK, __func__); - pthread_barrier_wait(&cross_thread_call_barrier); - } - handled = 1; - break; - case ReparentNotify: case MapNotify: handled = 1; break; + + case Expose: + pthread_mutex_lock(&display.lock); + pp_i->fs_width = ev.xexpose.width; + pp_i->fs_height = ev.xexpose.height; + pthread_mutex_unlock(&display.lock); + + ppb_core_call_on_main_thread2(0, PP_MakeCCB(update_instance_view_comt, pp_i), + PP_OK, __func__); + pthread_barrier_wait(&cross_thread_call_barrier); + handled = 0; + break; } ev.xany.display = display.x; diff -Nru freshplayerplugin-0.2.4+git20150504~webupd8~trusty0/src/ppb_net_address.c freshplayerplugin-0.2.4+git20150505~webupd8~trusty0/src/ppb_net_address.c --- freshplayerplugin-0.2.4+git20150504~webupd8~trusty0/src/ppb_net_address.c 2015-05-04 09:23:39.000000000 +0000 +++ freshplayerplugin-0.2.4+git20150505~webupd8~trusty0/src/ppb_net_address.c 2015-05-05 08:38:19.000000000 +0000 @@ -170,7 +170,7 @@ ppb_net_address_create_from_ipv4_address(const uint8_t ip[4], uint16_t port, struct PP_NetAddress_Private *addr_out) { - struct sockaddr_in sai = { .sin_port = port }; + struct sockaddr_in sai = { .sin_port = htons(port) }; memcpy(&sai.sin_addr, ip, sizeof(sai.sin_addr)); memset(addr_out, 0, sizeof(struct PP_NetAddress_Private)); @@ -183,7 +183,7 @@ ppb_net_address_create_from_ipv6_address(const uint8_t ip[16], uint32_t scope_id, uint16_t port, struct PP_NetAddress_Private *addr_out) { - struct sockaddr_in6 sai6 = { .sin6_port = port, .sin6_scope_id = scope_id }; + struct sockaddr_in6 sai6 = { .sin6_port = htons(port), .sin6_scope_id = htonl(scope_id) }; memcpy(&sai6.sin6_addr, ip, sizeof(sai6.sin6_addr)); memset(addr_out, 0, sizeof(struct PP_NetAddress_Private)); @@ -277,7 +277,8 @@ trace_ppb_net_address_create_from_ipv4_address(const uint8_t ip[4], uint16_t port, struct PP_NetAddress_Private *addr_out) { - trace_info("[PPB] {full} %s\n", __func__+6); + trace_info("[PPB] {full} %s ip=%u.%u.%u.%u, port=%u\n", __func__+6, ip[0], ip[1], ip[2], ip[3], + port); return ppb_net_address_create_from_ipv4_address(ip, port, addr_out); } @@ -287,7 +288,10 @@ uint16_t port, struct PP_NetAddress_Private *addr_out) { - trace_info("[PPB] {full} %s\n", __func__+6); + trace_info("[PPB] {full} %s ip=[%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:" + "%02x%02x], scope_id=%u, port=%u\n", __func__+6, ip[0], ip[1], ip[2], ip[3], ip[4], + ip[5], ip[6], ip[7], ip[8], ip[9], ip[10], ip[11], ip[12], ip[13], ip[14], ip[15], + scope_id, port); return ppb_net_address_create_from_ipv6_address(ip, scope_id, port, addr_out); }