Changeset 5348
- Timestamp:
- 06/03/11 00:56:35 (13 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/module-gbox.c
r5304 r5348 896 896 memset((char *)&cli->udp_sa, 0, sizeof(cli->udp_sa)); 897 897 898 struct hostent *hp; 899 hp = gethostbyname(rdr->device); 900 memcpy((char *)&cli->udp_sa.sin_addr, (char *)hp->h_addr, hp->h_length); 898 if (!hostResolve(rdr)) 899 return 1; 901 900 902 901 cli->udp_sa.sin_family=AF_INET; -
trunk/oscam-reader.c
r5340 r5348 111 111 if(!cl) return 0; 112 112 113 while (cs_trylock(&gethostbyname_lock)) {114 cs_debug_mask(D_TRACE, "trylock hostResolve wait");115 cs_sleepms(50);116 }117 118 113 in_addr_t last_ip = cl->ip; 119 114 120 115 if (cfg.resolve_gethostbyname) { //Resolve with gethostbyname: 116 117 while (cs_trylock(&gethostbyname_lock)) { 118 cs_debug_mask(D_TRACE, "trylock hostResolve wait"); 119 cs_sleepms(50); 120 } 121 121 122 struct hostent *rht = gethostbyname(rdr->device); 122 123 if (!rht) { … … 128 129 result = 1; 129 130 } 131 132 pthread_mutex_unlock(&gethostbyname_lock); 130 133 } 131 134 else { //Resolve with getaddrinfo: … … 154 157 cs_log("%s: resolved ip=%s", rdr->device, cs_inet_ntoa(cl->ip)); 155 158 } 156 157 pthread_mutex_unlock(&gethostbyname_lock);158 159 159 160 return result; -
trunk/oscam.c
r5343 r5348 1132 1132 if (account->dyndns[0]) 1133 1133 { 1134 cs_lock(&gethostbyname_lock);1135 1134 in_addr_t lastip = account->dynip; 1136 1135 //Resolve with gethostbyname: 1137 1136 if (cfg.resolve_gethostbyname) { 1137 cs_lock(&gethostbyname_lock); 1138 1138 rht = gethostbyname((char*)account->dyndns); 1139 1139 if (!rht) … … 1144 1144 result=1; 1145 1145 } 1146 cs_unlock(&gethostbyname_lock); 1146 1147 } 1147 1148 else { //Resolve with getaddrinfo: … … 1165 1166 cs_log("%s: resolved ip=%s", (char*)account->dyndns, cs_inet_ntoa(account->dynip)); 1166 1167 } 1167 cs_unlock(&gethostbyname_lock);1168 1168 } 1169 1169 if (!result)
Note:
See TracChangeset
for help on using the changeset viewer.