Changeset 3552
- Timestamp:
- 10/16/10 11:36:48 (13 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/module-cccam.c
r3546 r3552 1147 1147 1148 1148 if (!emm_card) { //Card for emm not found! 1149 cs_log("%s emm for client % 08lX not possible, no card found!",1149 cs_log("%s emm for client %8X not possible, no card found!", 1150 1150 getprefix(), ep->client->thread); 1151 1151 pthread_mutex_unlock(&cc->cards_busy); … … 1154 1154 1155 1155 cs_debug_mask(D_EMM, 1156 "%s emm received for client % 08lX caid %04X for card %08X",1156 "%s emm received for client %8X caid %04X for card %08X", 1157 1157 getprefix(), ep->client->thread, caid, emm_card->id); 1158 1158 -
trunk/module-monitor.c
r3542 r3552 304 304 int cnr=get_threadnum(cl); 305 305 sprintf(ltime, "%02d:%02d:%02d", lt->tm_hour, lt->tm_min, lt->tm_sec); 306 sprintf(sbuf, "[%c--CCC]% 08lX|%c|%d|%s|%d|%d|%s|%d|%s|%s|%s|%d|%04X:%04X|%s|%d|%d|%d|%d|%d|%d|%d|%d|%d|%d\n",307 id, (unsigned long) cl->thread, cl->typ, cnr, usr, cau, cl->crypted,306 sprintf(sbuf, "[%c--CCC]%8X|%c|%d|%s|%d|%d|%s|%d|%s|%s|%s|%d|%04X:%04X|%s|%d|%d|%d|%d|%d|%d|%d|%d|%d|%d\n", 307 id, (unsigned int) cl->thread, cl->typ, cnr, usr, cau, cl->crypted, 308 308 cs_inet_ntoa(cl->ip), cl->port, monitor_get_proto(cl), 309 309 ldate, ltime, lsec, cl->last_caid, cl->last_srvid, … … 338 338 } 339 339 340 static void monitor_send_details(char *txt, unsigned longtid){340 static void monitor_send_details(char *txt, unsigned int tid){ 341 341 char buf[256]; 342 snprintf(buf, 255, "[D-----]% 08lX|%s\n", tid, txt);342 snprintf(buf, 255, "[D-----]%8X|%s\n", tid, txt); 343 343 monitor_send_info(buf, 0); 344 344 } -
trunk/module-newcamd.c
r3547 r3552 511 511 512 512 // search CAID in client IDENT 513 cs_debug("client[% 08lX].%s nfilts=%d, filt.caid=%04X", pthread_self(),513 cs_debug("client[%8X].%s nfilts=%d, filt.caid=%04X", pthread_self(), 514 514 cur_client()->usr, cur_client()->ftab.nfilts, filt.caid); 515 515 -
trunk/oscam-log.c
r3537 r3552 42 42 else 43 43 if( pfinit()) 44 fprintf(stderr, "Initialisation of log file failed, continuing without logging thread % 08lX.",pthread_self());44 fprintf(stderr, "Initialisation of log file failed, continuing without logging thread %8X.", (unsigned int)pthread_self()); 45 45 } 46 46 else //I am not the first to detect a switchlog is needed, so I need to wait for the first thread to complete … … 117 117 { 118 118 if(m) 119 sprintf(txt, "% 08lX %c%04d ",(unsigned long) cur_client()->thread, cur_client()->typ, get_threadnum(cur_client()));119 sprintf(txt, "%8X %c ",(unsigned int) cur_client()->thread, cur_client()->typ); 120 120 else 121 sprintf(txt, "%-1 5.15s", "");121 sprintf(txt, "%-11.11s", ""); 122 122 } 123 123 … … 197 197 va_list params; 198 198 va_start(params, fmt); 199 vsprintf(log_txt+1 5, fmt, params);199 vsprintf(log_txt+11, fmt, params); 200 200 va_end(params); 201 201 write_to_log(-1, log_txt); … … 218 218 va_list params; 219 219 va_start(params, fmt); 220 vsprintf(log_txt+1 5, fmt, params);220 vsprintf(log_txt+11, fmt, params); 221 221 va_end(params); 222 222 write_to_log(-1, log_txt); … … 232 232 va_list params; 233 233 va_start(params, fmt); 234 vsprintf(log_txt+1 5, fmt, params);234 vsprintf(log_txt+11, fmt, params); 235 235 va_end(params); 236 236 write_to_log(-1, log_txt); … … 266 266 va_list params; 267 267 va_start(params, fmt); 268 vsprintf(log_txt+1 5, fmt, params);268 vsprintf(log_txt+11, fmt, params); 269 269 va_end(params); 270 270 write_to_log(-1, log_txt); … … 291 291 va_list params; 292 292 va_start(params, fmt); 293 vsprintf(log_txt+1 5, fmt, params);293 vsprintf(log_txt+11, fmt, params); 294 294 va_end(params); 295 295 write_to_log(-1, log_txt); … … 319 319 va_list params; 320 320 va_start(params, fmt); 321 vsprintf(log_txt+1 5, fmt, params);321 vsprintf(log_txt+11, fmt, params); 322 322 va_end(params); 323 323 write_to_log(-1, log_txt); -
trunk/oscam-reader.c
r3551 r3552 772 772 reader->client->port=reader->r_port; 773 773 strcpy(reader->client->usr, reader->r_usr); 774 cs_log("proxy thread started (thread=%9lX, server=%s)",pthread_self(), reader->device);774 cs_log("proxy thread started (thread=%8X, server=%s)",pthread_self(), reader->device); 775 775 776 776 if (!(reader->ph.c_init)) { … … 795 795 reader->client->ip=cs_inet_addr("127.0.0.1"); 796 796 if (reader->typ != R_SC8in1) { 797 cs_log("reader thread started (thread=% 9lX, device=%s, detect=%s%s, mhz=%d, cardmhz=%d)", pthread_self(),797 cs_log("reader thread started (thread=%8X, device=%s, detect=%s%s, mhz=%d, cardmhz=%d)", pthread_self(), 798 798 reader->device, reader->detect&0x80 ? "!" : "",RDR_CD_TXT[reader->detect&0x7f], reader->mhz,reader->cardmhz); 799 799 while (reader_device_init(reader)==2) … … 801 801 } 802 802 else { 803 cs_log("reader thread started (thread=% 9lX, device=%s:%i, detect=%s%s, mhz=%d, cardmhz=%d)", pthread_self(),803 cs_log("reader thread started (thread=%8X, device=%s:%i, detect=%s%s, mhz=%d, cardmhz=%d)", pthread_self(), 804 804 reader->device, reader->slot,reader->detect&0x80 ? "!" : "", RDR_CD_TXT[reader->detect&0x7f], reader->mhz,reader->cardmhz); 805 805 } -
trunk/oscam.c
r3551 r3552 381 381 382 382 if (sig==SIGALRM) { 383 cs_debug("thread % 08lX: SIGALRM, skipping", pthread_self());383 cs_debug("thread %8X: SIGALRM, skipping", pthread_self()); 384 384 return; 385 385 } … … 430 430 // this is very important - do not remove 431 431 if (cl->typ != 's') { 432 cs_log("thread % 08lX ended!", pthread_self());432 cs_log("thread %8X ended!", pthread_self()); 433 433 cleanup_thread(cl); 434 434 //Restore signals before exiting thread … … 840 840 841 841 pthread_cancel(cl->thread); 842 cs_log("thread % 08lX killed!", cl->thread);842 cs_log("thread %8X killed!", cl->thread); 843 843 cleanup_thread(cl); //FIXME what about when cancellation was not granted immediately? 844 844 return; … … 961 961 cl->dup = 1; 962 962 cl->au = -1; 963 cs_log("client(% 08lX) duplicate user '%s' from %s set to fake (uniq=%d)", cl->thread, usr, cs_inet_ntoa(ip), uniq);963 cs_log("client(%8X) duplicate user '%s' from %s set to fake (uniq=%d)", cl->thread, usr, cs_inet_ntoa(ip), uniq); 964 964 } 965 965 else … … 967 967 client->dup = 1; 968 968 client->au = -1; 969 cs_log("client(% 08lX) duplicate user '%s' from %s set to fake (uniq=%d)", pthread_self(), usr, cs_inet_ntoa(ip), uniq);969 cs_log("client(%8X) duplicate user '%s' from %s set to fake (uniq=%d)", pthread_self(), usr, cs_inet_ntoa(ip), uniq); 970 970 break; 971 971 } … … 1200 1200 } 1201 1201 1202 cs_debug("write to pipe %d (%s) thread: % 08lX to %08lX", fd, PIP_ID_TXT[id], pthread_self(), get_thread_by_pipefd(fd)->thread);1202 cs_debug("write to pipe %d (%s) thread: %8X to %8X", fd, PIP_ID_TXT[id], pthread_self(), get_thread_by_pipefd(fd)->thread); 1203 1203 1204 1204 uchar buf[3+sizeof(void*)]; … … 1255 1255 id[3]='\0'; 1256 1256 1257 cs_debug("read from pipe %d (%s) thread: % 08lX", fd, id, pthread_self());1257 cs_debug("read from pipe %d (%s) thread: %9lX", fd, id, pthread_self()); 1258 1258 1259 1259 int l; … … 2521 2521 if (cl->pid && cl->typ=='c' && ph[cl->ctyp].type & MOD_CONN_NET) { 2522 2522 kill_thread(cl); 2523 cs_log("killing client c% 08lX pid %d", cl->thread, cl->pid);2523 cs_log("killing client c%9lX pid %d", cl->thread, cl->pid); 2524 2524 } 2525 2525 }
Note:
See TracChangeset
for help on using the changeset viewer.