1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
|
--- a/dhis-dns-engine.c
+++ b/dhis-dns-engine.c
@@ -63,7 +63,7 @@
# endif
# endif
#else
-# if !defined BIND821
+# if !defined BIND821 && 0
# include<res_update.h>
# endif
#endif
@@ -71,8 +71,8 @@
#define DYN_TTL 60
#define OFFLINE_IP "192.168.255.0"
-#define DHISD_DB "/etc/dhis/db/dhis.db"
-#define DHISE_LOG "/etc/dhis/log/dhis-dns-engine.log"
+#define DHISD_DB "/etc/dhis-server/dhis.db"
+#define DHISE_LOG "/var/log/dhis-dns-engine.log"
#define MAX_HOSTNAME 64
#define MAX_PASS 16
@@ -80,7 +80,7 @@
typedef struct db_t {
int id;
- unsigned char fqdn[MAX_HOSTNAME];
+ char fqdn[MAX_HOSTNAME];
struct db_t *next;
} db_t;
@@ -89,25 +89,25 @@
int db_reload(void);
int db_free(void);
int db_add(db_t *);
-unsigned char *db_hostname(int);
-void strtolower(unsigned char *);
-void off_nl(unsigned char *);
-unsigned char *line_entry(int,unsigned char *);
-int msg_log(unsigned char *);
-int dns_update(unsigned char *,int,short int,unsigned int,int,unsigned char *);
-int mark_online(unsigned char *,unsigned char *);
-int mark_offline(unsigned char *);
+char *db_hostname(int);
+void strtolower(char *);
+void off_nl(char *);
+char *line_entry(int,char *);
+int msg_log(char *);
+int dns_update(char *,int,short int,unsigned int,int,char *);
+int mark_online(char *,char *);
+int mark_offline(char *);
/* Global variables */
db_t *dbase=NULL;
/* Log function */
-int msg_log(unsigned char *msg) {
+int msg_log(char *msg) {
FILE *fp;
time_t tt;
- unsigned char buff[256];
+ char buff[256];
fp=fopen(DHISE_LOG,"a");
while(fp==NULL) { sleep(1); fp=fopen(DHISE_LOG,"a"); }
@@ -123,17 +123,17 @@
}
/* Misc functions */
-void strtolower(unsigned char *s) { while(*s!='\0') { *s=tolower(*s); s++; } }
-void off_nl(unsigned char *s) {
+void strtolower(char *s) { while(*s!='\0') { *s=tolower(*s); s++; } }
+void off_nl(char *s) {
while(*s!='\0' && *s!='\n' && *s!='\r') s++;
*s='\0';
return;
}
-unsigned char *line_entry(int idx,unsigned char *buff) {
+char *line_entry(int idx,char *buff) {
- static unsigned char b2[1024],*pb2;
+ static char b2[1024],*pb2;
int i;
idx--;
@@ -164,7 +164,7 @@
int db_reload(void) {
FILE *fp;
- unsigned char str[1024];
+ char str[1024];
db_t *rec;
if(dbase!=NULL) db_free();
@@ -177,7 +177,7 @@
if(strchr(line_entry(1,str),';')==NULL)
if(!strcmp(line_entry(2,str),"{")) {
- unsigned char keyword[256];
+ char keyword[256];
char *cp;
rec=(db_t *)malloc(sizeof(db_t));
@@ -224,10 +224,10 @@
return(1);
}
-unsigned char *db_hostname(int id) {
+char *db_hostname(int id) {
db_t *p1;
- static unsigned char host[MAX_HOSTNAME];
+ static char host[MAX_HOSTNAME];
static int lastid=0;
if(lastid==id) return(host);
@@ -264,9 +264,9 @@
-int mark_online(unsigned char *host,unsigned char *addr) {
+int mark_online(char *host,char *addr) {
- unsigned char str[128];
+ char str[128];
if(host==NULL) return(0);
if(host[0]=='\0') return(0);
@@ -279,9 +279,9 @@
return(0);
}
-int mark_offline(unsigned char *host) {
+int mark_offline(char *host) {
- unsigned char str[128],str2[16];
+ char str[128],str2[16];
if(host==NULL) return(0);
if(host[0]=='\0') return(0);
@@ -296,7 +296,7 @@
int main() {
- unsigned char line[1024];
+ char line[1024];
db_reload();
sprintf(line,"DHIS DNS Engine Starting");
@@ -314,8 +314,8 @@
}
if(!strcmp(line_entry(1,line),"add")) {
int id;
- unsigned char addr[128];
- unsigned char logstr[128];
+ char addr[128];
+ char logstr[128];
id=atoi(line_entry(3,line));
strcpy(addr,line_entry(4,line));
mark_online(db_hostname(id),addr);
@@ -326,8 +326,8 @@
}
if(!strcmp(line_entry(1,line),"update")) {
int id;
- unsigned char addr[128];
- unsigned char logstr[128];
+ char addr[128];
+ char logstr[128];
id=atoi(line_entry(3,line));
strcpy(addr,line_entry(4,line));
mark_offline(db_hostname(id));
@@ -339,8 +339,8 @@
}
if(!strcmp(line_entry(1,line),"delete")) {
int id;
- unsigned char addr[128];
- unsigned char logstr[128];
+ char addr[128];
+ char logstr[128];
id=atoi(line_entry(3,line));
strcpy(addr,line_entry(4,line));
mark_offline(db_hostname(id));
--- a/nsupdate.c
+++ b/nsupdate.c
@@ -41,10 +41,10 @@
#define NSUPDATE_CMD "/usr/bin/nsupdate"
-int dns_update(unsigned char *r_dname,int r_opcode,short int r_type,
- unsigned int r_ttl,int r_size,unsigned char *r_data) {
+int dns_update(char *r_dname,int r_opcode,short int r_type,
+ unsigned int r_ttl,int r_size,char *r_data) {
- unsigned char str[1024];
+ char str[1024];
if(r_opcode==ADD)
|
