git.fiddlerwoaroof.com
Browse code

add generator to wiring

Greg Wiley authored on 03/05/2017 19:08:07
Showing 5 changed files
... ...
@@ -9,17 +9,13 @@ TESTS = dual_control_test validator_test conversation_test request_test user_tes
9 9
 TEST_SOURCES := $(wildcard *_test.cc)
10 10
 TESTS := $(patsubst %.cc,%.out,$(TEST_SOURCES))
11 11
 TESTRUNS := $(patsubst %.out,RUN_%,$(TESTS))
12
-FILES := $(SOURCES:.c=.x)
13
-
14
-all: $(FILES)
15
-SRCS := $(OBJS:.o=.cc) $(TEST_SOURCES)
16 12
 
17 13
 MODULELIB = pam_dual_control.so
18 14
 
19 15
 UNAME_S := $(shell uname -s)
20 16
 
21 17
 .PHONY: all
22
-all: dual_control.a .depend
18
+all: .depend dual_control.a dual_control
23 19
 
24 20
 .PHONY: version
25 21
 version:
... ...
@@ -30,6 +26,10 @@ dual_control.a: $(OBJS) $(INTEGRATION_OBJS)
30 26
 	ar rvs $@ $^
31 27
 	ranlib $@
32 28
 
29
+dual_control: dual_control_tool.cc
30
+	$(CXX) $(CXXFLAGS) $(CPPFLAGS)  -o $@ $^
31
+
32
+
33 33
 .PHONY: clean
34 34
 clean:
35 35
 	@rm -f *.o *.a
... ...
@@ -40,7 +40,7 @@ clean:
40 40
 distclean: clean
41 41
 	@git clean -xdf
42 42
 
43
-.depend: $(SRCS)
43
+.depend: $(OBJS:.o=.cc) $(TEST_SOURCES)
44 44
 	rm -f ./.depend
45 45
 	$(CXX) -MM $^ > ./.depend;
46 46
 
47 47
new file mode 100755
48 48
Binary files /dev/null and b/dual_control differ
... ...
@@ -40,8 +40,9 @@ dual_control initialize()
40 40
     unistd unistd (unistd::create());
41 41
     directory directory (directory::create (unistd, pwd));
42 42
     fstreams fstreams (fstreams::create());
43
+    tokens_ifc::token_generator token_generator = []{return "";};
43 44
     tokens tokens (tokens::create (
44
-                       fstreams));
45
+                       fstreams, token_generator));
45 46
     validator validator (validator::create (directory, tokens));
46 47
     pam pam (pam::create());
47 48
     conversation conversation (conversation::create (pam));
48 49
new file mode 100644
... ...
@@ -0,0 +1,11 @@
1
+#include <string>
2
+#include <iostream>
3
+
4
+#include "dual_control_tool.h"
5
+
6
+int main(int argc, char *argv[]) {
7
+    dual_control_tool tool;
8
+    std::string generated_token = tool.install_token();
9
+    std::cout << generated_token << std::endl;
10
+    return 0;
11
+}
0 12
new file mode 100644
... ...
@@ -0,0 +1,7 @@
1
+
2
+class dual_control_tool {
3
+    public:
4
+        std::string install_token() {
5
+            return "123456";
6
+        }
7
+};