Author: biurrun Date: Fri Nov 27 14:56:42 2009 New Revision: 1870 Log: Rename PORT definition to PAIRING_PORT. The former is much too generic. Modified: trunk/pairing/accept.c trunk/pairing/common.h trunk/pairing/send.c Modified: trunk/pairing/accept.c ============================================================================== --- trunk/pairing/accept.c Fri Nov 27 14:52:59 2009 (r1869) +++ trunk/pairing/accept.c Fri Nov 27 14:56:42 2009 (r1870) @@ -51,7 +51,7 @@ // Create an IPv6 socket on which to listen address.sin6_family = AF_INET6; address.sin6_addr = in6addr_any; - address.sin6_port = htons(PORT); + address.sin6_port = htons(PAIRING_PORT); DEBUG_MED("Parameters set."); @@ -62,7 +62,7 @@ return 0; } else - DEBUG_MED("Bound to port %d", PORT); + DEBUG_MED("Bound to port %d", PAIRING_PORT); return 1; } Modified: trunk/pairing/common.h ============================================================================== --- trunk/pairing/common.h Fri Nov 27 14:52:59 2009 (r1869) +++ trunk/pairing/common.h Fri Nov 27 14:56:42 2009 (r1870) @@ -41,7 +41,7 @@ #define EXPIRATION_DATE_FORMAT "%Y-%m-%d %H:%M:%S" /** Default port number is set statically. **/ -#define PORT 7000 +#define PAIRING_PORT 7000 #define FILE_KNOWN_RELAYS "known_relays.cfg" #define FILE_SERVER_CONFIG "relay_config.cfg" Modified: trunk/pairing/send.c ============================================================================== --- trunk/pairing/send.c Fri Nov 27 14:52:59 2009 (r1869) +++ trunk/pairing/send.c Fri Nov 27 14:56:42 2009 (r1870) @@ -387,7 +387,7 @@ // Create an IPv6 socket (*dest_addr).sin6_family = AF_INET6; - (*dest_addr).sin6_port = htons(PORT); + (*dest_addr).sin6_port = htons(PAIRING_PORT); // Translate the "IPv6" address given if ((err = inet_pton(PF_INET6, hit, &(dest_addr->sin6_addr))) <= 0) {