Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFS Gluon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
firmware
FFS Gluon
Commits
f2783bdf
Unverified
Commit
f2783bdf
authored
4 years ago
by
David Bauer
Committed by
GitHub
4 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #2174 from freifunk-gluon/respondd-fixes
gluon-respondd: fix crash on 64bit archs (+ one unrelated issue)
parents
fd3ecea9
17123aa4
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
package/gluon-respondd/src/respondd-statistics.c
+1
-1
1 addition, 1 deletion
package/gluon-respondd/src/respondd-statistics.c
package/libgluonutil/src/libgluonutil.h
+1
-0
1 addition, 0 deletions
package/libgluonutil/src/libgluonutil.h
with
2 additions
and
1 deletion
package/gluon-respondd/src/respondd-statistics.c
+
1
−
1
View file @
f2783bdf
...
@@ -239,7 +239,7 @@ static void count_iface_stations(size_t *wifi24, size_t *wifi5, const char *ifna
...
@@ -239,7 +239,7 @@ static void count_iface_stations(size_t *wifi24, size_t *wifi5, const char *ifna
}
}
}
}
static
void
count_stations
(
size_t
*
wifi24
,
size_t
*
wifi5
,
size_t
*
owe24
,
size_t
owe5
)
{
static
void
count_stations
(
size_t
*
wifi24
,
size_t
*
wifi5
,
size_t
*
owe24
,
size_t
*
owe5
)
{
struct
uci_context
*
ctx
=
uci_alloc_context
();
struct
uci_context
*
ctx
=
uci_alloc_context
();
if
(
!
ctx
)
if
(
!
ctx
)
return
;
return
;
...
...
This diff is collapsed.
Click to expand it.
package/libgluonutil/src/libgluonutil.h
+
1
−
0
View file @
f2783bdf
...
@@ -54,6 +54,7 @@ struct json_object * gluonutil_wrap_and_free_string(char *str);
...
@@ -54,6 +54,7 @@ struct json_object * gluonutil_wrap_and_free_string(char *str);
bool
gluonutil_has_domains
(
void
);
bool
gluonutil_has_domains
(
void
);
char
*
gluonutil_get_domain
(
void
);
char
*
gluonutil_get_domain
(
void
);
char
*
gluonutil_get_primary_domain
(
void
);
struct
json_object
*
gluonutil_load_site_config
(
void
);
struct
json_object
*
gluonutil_load_site_config
(
void
);
#endif
/* _LIBGLUON_LIBGLUON_H_ */
#endif
/* _LIBGLUON_LIBGLUON_H_ */
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment