Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Allow socket code to work after appdomain reload. #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Tak wants to merge 1 commit into from
Closed

Allow socket code to work after appdomain reload. #13

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 22 additions & 24 deletions mono/metadata/socket-io.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,35 +660,33 @@ static MonoImage *get_socket_assembly (void)
{
static const char *version = NULL;
static gboolean moonlight;
static MonoImage *socket_assembly = NULL;
MonoImage *socket_assembly = NULL;

if (version == NULL) {
version = mono_get_runtime_info ()->framework_version;
moonlight = !strcmp (version, "2.1");
}

if (socket_assembly == NULL) {
if (moonlight) {
socket_assembly = mono_image_loaded ("System.Net");
if (!socket_assembly) {
MonoAssembly *sa = mono_assembly_open ("System.Net.dll", NULL);

if (!sa) {
g_assert_not_reached ();
} else {
socket_assembly = mono_assembly_get_image (sa);
}
if (moonlight) {
socket_assembly = mono_image_loaded ("System.Net");
if (!socket_assembly) {
MonoAssembly *sa = mono_assembly_open ("System.Net.dll", NULL);

if (!sa) {
g_assert_not_reached ();
} else {
socket_assembly = mono_assembly_get_image (sa);
}
} else {
socket_assembly = mono_image_loaded ("System");
if (!socket_assembly) {
MonoAssembly *sa = mono_assembly_open ("System.dll", NULL);

if (!sa) {
g_assert_not_reached ();
} else {
socket_assembly = mono_assembly_get_image (sa);
}
}
} else {
socket_assembly = mono_image_loaded ("System");
if (!socket_assembly) {
MonoAssembly *sa = mono_assembly_open ("System.dll", NULL);

if (!sa) {
g_assert_not_reached ();
} else {
socket_assembly = mono_assembly_get_image (sa);
}
}
}
Expand Down Expand Up @@ -909,11 +907,11 @@ static MonoObject *create_object_from_sockaddr(struct sockaddr *saddr,
MonoAddressFamily family;

/* Build a System.Net.SocketAddress object instance */
sockaddr_class=mono_class_from_name_cached (get_socket_assembly (), "System.Net", "SocketAddress");
sockaddr_class=mono_class_from_name (get_socket_assembly (), "System.Net", "SocketAddress");
sockaddr_obj=mono_object_new(domain, sockaddr_class);

/* Locate the SocketAddress data buffer in the object */
field=mono_class_get_field_from_name_cached (sockaddr_class, "data");
field=mono_class_get_field_from_name (sockaddr_class, "data");

/* Make sure there is space for the family and size bytes */
#ifdef HAVE_SYS_UN_H
Expand Down