mirror of
				https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
				synced 2025-11-03 09:01:50 -05:00 
			
		
		
		
	* set IPV6_V6ONLY for IPv6 sockets, to avoid warning when both ipv6 and the ipv4 sockets try to bind to the same port
* enable SO_REUSEADDR only on platforms that support it git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@643 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
		
							parent
							
								
									ac3d11f833
								
							
						
					
					
						commit
						73035a82a7
					
				
					 1 changed files with 12 additions and 3 deletions
				
			
		| 
						 | 
					@ -231,8 +231,10 @@ pa_socket_server* pa_socket_server_new_ipv4(pa_mainloop_api *m, uint32_t address
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    pa_fd_set_cloexec(fd, 1);
 | 
					    pa_fd_set_cloexec(fd, 1);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (void*)&on, sizeof(on)) < 0)
 | 
					#ifdef SO_REUSEADDR
 | 
				
			||||||
 | 
					    if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) < 0)
 | 
				
			||||||
        pa_log(__FILE__": setsockopt(): %s", strerror(errno));
 | 
					        pa_log(__FILE__": setsockopt(): %s", strerror(errno));
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    pa_socket_tcp_low_delay(fd);
 | 
					    pa_socket_tcp_low_delay(fd);
 | 
				
			||||||
    
 | 
					    
 | 
				
			||||||
| 
						 | 
					@ -280,8 +282,15 @@ pa_socket_server* pa_socket_server_new_ipv6(pa_mainloop_api *m, const uint8_t ad
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    pa_fd_set_cloexec(fd, 1);
 | 
					    pa_fd_set_cloexec(fd, 1);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (void*)&on, sizeof(on)) < 0)
 | 
					#ifdef IPV6_V6ONLY
 | 
				
			||||||
        pa_log(__FILE__": setsockopt(): %s", strerror(errno));
 | 
					    if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof(on)) < 0)
 | 
				
			||||||
 | 
					        pa_log(__FILE__": setsockopt(IPPROTO_IPV6, IPV6_V6ONLY): %s", strerror(errno));
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#ifdef SO_REUSEADDR
 | 
				
			||||||
 | 
					    if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) < 0)
 | 
				
			||||||
 | 
					        pa_log(__FILE__": setsockopt(SOL_SOCKET, SO_REUSEADDR, 1): %s", strerror(errno));
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    pa_socket_tcp_low_delay(fd);
 | 
					    pa_socket_tcp_low_delay(fd);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue