1 --- libupnp/upnp/Makefile.am 2008-02-10 02:55:34.000000000 +0100
2 +++ libupnp.new/upnp/Makefile.am 2010-08-24 18:40:58.000000000 +0200
4 libupnp_la_SOURCES += \
11 diff -ruN libupnp/upnp/src/genlib/miniserver/miniserver.c libupnp.new/upnp/src/genlib/miniserver/miniserver.c
12 --- libupnp/upnp/src/genlib/miniserver/miniserver.c 2008-03-21 00:07:50.000000000 +0100
13 +++ libupnp.new/upnp/src/genlib/miniserver/miniserver.c 2010-08-24 18:34:44.000000000 +0200
16 ret = select( maxMiniSock, &rdSet, NULL, &expSet, NULL );
18 - strerror_r(errno, errorBuffer, ERROR_BUFFER_LEN);
19 UpnpPrintf( UPNP_CRITICAL, SSDP, __FILE__, __LINE__,
20 - "Error in select(): %s\n", errorBuffer );
21 + "Error in select(): %i\n", errno );
22 /* Avoid 100% CPU in case of repeated error in select() */
26 connectHnd = accept( miniServSock,
27 ( struct sockaddr * )&clientAddr, &clientLen );
28 if( connectHnd == -1 ) {
29 - strerror_r(errno, errorBuffer, ERROR_BUFFER_LEN);
30 UpnpPrintf( UPNP_INFO, MSERV, __FILE__, __LINE__,
31 - "miniserver: Error in accept(): %s\n", errorBuffer );
32 + "miniserver: Error in accept(): %i\n", errno );
35 schedule_request_job( connectHnd, &clientAddr );
39 if ( sockError == -1 ) {
40 - strerror_r(errno, errorBuffer, ERROR_BUFFER_LEN);
41 UpnpPrintf( UPNP_INFO, MSERV, __FILE__, __LINE__,
42 - "mserv start: Error in bind(): %s\n", errorBuffer );
43 + "mserv start: Error in bind(): %i\n", errno );
44 shutdown( listenfd, SD_BOTH );
45 UpnpCloseSocket( listenfd );
49 success = listen( listenfd, SOMAXCONN );
50 if ( success == -1 ) {
51 - strerror_r(errno, errorBuffer, ERROR_BUFFER_LEN);
52 UpnpPrintf( UPNP_INFO, MSERV, __FILE__, __LINE__,
53 - "mserv start: Error in listen(): %s\n", errorBuffer );
54 + "mserv start: Error in listen(): %i\n", errno );
55 shutdown( listenfd, SD_BOTH );
56 UpnpCloseSocket( listenfd );
60 miniServerStopSock = socket( AF_INET, SOCK_DGRAM, 0 );
61 if ( miniServerStopSock == -1 ) {
62 - strerror_r(errno, errorBuffer, ERROR_BUFFER_LEN);
63 UpnpPrintf( UPNP_CRITICAL, MSERV, __FILE__, __LINE__,
64 - "Error in socket(): %s\n", errorBuffer );
65 + "Error in socket(): %i\n", errno );
66 shutdown( listenfd, SD_BOTH );
67 UpnpCloseSocket( listenfd );
71 sock = socket( AF_INET, SOCK_DGRAM, 0 );
73 - strerror_r(errno, errorBuffer, ERROR_BUFFER_LEN);
74 UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
75 - "SSDP_SERVER: StopSSDPServer: Error in socket() %s\n", errorBuffer );
76 + "SSDP_SERVER: StopSSDPServer: Error in socket() %i\n", errno );
80 diff -ruN libupnp/upnp/src/inet_pton.c libupnp.new/upnp/src/inet_pton.c
81 --- libupnp/upnp/src/inet_pton.c 2008-02-10 02:55:34.000000000 +0100
82 +++ libupnp.new/upnp/src/inet_pton.c 2010-08-24 18:41:08.000000000 +0200
84 * sizeof(int) < 4. sizeof(int) 4 is fine; all the world's not a VAX.
89 * inet_ntop4(src, dst, size)
90 * format an IPv4 address
96 \ Pas de fin de ligne à la fin du fichier.
98 diff -ruN libupnp/upnp/src/ssdp/ssdp_ctrlpt.c libupnp.new/upnp/src/ssdp/ssdp_ctrlpt.c
99 --- libupnp/upnp/src/ssdp/ssdp_ctrlpt.c 2008-03-22 17:36:03.000000000 +0100
100 +++ libupnp.new/upnp/src/ssdp/ssdp_ctrlpt.c 2010-08-24 18:32:47.000000000 +0200
103 ret = select( gSsdpReqSocket + 1, NULL, &wrSet, NULL, NULL );
105 - strerror_r(errno, errorBuffer, ERROR_BUFFER_LEN);
106 UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
107 - "SSDP_LIB: Error in select(): %s\n",
109 + "SSDP_LIB: Error in select(): %i\n",
111 shutdown( gSsdpReqSocket, SD_BOTH );
112 UpnpCloseSocket( gSsdpReqSocket );
114 diff -ruN libupnp/upnp/src/ssdp/ssdp_device.c libupnp.new/upnp/src/ssdp/ssdp_device.c
115 --- libupnp/upnp/src/ssdp/ssdp_device.c 2008-03-21 00:27:26.000000000 +0100
116 +++ libupnp.new/upnp/src/ssdp/ssdp_device.c 2010-08-24 18:36:22.000000000 +0200
119 ReplySock = socket( AF_INET, SOCK_DGRAM, 0 );
120 if ( ReplySock == -1 ) {
121 - strerror_r(errno, errorBuffer, ERROR_BUFFER_LEN);
122 UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
123 "SSDP_LIB: New Request Handler:"
124 - "Error in socket(): %s\n", errorBuffer );
125 + "Error in socket(): %i\n", errno );
127 return UPNP_E_OUTOF_SOCKET;
129 diff -ruN libupnp/upnp/src/ssdp/ssdp_server.c libupnp.new/upnp/src/ssdp/ssdp_server.c
130 --- libupnp/upnp/src/ssdp/ssdp_server.c 2008-03-21 00:08:25.000000000 +0100
131 +++ libupnp.new/upnp/src/ssdp/ssdp_server.c 2010-08-24 18:30:28.000000000 +0200
134 ssdpReqSock = socket( AF_INET, SOCK_DGRAM, 0 );
135 if ( ssdpReqSock == -1 ) {
136 - strerror_r(errno, errorBuffer, ERROR_BUFFER_LEN);
137 UpnpPrintf( UPNP_CRITICAL, SSDP, __FILE__, __LINE__,
138 - "Error in socket(): %s\n", errorBuffer );
139 + "Error in socket(): %i\n", errno );
141 return UPNP_E_OUTOF_SOCKET;
145 ssdpSock = socket( AF_INET, SOCK_DGRAM, 0 );
146 if ( ssdpSock == -1 ) {
147 - strerror_r(errno, errorBuffer, ERROR_BUFFER_LEN);
148 UpnpPrintf( UPNP_CRITICAL, SSDP, __FILE__, __LINE__,
149 - "Error in socket(): %s\n", errorBuffer );
150 + "Error in socket(): %i\n", errno );
151 CLIENTONLY( shutdown( ssdpReqSock, SD_BOTH ); )
152 CLIENTONLY( UpnpCloseSocket( ssdpReqSock ); )
155 ret = setsockopt( ssdpSock, SOL_SOCKET, SO_REUSEADDR,
156 (char *)&onOff, sizeof(onOff) );
158 - strerror_r(errno, errorBuffer, ERROR_BUFFER_LEN);
159 UpnpPrintf( UPNP_CRITICAL, SSDP, __FILE__, __LINE__,
160 - "Error in setsockopt() SO_REUSEADDR: %s\n", errorBuffer );
161 + "Error in setsockopt() SO_REUSEADDR: %i\n", errno );
162 CLIENTONLY( shutdown( ssdpReqSock, SD_BOTH ); )
163 CLIENTONLY( UpnpCloseSocket( ssdpReqSock ); )
164 shutdown( ssdpSock, SD_BOTH );
166 ret = setsockopt( ssdpSock, SOL_SOCKET, SO_REUSEPORT,
167 (char *)&onOff, sizeof (onOff) );
169 - strerror_r(errno, errorBuffer, ERROR_BUFFER_LEN);
170 UpnpPrintf( UPNP_CRITICAL, SSDP, __FILE__, __LINE__,
171 - "Error in setsockopt() SO_REUSEPORT: %s\n", errorBuffer );
172 + "Error in setsockopt() SO_REUSEPORT: %i\n", errno );
173 CLIENTONLY( shutdown( ssdpReqSock, SD_BOTH ); )
174 CLIENTONLY( UpnpCloseSocket( ssdpReqSock ); )
175 shutdown( ssdpSock, SD_BOTH );
177 ssdpAddr.sin_port = htons( SSDP_PORT );
178 ret = bind( ssdpSock, (struct sockaddr *)&ssdpAddr, sizeof (ssdpAddr) );
180 - strerror_r(errno, errorBuffer, ERROR_BUFFER_LEN);
181 UpnpPrintf( UPNP_CRITICAL, SSDP, __FILE__, __LINE__,
182 - "Error in bind(), addr=0x%08X, port=%d: %s\n",
183 - INADDR_ANY, SSDP_PORT, errorBuffer );
184 + "Error in bind(), addr=0x%08X, port=%d: %i\n",
185 + INADDR_ANY, SSDP_PORT, errno );
186 shutdown( ssdpSock, SD_BOTH );
187 UpnpCloseSocket( ssdpSock );
188 CLIENTONLY( shutdown( ssdpReqSock, SD_BOTH ); )
190 ret = setsockopt( ssdpSock, IPPROTO_IP, IP_ADD_MEMBERSHIP,
191 (char *)&ssdpMcastAddr, sizeof (struct ip_mreq) );
193 - strerror_r(errno, errorBuffer, ERROR_BUFFER_LEN);
194 UpnpPrintf( UPNP_CRITICAL, SSDP, __FILE__, __LINE__,
195 - "Error in setsockopt() IP_ADD_MEMBERSHIP (join multicast group): %s\n",
197 + "Error in setsockopt() IP_ADD_MEMBERSHIP (join multicast group): %i\n",
199 shutdown( ssdpSock, SD_BOTH );
200 CLIENTONLY( shutdown( ssdpReqSock, SD_BOTH ); )
201 UpnpCloseSocket( ssdpSock );
203 ret = setsockopt(ssdpSock, IPPROTO_IP, IP_MULTICAST_IF,
204 (char *)&addr, sizeof addr);
206 - strerror_r(errno, errorBuffer, ERROR_BUFFER_LEN);
207 UpnpPrintf( UPNP_INFO, SSDP, __FILE__, __LINE__,
208 - "Error in setsockopt() IP_MULTICAST_IF (set multicast interface): %s\n",
210 + "Error in setsockopt() IP_MULTICAST_IF (set multicast interface): %i\n",
212 /* This is probably not a critical error, so let's continue. */
216 ret = setsockopt( ssdpSock, SOL_SOCKET, SO_BROADCAST,
217 (char *)&option, sizeof (option) );
219 - strerror_r(errno, errorBuffer, ERROR_BUFFER_LEN);
220 UpnpPrintf( UPNP_CRITICAL, SSDP, __FILE__, __LINE__,
221 - "Error in setsockopt() SO_BROADCAST (set broadcast): %s\n",
223 + "Error in setsockopt() SO_BROADCAST (set broadcast): %i\n",
225 shutdown( ssdpSock, SD_BOTH );
226 CLIENTONLY( shutdown( ssdpReqSock, SD_BOTH ); )
227 UpnpCloseSocket( ssdpSock );