diff --git a/minissdpd/ifacewatch.c b/minissdpd/ifacewatch.c index 2909636..61b0279 100644 --- a/minissdpd/ifacewatch.c +++ b/minissdpd/ifacewatch.c @@ -157,7 +157,7 @@ ProcessInterfaceWatch(int s, int s_ssdp, int s_ssdp6) { struct ifa_cacheinfo *cache_info; cache_info = RTA_DATA(rta); - snprintf(tmp, sizeof(tmp), "valid=%u prefered=%u", + snprintf(tmp, sizeof(tmp), "valid=%u preferred=%u", cache_info->ifa_valid, cache_info->ifa_prefered); } break; diff --git a/minissdpd/minissdpd.1 b/minissdpd/minissdpd.1 index 7336eea..e75837c 100644 --- a/minissdpd/minissdpd.1 +++ b/minissdpd/minissdpd.1 @@ -28,7 +28,7 @@ By default /var/run/minissdpd.pid is used. .TP .B \-i interface name or IP address of the interface used to listen to SSDP packets -comming on port 1900, multicast address 239.255.255.250. +coming on port 1900, multicast address 239.255.255.250. .SH "SEE ALSO" miniupnpd(1) miniupnpc(3) .SH BUGS diff --git a/minissdpd/minissdpd.c b/minissdpd/minissdpd.c index 8edabe2..a76f712 100644 --- a/minissdpd/minissdpd.c +++ b/minissdpd/minissdpd.c @@ -49,7 +49,7 @@ #define SET_MAX(max, x) if((x) > (max)) (max) = (x) -/* current request management stucture */ +/* current request management structure */ struct reqelem { int socket; int is_notify; /* has subscribed to notifications */ diff --git a/minissdpd/testcodelength.c b/minissdpd/testcodelength.c index 11892ab..1b102c6 100644 --- a/minissdpd/testcodelength.c +++ b/minissdpd/testcodelength.c @@ -26,6 +26,6 @@ int main(int argc, char * * argv) return 1; } } - printf("Test succesful\n"); + printf("Test successful\n"); return 0; } diff --git a/miniupnpc-async/miniupnpc-async.c b/miniupnpc-async/miniupnpc-async.c index 57cbefb..25caf63 100644 --- a/miniupnpc-async/miniupnpc-async.c +++ b/miniupnpc-async/miniupnpc-async.c @@ -984,7 +984,7 @@ int upnpc_process(upnpc_t * p) upnpc_device_t * d; /* 1) Envoyer les paquets de discovery SSDP -2) Recevoir et traiter les reponses +2) Recevoir et traiter les responses 3) recup les descriptions 4) tester les etats */ diff --git a/miniupnpc-libevent/miniupnpc-libevent.c b/miniupnpc-libevent/miniupnpc-libevent.c index 280cb51..460e5f2 100644 --- a/miniupnpc-libevent/miniupnpc-libevent.c +++ b/miniupnpc-libevent/miniupnpc-libevent.c @@ -65,7 +65,7 @@ #define debug_printf(...) (void)0 #endif -/* compare the begining of a string with a constant string */ +/* compare the beginning of a string with a constant string */ #define COMPARE(str, cstr) (0==memcmp(str, cstr, sizeof(cstr) - 1)) /* stuctures */ diff --git a/miniupnpc/Changelog.txt b/miniupnpc/Changelog.txt index 37562c6..a7fa97f 100644 --- a/miniupnpc/Changelog.txt +++ b/miniupnpc/Changelog.txt @@ -602,7 +602,7 @@ VERSION 1.0 : upnpc now displays external ip address with -s or -l 2007/04/11: - changed MINIUPNPC_URL_MAXSIZE to 128 to accomodate the "BT Voyager 210" + changed MINIUPNPC_URL_MAXSIZE to 128 to accommodate the "BT Voyager 210" 2007/03/19: cleanup in miniwget.c diff --git a/miniupnpc/man3/miniupnpc.3 b/miniupnpc/man3/miniupnpc.3 index 7b997d4..322171a 100644 --- a/miniupnpc/man3/miniupnpc.3 +++ b/miniupnpc/man3/miniupnpc.3 @@ -43,7 +43,7 @@ browse the list of device returned by upnpDiscover(), find a live UPnP internet gateway device and fill structures passed as arguments with data used for UPNP methods invokation. .IP "int UPNP_GetIGDFromUrl(const char * rootdescurl, struct UPNPUrls * urls, struct IGDdatas * data, char * lanaddr, int lanaddrlen);" -permit to bypass the upnpDiscover() call if the xml root description +permit one to bypass the upnpDiscover() call if the xml root description URL of the UPnP IGD is known. Fill structures passed as arguments with data used for UPNP methods invokation. diff --git a/miniupnpc/minihttptestserver.c b/miniupnpc/minihttptestserver.c index 50951db..f99025f 100644 --- a/miniupnpc/minihttptestserver.c +++ b/miniupnpc/minihttptestserver.c @@ -511,7 +511,7 @@ int main(int argc, char * * argv) { fprintf(stderr, "unknown command line switch '%s'\n", argv[i]); } } else { - fprintf(stderr, "unkown command line argument '%s'\n", argv[i]); + fprintf(stderr, "unknown command line argument '%s'\n", argv[i]); } } diff --git a/miniupnpc/minisoap.c b/miniupnpc/minisoap.c index 76225f4..9788589 100644 --- a/miniupnpc/minisoap.c +++ b/miniupnpc/minisoap.c @@ -55,7 +55,7 @@ httpWrite(int fd, const char * body, int bodysize, PRINT_SOCKET_ERROR("send"); } /* disable send on the socket */ - /* draytek routers dont seems to like that... */ + /* draytek routers don't seems to like that... */ #if 0 #ifdef _WIN32 if(shutdown(fd, SD_SEND)<0) { diff --git a/miniupnpc/miniupnpc.c b/miniupnpc/miniupnpc.c index 5eb9500..6a005cd 100644 --- a/miniupnpc/miniupnpc.c +++ b/miniupnpc/miniupnpc.c @@ -61,7 +61,7 @@ #include "upnpcommands.h" #include "connecthostport.h" -/* compare the begining of a string with a constant string */ +/* compare the beginning of a string with a constant string */ #define COMPARE(str, cstr) (0==memcmp(str, cstr, sizeof(cstr) - 1)) #ifndef MAXHOSTNAMELEN @@ -550,7 +550,7 @@ UPNPIGD_IsConnected(struct UPNPUrls * urls, struct IGDdatas * data) * 3 = an UPnP device has been found but was not recognized as an IGD * * In any positive non zero return case, the urls and data structures - * passed as parameters are set. Dont forget to call FreeUPNPUrls(urls) to + * passed as parameters are set. Don't forget to call FreeUPNPUrls(urls) to * free allocated memory. */ MINIUPNP_LIBSPEC int @@ -634,7 +634,7 @@ UPNP_GetValidIGD(struct UPNPDev * devlist, GetUPNPUrls(urls, data, dev->descURL, dev->scope_id); - /* in state 2 and 3 we dont test if device is connected ! */ + /* in state 2 and 3 we don't test if device is connected ! */ if(state >= 2) goto free_and_return; is_connected = UPNPIGD_IsConnected(urls, data); diff --git a/miniupnpc/miniupnpc.h b/miniupnpc/miniupnpc.h index 0b5b473..0a55610 100644 --- a/miniupnpc/miniupnpc.h +++ b/miniupnpc/miniupnpc.h @@ -23,7 +23,7 @@ #define MINIUPNPC_API_VERSION 16 /* Source port: - Using "1" as an alias for 1900 for backwards compatability + Using "1" as an alias for 1900 for backwards compatibility (presuming one would have used that for the "sameport" parameter) */ #define UPNP_LOCAL_PORT_ANY 0 #define UPNP_LOCAL_PORT_SAME 1 diff --git a/miniupnpc/pymoduletest.py b/miniupnpc/pymoduletest.py index 9fddd9c..79cc005 100755 --- a/miniupnpc/pymoduletest.py +++ b/miniupnpc/pymoduletest.py @@ -47,7 +47,7 @@ print ' lanaddr', u.lanaddr print ' multicastif', u.multicastif print ' minissdpdsocket', u.minissdpdsocket #u.minissdpdsocket = '../minissdpd/minissdpd.sock' -# discovery process, it usualy takes several seconds (2 seconds or more) +# discovery process, it usually takes several seconds (2 seconds or more) print 'Discovering... delay=%ums' % u.discoverdelay print u.discover(), 'device(s) detected' # select an igd diff --git a/miniupnpc/pymoduletest3.py b/miniupnpc/pymoduletest3.py index d4cf1e2..1fcab4e 100755 --- a/miniupnpc/pymoduletest3.py +++ b/miniupnpc/pymoduletest3.py @@ -17,7 +17,7 @@ print(' multicastif', u.multicastif) print(' minissdpdsocket', u.minissdpdsocket) u.discoverdelay = 200; #u.minissdpdsocket = '../minissdpd/minissdpd.sock' -# discovery process, it usualy takes several seconds (2 seconds or more) +# discovery process, it usually takes several seconds (2 seconds or more) print('Discovering... delay=%ums' % u.discoverdelay) print(u.discover(), 'device(s) detected') # select an igd diff --git a/miniupnpc/testminiwget.c b/miniupnpc/testminiwget.c index 8465b4d..09422ad 100644 --- a/miniupnpc/testminiwget.c +++ b/miniupnpc/testminiwget.c @@ -11,7 +11,7 @@ /** * This program uses the miniwget / miniwget_getaddr function - * from miniwget.c in order to retreive a web ressource using + * from miniwget.c in order to retrieve a web ressource using * a GET HTTP method, and store it in a file. */ int main(int argc, char * * argv) diff --git a/miniupnpc/testminiwget.sh b/miniupnpc/testminiwget.sh index c8a0ff8..80973c4 100755 --- a/miniupnpc/testminiwget.sh +++ b/miniupnpc/testminiwget.sh @@ -8,7 +8,7 @@ # # This test program : # 1 - launches a local HTTP server (minihttptestserver) -# 2 - uses testminiwget to retreive data from this server +# 2 - uses testminiwget to retrieve data from this server # 3 - compares served and received data # 4 - kills the local HTTP server and exits # diff --git a/miniupnpd/Changelog.txt b/miniupnpd/Changelog.txt index 2870bb5..3dd7873 100644 --- a/miniupnpd/Changelog.txt +++ b/miniupnpd/Changelog.txt @@ -93,7 +93,7 @@ VERSION 2.0 : released on 2016/04/19 2015/09/22: cleanup UPNP_VERSION macro / add UPNP_VERSION_MAJOR, UPNP_VERSION_MINOR - Dont use packed structs anymore to read/write PCP messages + Don't use packed structs anymore to read/write PCP messages 2015/09/15: use name server from query in SOAP responses @@ -316,7 +316,7 @@ VERSION 1.8 : released on 2013/02/06 2013/02/06: Check source address of incomining HTTP connections and SSDP - packets in order to filter out WAN SSDP and HTTP trafic. + packets in order to filter out WAN SSDP and HTTP traffic. Implement get_src_for_route_to() for *BSD fix 2 potential memory leaks in GetListOfPortMappings() @@ -601,7 +601,7 @@ VERSION 1.6 : released the 2011/07/25 GET /DP.xml is now available. The description has to be completed. 2011/05/19: - Add getconnstatus.c/.h. Dont always have ConnectionStatus to "Connected" + Add getconnstatus.c/.h. Don't always have ConnectionStatus to "Connected" Events for WANIPv6FirewallControll 2011/05/16: diff --git a/miniupnpd/INSTALL b/miniupnpd/INSTALL index 7b3b976..e1ac4d0 100644 --- a/miniupnpd/INSTALL +++ b/miniupnpd/INSTALL @@ -25,7 +25,7 @@ To Build and Install : lines to /etc/pf.conf : pass out on $int_if from any to 239.0.0.0/8 keep state pass in on $int_if from any to 239.0.0.0/8 keep state -- dont forget to " pfctl -f /etc/pf.conf " +- don't forget to " pfctl -f /etc/pf.conf " - you can check your modifications are taken into account with "pfctl -s nat" and "pfctl -s rule". Look for the "rdr-anchor miniupnpd" (if applicable) and/or "anchor miniupnpd" lines. @@ -75,7 +75,7 @@ To Build and install : from http://netfilter.org - edit and run netfilter/iptables_init.sh shell script. This script must allways be run before the daemon - to set up intial rules and chains. + to set up initial rules and chains. - Build and edit the config.h file > make -f Makefile.linux config.h > vi config.h @@ -90,8 +90,8 @@ To Build and install : - anytime, you can use the netfilter/iptables_flush.sh script to flush all rules added by the daemon. - after killing the daemon, you can get back to - iptables initial state by runing the netfilter/iptables_removeall.sh - script. Don't forget to edit the script to your convinience. + iptables initial state by running the netfilter/iptables_removeall.sh + script. Don't forget to edit the script to your convenience. NOTE: a /etc/init.d/miniupnpd script will be installed. If it suits you, you can use is with start, stop or restart argument. diff --git a/miniupnpd/genconfig.sh b/miniupnpd/genconfig.sh index 27d1362..ebc597b 100755 --- a/miniupnpd/genconfig.sh +++ b/miniupnpd/genconfig.sh @@ -619,7 +619,7 @@ cat >> ${CONFIGFILE} <ifa_valid, cache_info->ifa_prefered); } break; diff --git a/miniupnpd/minissdp.c b/miniupnpd/minissdp.c index a9e00cf..f979bf4 100644 --- a/miniupnpd/minissdp.c +++ b/miniupnpd/minissdp.c @@ -190,7 +190,7 @@ OpenAndConfSSDPReceiveSocket(int ipv6) struct sockaddr_in * saddr = (struct sockaddr_in *)&sockname; saddr->sin_family = AF_INET; saddr->sin_port = htons(SSDP_PORT); - /* NOTE : it seems it doesnt work when binding on the specific address */ + /* NOTE : it seems it doesn't work when binding on the specific address */ /*saddr->sin_addr.s_addr = inet_addr(UPNP_MCAST_ADDR);*/ saddr->sin_addr.s_addr = htonl(INADDR_ANY); /*saddr->sin_addr.s_addr = inet_addr(ifaddr);*/ diff --git a/miniupnpd/pcpserver.c b/miniupnpd/pcpserver.c index 0c34bca..0c96eea 100644 --- a/miniupnpd/pcpserver.c +++ b/miniupnpd/pcpserver.c @@ -35,7 +35,7 @@ POSSIBILITY OF SUCH DAMAGE. - IPv6 is always firewalled (this may need some work, NAT6* do exist) - we make the judgement based on (in order, picking first one available): - - third party adress + - third party address - internal client address TODO : handle NAT46, NAT64, NPT66. In addition, beyond FW/NAT diff --git a/miniupnpd/testasyncsendto.c b/miniupnpd/testasyncsendto.c index 7006bf2..32aa5c6 100644 --- a/miniupnpd/testasyncsendto.c +++ b/miniupnpd/testasyncsendto.c @@ -80,7 +80,7 @@ int test(void) if(now.tv_sec > next_send.tv_sec || (now.tv_sec == next_send.tv_sec && now.tv_usec >= next_send.tv_usec)) { if(i > 0) { - /* dont wait */ + /* don't wait */ timeout.tv_sec = 0; } else { /* wait 10sec :) */ diff --git a/miniupnpd/upnpglobalvars.h b/miniupnpd/upnpglobalvars.h index 7468ddb..f7cdfba 100644 --- a/miniupnpd/upnpglobalvars.h +++ b/miniupnpd/upnpglobalvars.h @@ -14,7 +14,7 @@ #include "miniupnpdtypes.h" #include "config.h" -/* name of the network interface used to acces internet */ +/* name of the network interface used to access internet */ extern const char * ext_if_name; /* file to store all leases */ diff --git a/miniupnpd/upnphttp.c b/miniupnpd/upnphttp.c index 4c12998..b33d8e5 100644 --- a/miniupnpd/upnphttp.c +++ b/miniupnpd/upnphttp.c @@ -762,7 +762,7 @@ ProcessHttpQuery_upnphttp(struct upnphttp * h) p = h->req_buf; if(!p) return; - /* note : checking (*p != '\r') is enough to avoid runing off the + /* note : checking (*p != '\r') is enough to avoid running off the * end of the buffer, because h->req_buf is guaranteed to contain * the \r\n\r\n character sequence */ for(i = 0; i<15 && *p != ' ' && *p != '\r'; i++) @@ -1216,7 +1216,7 @@ SendResp_upnphttp(struct upnphttp * h) } else { #endif if(errno == EINTR) - continue; /* try again immediatly */ + continue; /* try again immediately */ if(errno == EAGAIN || errno == EWOULDBLOCK) { /* try again later */ @@ -1278,7 +1278,7 @@ SendRespAndClose_upnphttp(struct upnphttp * h) } else { #endif if(errno == EINTR) - continue; /* try again immediatly */ + continue; /* try again immediately */ if(errno == EAGAIN || errno == EWOULDBLOCK) { /* try again later */ diff --git a/miniupnpd/upnpredirect.c b/miniupnpd/upnpredirect.c index 1284ebf..a5401ad 100644 --- a/miniupnpd/upnpredirect.c +++ b/miniupnpd/upnpredirect.c @@ -277,7 +277,7 @@ int reload_from_lease_file() #endif /* upnp_redirect() - * calls OS/fw dependant implementation of the redirection. + * calls OS/fw dependent implementation of the redirection. * protocol should be the string "TCP" or "UDP" * returns: 0 on success * -1 failed to redirect @@ -425,7 +425,7 @@ upnp_redirect_internal(const char * rhost, unsigned short eport, -/* Firewall independant code which call the FW dependant code. */ +/* Firewall independent code which call the FW dependent code. */ int upnp_get_redirection_infos(unsigned short eport, const char * protocol, unsigned short * iport, diff --git a/miniupnpd/upnpredirect.h b/miniupnpd/upnpredirect.h index 9870e44..c264724 100644 --- a/miniupnpd/upnpredirect.h +++ b/miniupnpd/upnpredirect.h @@ -18,7 +18,7 @@ int reload_from_lease_file(void); #endif /* upnp_redirect() - * calls OS/fw dependant implementation of the redirection. + * calls OS/fw dependent implementation of the redirection. * protocol should be the string "TCP" or "UDP" * returns: 0 on success * -1 failed to redirect diff --git a/miniupnpd/upnpsoap.c b/miniupnpd/upnpsoap.c index 315cd07..532ce89 100644 --- a/miniupnpd/upnpsoap.c +++ b/miniupnpd/upnpsoap.c @@ -1370,7 +1370,7 @@ QueryStateVariable(struct upnphttp * h, const char * action, const char * ns) BuildSendAndCloseSoapResp(h, body, bodylen); } #if 0 - /* not usefull */ + /* not useful */ else if(strcmp(var_name, "ConnectionType") == 0) { bodylen = snprintf(body, sizeof(body), resp, "IP_Routed");