ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/gvpe/src/util.C
(Generate patch)

Comparing gvpe/src/util.C (file contents):
Revision 1.8 by pcg, Tue Oct 14 15:48:15 2003 UTC vs.
Revision 1.13 by pcg, Fri Apr 2 14:42:45 2004 UTC

1/* 1/*
2 util.C -- process management and other utility functions 2 util.C -- process management and other utility functions
3 Copyright (C) 2003 Marc Lehmann <pcg@goof.com>
3 4
4 Some of these are taken from tinc, see the AUTHORS file. 5 Some of these are taken from tinc, see the AUTHORS file.
5 6
6 This program is free software; you can redistribute it and/or modify 7 This program is free software; you can redistribute it and/or modify
7 it under the terms of the GNU General Public License as published by 8 it under the terms of the GNU General Public License as published by
… …
19*/ 20*/
20 21
21#include "config.h" 22#include "config.h"
22 23
23#include <cstdio> 24#include <cstdio>
25#include <cstdlib>
24#include <cstring> 26#include <cstring>
25 27
26#include <errno.h> 28#include <errno.h>
27#include <signal.h> 29#include <signal.h>
28#include <sys/types.h> 30#include <sys/types.h>
29#include <sys/wait.h> 31#include <sys/wait.h>
30#include <unistd.h> 32#include <unistd.h>
31#include <time.h> 33#include <time.h>
32 34
33#include <sys/mman.h>
34
35#include "netcompat.h" 35#include "netcompat.h"
36 36
37#include "gettext.h" 37#include "gettext.h"
38#include "pidfile.h" 38#include "pidfile.h"
39#include "dropin.h" 39#include "dropin.h"
… …
46int 46int
47write_pidfile (void) 47write_pidfile (void)
48{ 48{
49 int pid; 49 int pid;
50 50
51 pid = check_pid (pidfilename); 51 pid = check_pid (conf.pidfilename);
52 52
53 if (pid) 53 if (pid)
54 { 54 {
55 fprintf (stderr, _("A vped is already running with pid %d.\n"), pid); 55 fprintf (stderr, _("A vped is already running with pid %d.\n"), pid);
56 return 1; 56 return 1;
57 } 57 }
58 58
59 /* if it's locked, write-protected, or whatever */ 59 /* if it's locked, write-protected, or whatever */
60 if (!write_pid (pidfilename)) 60 if (!write_pid (conf.pidfilename))
61 return 1; 61 return 1;
62 62
63 return 0; 63 return 0;
64} 64}
65 65
66int 66int
67kill_other (int signal) 67kill_other (int signal)
68{ 68{
69 int pid; 69 int pid;
70 70
71 pid = read_pid (pidfilename); 71 pid = read_pid (conf.pidfilename);
72 72
73 if (!pid) 73 if (!pid)
74 { 74 {
75 fprintf (stderr, _("No other vped is running.\n")); 75 fprintf (stderr, _("No other vped is running.\n"));
76 return 1; 76 return 1;
… …
82 if (kill (pid, signal) && errno == ESRCH) 82 if (kill (pid, signal) && errno == ESRCH)
83 { 83 {
84 fprintf (stderr, _("The vped is no longer running. ")); 84 fprintf (stderr, _("The vped is no longer running. "));
85 85
86 fprintf (stderr, _("Removing stale lock file.\n")); 86 fprintf (stderr, _("Removing stale lock file.\n"));
87 remove_pid (pidfilename); 87 remove_pid (conf.pidfilename);
88 } 88 }
89 89
90 return 0; 90 return 0;
91} 91}
92 92
… …
112 return -1; 112 return -1;
113 } 113 }
114 114
115 /* Now UPDATE the pid in the pidfile, because we changed it... */ 115 /* Now UPDATE the pid in the pidfile, because we changed it... */
116 116
117 if (!write_pid (pidfilename)) 117 if (!write_pid (conf.pidfilename))
118 return -1; 118 return -1;
119 119
120 log_to (LOGTO_SYSLOG); 120 log_to (LOGTO_SYSLOG);
121 } 121 }
122 else 122 else
… …
128} 128}
129 129
130void 130void
131make_names (void) 131make_names (void)
132{ 132{
133 if (!pidfilename) 133 if (!conf.pidfilename)
134 pidfilename = LOCALSTATEDIR "/run/vped.pid"; 134 conf.pidfilename = strdup (LOCALSTATEDIR "/run/vped.pid");
135 135
136 if (!confbase) 136 if (!confbase)
137 asprintf (&confbase, "%s/vpe", CONFDIR); 137 asprintf (&confbase, "%s/vpe", CONFDIR);
138} 138}
139 139
… …
144 if ((pid = fork ()) == 0) 144 if ((pid = fork ()) == 0)
145 { 145 {
146 char *filename; 146 char *filename;
147 asprintf (&filename, "%s/%s", confbase, cb()); 147 asprintf (&filename, "%s/%s", confbase, cb());
148 execl (filename, filename, (char *) 0); 148 execl (filename, filename, (char *) 0);
149 exit (255); 149 exit (126);
150 } 150 }
151 else if (pid > 0) 151 else if (pid > 0)
152 { 152 {
153 if (wait) 153 if (wait)
154 { 154 {
… …
204 204
205 return res; 205 return res;
206} 206}
207#endif 207#endif
208 208
209void
210id2mac (unsigned int id, void *m)
211{
212 mac &p = *(mac *)m;
213
214 if (id)
215 {
216 p[0] = 0xfe;
217 p[1] = 0xfd;
218 p[2] = 0x80;
219 p[3] = 0x00;
220 p[4] = id >> 8;
221 p[5] = id;
222 }
223 else
224 {
225 p[0] = 0xff;
226 p[1] = 0xff;
227 p[2] = 0xff;
228 p[3] = 0xff;
229 p[4] = 0xff;
230 p[5] = 0xff;
231 }
232}
233

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines