Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

bandwidthd: fix time_t problem

Browse source 
Fixes issu #19510 with the change in time_t with musl 1.2

Signed-off-by: Jean-Michel Lacroix <lacroix@lepine-lacroix.info>
This commit is contained in:
Jean-Michel Lacroix 2022-10-25 15:23:09 -04:00 committed by Rosen Penev
parent 15d7c57112
commit 61d1a86ec3
2 changed files with 78 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
utils/bandwidthd/Makefile
View file

@ -1,5 +1,5 @@
# #
# Copyright (C) 2006-2017 OpenWrt.org # Copyright (C) 2006-2020 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=bandwidthd PKG_NAME:=bandwidthd
PKG_VERSION:=2.0.1-35 PKG_VERSION:=2.0.1-35
PKG_RELEASE:=6 PKG_RELEASE:=7
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/NethServer/bandwidthd/tar.gz/$(PKG_VERSION)? PKG_SOURCE_URL:=https://codeload.github.com/NethServer/bandwidthd/tar.gz/$(PKG_VERSION)?

76
utils/bandwidthd/patches/040-64bit-time-t.patch
View file

@ -1,5 +1,14 @@
--- a/bandwidthd.c --- a/bandwidthd.c
+++ b/bandwidthd.c +++ b/bandwidthd.c
@@ -103,7 +103,7 @@ void bd_CollectingData(char *filename)
}
}
-int WriteOutWebpages(long int timestamp)
+int WriteOutWebpages(time_t timestamp)
{
struct IPDataStore *DataStore = IPDataStore;
struct SummaryData **SummaryData;
@@ -893,7 +893,7 @@ void StoreIPDataInCDF(struct IPData IncD @@ -893,7 +893,7 @@ void StoreIPDataInCDF(struct IPData IncD
{ {
IPData = &IncData[counter]; IPData = &IncData[counter];
@ -36,3 +45,70 @@
goto End_RecoverDataFromCdf; goto End_RecoverDataFromCdf;
if (!timestamp) // First run through loop if (!timestamp) // First run through loop
--- a/graph.c
+++ b/graph.c
@@ -767,8 +767,8 @@ void PrepareXAxis(gdImagePtr im, time_t
int black, red;
time_t sample_begin, sample_end;
struct tm *timestruct;
- long int MarkTime;
- long int MarkTimeStep;
+ time_t MarkTime;
+ time_t MarkTimeStep;
double x;
sample_begin=timestamp-config.range;
@@ -786,7 +786,7 @@ void PrepareXAxis(gdImagePtr im, time_t
if ((24*60*60*(XWIDTH-XOFFSET))/config.range > (XWIDTH-XOFFSET)/10)
{
// Day bars
- timestruct = localtime((time_t *)&sample_begin);
+ timestruct = localtime(&sample_begin);
timestruct->tm_sec = 0;
timestruct->tm_min = 0;
timestruct->tm_hour = 0;
@@ -805,7 +805,7 @@ void PrepareXAxis(gdImagePtr im, time_t
gdImageLine(im, x, 0, x, YHEIGHT-YOFFSET, red);
gdImageLine(im, x+1, 0, x+1, YHEIGHT-YOFFSET, red);
- timestruct = localtime((time_t *)&MarkTime);
+ timestruct = localtime(&MarkTime);
strftime(buffer, 100, "%a, %b %d", timestruct);
gdImageString(im, gdFontSmall, x-30, YHEIGHT-YOFFSET+10, buffer, black);
@@ -817,7 +817,7 @@ void PrepareXAxis(gdImagePtr im, time_t
else
{
// Month Bars
- timestruct = localtime((time_t *)&sample_begin);
+ timestruct = localtime(&sample_begin);
timestruct->tm_sec = 0;
timestruct->tm_min = 0;
timestruct->tm_hour = 0;
@@ -839,7 +839,7 @@ void PrepareXAxis(gdImagePtr im, time_t
gdImageLine(im, x, 0, x, YHEIGHT-YOFFSET, red);
gdImageLine(im, x+1, 0, x+1, YHEIGHT-YOFFSET, red);
- timestruct = localtime((time_t *)&MarkTime);
+ timestruct = localtime(&MarkTime);
strftime(buffer, 100, "%b", timestruct);
gdImageString(im, gdFontSmall, x-6, YHEIGHT-YOFFSET+10, buffer, black);
@@ -854,7 +854,7 @@ void PrepareXAxis(gdImagePtr im, time_t
// **** Write the tic marks
// ********************************************************************
- timestruct = localtime((time_t *)&sample_begin);
+ timestruct = localtime(&sample_begin);
timestruct->tm_sec = 0;
timestruct->tm_min = 0;
timestruct->tm_hour = 0;
@@ -884,7 +884,7 @@ void PrepareXAxis(gdImagePtr im, time_t
x = (MarkTime-sample_begin)*((XWIDTH-XOFFSET)/config.range) + XOFFSET;
}
- timestruct = localtime((time_t *)&sample_begin);
+ timestruct = localtime(&sample_begin);
timestruct->tm_sec = 0;
timestruct->tm_min = 0;
timestruct->tm_hour = 0;