Use dlsym(), not struct Baton.

diff --git a/Baton.hpp b/Baton.hpp
index 3ce4e621b1c6815a6787b7949d3069f97f3c97e7..cde04d23e2efe7789733f137faef28cb80344802 100644 (file)
--- a/Baton.hpp
+++ b/Baton.hpp
@@ -26,16 +26,9 @@
 struct Baton {
     void (*__pthread_set_self)(pthread_t);
 
 struct Baton {
     void (*__pthread_set_self)(pthread_t);
 

-    int (*pthread_create)(pthread_t *, const pthread_attr_t *, void *(*)(void *), void *);
-    int (*pthread_join)(pthread_t, void **);
-
-    void *(*dlopen)(const char *, int);

     char *(*dlerror)();
     void *(*dlsym)(void *, const char *);
 
     char *(*dlerror)();
     void *(*dlsym)(void *, const char *);
 

-    mach_port_t (*mach_thread_self)();
-    kern_return_t (*thread_terminate)(thread_act_t);
-

     pid_t pid;
     char library[];
 };
     pid_t pid;
     char library[];
 };

diff --git a/Mach/Inject.cpp b/Mach/Inject.cpp
index 45c33beaa26722a748f4ebe6593d28f612bc3f35..ec1f1f5a3b0984bba7e268d0034b799a5f82b5f4 100644 (file)
--- a/Mach/Inject.cpp
+++ b/Mach/Inject.cpp
@@ -48,16 +48,9 @@ void InjectLibrary(pid_t pid) {
 
     baton->__pthread_set_self = &__pthread_set_self;
 
 
     baton->__pthread_set_self = &__pthread_set_self;
 

-    baton->pthread_create = &pthread_create;
-    baton->pthread_join = &pthread_join;
-
-    baton->dlopen = &dlopen;

     baton->dlerror = &dlerror;
     baton->dlsym = &dlsym;
 
     baton->dlerror = &dlerror;
     baton->dlsym = &dlsym;
 

-    baton->mach_thread_self = &mach_thread_self;
-    baton->thread_terminate = &thread_terminate;
-

     baton->pid = getpid();
     memcpy(baton->library, library, length);
 
     baton->pid = getpid();
     memcpy(baton->library, library, length);
 

diff --git a/Trampoline.t.cpp b/Trampoline.t.cpp
index e52962afa37b224945219b8095fc2607407184bc..a0f5aef27425d908085f05258ac810dbccdad2ac 100644 (file)
--- a/Trampoline.t.cpp
+++ b/Trampoline.t.cpp
@@ -82,13 +82,13 @@ extern "C" void Start(Baton *baton) {
     dlset(baton, pthread_create, "pthread_create");
 
     pthread_t thread;
     dlset(baton, pthread_create, "pthread_create");
 
     pthread_t thread;

-    baton->pthread_create(&thread, NULL, &Routine, baton);
+    pthread_create(&thread, NULL, &Routine, baton);

 
     int (*pthread_join)(pthread_t, void **);
     dlset(baton, pthread_join, "pthread_join");
 
     void *result;
 
     int (*pthread_join)(pthread_t, void **);
     dlset(baton, pthread_join, "pthread_join");
 
     void *result;

-    baton->pthread_join(thread, &result);
+    pthread_join(thread, &result);

 
     mach_port_t (*mach_thread_self)();
     dlset(baton, mach_thread_self, "mach_thread_self");
 
     mach_port_t (*mach_thread_self)();
     dlset(baton, mach_thread_self, "mach_thread_self");


@@ -96,5 +96,5 @@ extern "C" void Start(Baton *baton) {
     kern_return_t (*thread_terminate)(thread_act_t);
     dlset(baton, thread_terminate, "thread_terminate");
 
     kern_return_t (*thread_terminate)(thread_act_t);
     dlset(baton, thread_terminate, "thread_terminate");
 

-    baton->thread_terminate(baton->mach_thread_self());
+    thread_terminate(mach_thread_self());

 }
 }