diff options
author | Dirk Engling <erdgeist@erdgeist.org> | 2024-04-16 16:18:53 +0200 |
---|---|---|
committer | Dirk Engling <erdgeist@erdgeist.org> | 2024-04-16 16:18:53 +0200 |
commit | d3985b00b5fb272f6d8bb8ba8ac50b493c40082d (patch) | |
tree | b09a5512b32c55e0f35d9411a214957527171155 /ot_stats.c | |
parent | 8fd8a54c4ee34e5d879227f261f881f13002f789 (diff) |
Remove CVS version tags, they did not work anymore after moving to git
Diffstat (limited to 'ot_stats.c')
-rw-r--r-- | ot_stats.c | 24 |
1 files changed, 8 insertions, 16 deletions
@@ -476,9 +476,9 @@ static void stats_return_fulllog(int *iovec_entries, struct iovec **iovector, ch | |||
476 | return; | 476 | return; |
477 | re = r + 32 * OT_STATS_TMPSIZE; | 477 | re = r + 32 * OT_STATS_TMPSIZE; |
478 | } | 478 | } |
479 | r += sprintf(r, "%08ld: ", loglist->time); | 479 | r += sprintf(r, "%08ld: ", loglist->time); |
480 | r += fmt_ip6c(r, loglist->ip); | 480 | r += fmt_ip6c(r, loglist->ip); |
481 | *r++ = '\n'; | 481 | *r++ = '\n'; |
482 | memcpy(r, loglist->data, loglist->size); | 482 | memcpy(r, loglist->data, loglist->size); |
483 | r += loglist->size; | 483 | r += loglist->size; |
484 | *r++ = '\n'; | 484 | *r++ = '\n'; |
@@ -518,10 +518,8 @@ static size_t stats_return_everything(char *reply) { | |||
518 | r += sprintf(r, " <completed>\n <count>%llu</count>\n </completed>\n", ot_overall_completed); | 518 | r += sprintf(r, " <completed>\n <count>%llu</count>\n </completed>\n", ot_overall_completed); |
519 | r += sprintf(r, " <connections>\n"); | 519 | r += sprintf(r, " <connections>\n"); |
520 | r += sprintf(r, " <tcp>\n <accept>%llu</accept>\n <announce>%llu</announce>\n <scrape>%llu</scrape>\n </tcp>\n", | 520 | r += sprintf(r, " <tcp>\n <accept>%llu</accept>\n <announce>%llu</announce>\n <scrape>%llu</scrape>\n </tcp>\n", |
521 | ot_overall_tcp_connections, ot_overall_tcp_successfulannounces, ot_overall_tcp_successfulscrapes); | 521 | ot_overall_tcp_connections, ot_overall_tcp_successfulannounces, ot_overall_tcp_successfulscrapes); |
522 | r += sprintf( | 522 | r += sprintf(r, " <udp>\n <overall>%llu</overall>\n <connect>%llu</connect>\n <announce>%llu</announce>\n <scrape>%llu</scrape>\n <missmatch>%llu</missmatch>\n </udp>\n", |
523 | r, | ||
524 | " <udp>\n <overall>%llu</overall>\n <connect>%llu</connect>\n <announce>%llu</announce>\n <scrape>%llu</scrape>\n <missmatch>%llu</missmatch>\n </udp>\n", | ||
525 | ot_overall_udp_connections, ot_overall_udp_connects, ot_overall_udp_successfulannounces, ot_overall_udp_successfulscrapes, | 523 | ot_overall_udp_connections, ot_overall_udp_connects, ot_overall_udp_successfulannounces, ot_overall_udp_successfulscrapes, |
526 | ot_overall_udp_connectionidmissmatches); | 524 | ot_overall_udp_connectionidmissmatches); |
527 | r += sprintf(r, " <livesync>\n <count>%llu</count>\n </livesync>\n", ot_overall_sync_count); | 525 | r += sprintf(r, " <livesync>\n <count>%llu</count>\n </livesync>\n", ot_overall_sync_count); |
@@ -541,14 +539,10 @@ static size_t stats_return_everything(char *reply) { | |||
541 | return r - reply; | 539 | return r - reply; |
542 | } | 540 | } |
543 | 541 | ||
544 | extern const char *g_version_opentracker_c, *g_version_accesslist_c, *g_version_clean_c, *g_version_fullscrape_c, *g_version_http_c, *g_version_iovec_c, | ||
545 | *g_version_mutex_c, *g_version_stats_c, *g_version_udp_c, *g_version_vector_c, *g_version_scan_urlencoded_query_c, *g_version_trackerlogic_c, | ||
546 | *g_version_livesync_c, *g_version_rijndael_c; | ||
547 | |||
548 | size_t stats_return_tracker_version(char *reply) { | 542 | size_t stats_return_tracker_version(char *reply) { |
549 | return sprintf(reply, "%s%s%s%s%s%s%s%s%s%s%s%s%s%s", g_version_opentracker_c, g_version_accesslist_c, g_version_clean_c, g_version_fullscrape_c, | 543 | #define QUOTE(name) #name |
550 | g_version_http_c, g_version_iovec_c, g_version_mutex_c, g_version_stats_c, g_version_udp_c, g_version_vector_c, | 544 | #define SQUOTE(name) QUOTE(name) |
551 | g_version_scan_urlencoded_query_c, g_version_trackerlogic_c, g_version_livesync_c, g_version_rijndael_c); | 545 | return sprintf(reply, "https://erdgeist.org/gitweb/opentracker/commit/?id=" SQUOTE(GIT_VERSION) "\n"); |
552 | } | 546 | } |
553 | 547 | ||
554 | size_t return_stats_for_tracker(char *reply, int mode, int format) { | 548 | size_t return_stats_for_tracker(char *reply, int mode, int format) { |
@@ -775,5 +769,3 @@ void stats_init() { | |||
775 | void stats_deinit() { | 769 | void stats_deinit() { |
776 | pthread_cancel(thread_id); | 770 | pthread_cancel(thread_id); |
777 | } | 771 | } |
778 | |||
779 | const char *g_version_stats_c = "$Source$: $Revision$\n"; | ||