Skip to content
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

Jump to bottom

SSCSM execution #13046

Closed
wants to merge 103 commits into from
Closed

SSCSM execution #13046

wants to merge 103 commits into from

Commits on Jan 15, 2023

  1. SSCSM execution proof of concept

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    a895e55 View commit details
    Browse the repository at this point in the history

  2. Fix main with server

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    39c1f6e View commit details
    Browse the repository at this point in the history

  3. Send NodeDefManager to SSCSM

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    23be26c View commit details
    Browse the repository at this point in the history

  4. Clean up code

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    d039b3f View commit details
    Browse the repository at this point in the history

  5. Add SSCSM scripting

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    a808333 View commit details
    Browse the repository at this point in the history

  6. Rename "SSCSM" to "CSM" 

    In preparation for unifying client-side mods.
    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    7eeeb45 View commit details
    Browse the repository at this point in the history

  7. Add copyright headers

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    df8bd25 View commit details
    Browse the repository at this point in the history

  8. Extract mod VFS to separate class

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    3a5ccf2 View commit details
    Browse the repository at this point in the history

  9. Revert messaging addition to gamedef

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    8d34f78 View commit details
    Browse the repository at this point in the history

  10. Transfer item definitions

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    c305910 View commit details
    Browse the repository at this point in the history

  11. Add shared memory IPC 

    Only works on Linux for now.

Co-authored-by: Desour <vorunbekannt75@web.de>
    @TurkeyMcMac @Desour
    TurkeyMcMac and Desour committed Jan 15, 2023
    Copy the full SHA
    6edf650 View commit details
    Browse the repository at this point in the history

  12. Add some CSM-specific Lua API functions

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    c37a8d0 View commit details
    Browse the repository at this point in the history

  13. Improve CSM initialization

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    92dc868 View commit details
    Browse the repository at this point in the history

  14. Add CSM logging

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    d8112ec View commit details
    Browse the repository at this point in the history

  15. Load CSM builtin

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    6bff2d0 View commit details
    Browse the repository at this point in the history

  16. Properly end CSM process

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    1f94dd4 View commit details
    Browse the repository at this point in the history

  17. Relocate CSM script IPC to separate file

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    e743d9e View commit details
    Browse the repository at this point in the history

  18. Use busy waiting in IPC 

    Co-authored-by: Desour <vorunbekannt75@web.de>
    @TurkeyMcMac @Desour
    TurkeyMcMac and Desour committed Jan 15, 2023
    Copy the full SHA
    ad28783 View commit details
    Browse the repository at this point in the history

  19. Increase IPC message size 

    More tuning could be done.
    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    e10e7d5 View commit details
    Browse the repository at this point in the history

  20. Remove unnecessary signal handler

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    0802318 View commit details
    Browse the repository at this point in the history

  21. Remove unused fields

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    658484c View commit details
    Browse the repository at this point in the history

  22. Give g_csm_script_ipc its own compilation unit

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    5a4ba05 View commit details
    Browse the repository at this point in the history

  23. Improve CSM logger

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    ffb938d View commit details
    Browse the repository at this point in the history

  24. Add CSM mod loading

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    7c69f88 View commit details
    Browse the repository at this point in the history

  25. Handle IPC channel end construction exceptions

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    a472222 View commit details
    Browse the repository at this point in the history

  26. Disable CSMController copying

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    9353996 View commit details
    Browse the repository at this point in the history

  27. Simplify CSM controller initialization

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    5e26b94 View commit details
    Browse the repository at this point in the history

  28. Start logging earlier in CSM process

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    571643e View commit details
    Browse the repository at this point in the history

  29. Document IPC channels a bit

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    240a21a View commit details
    Browse the repository at this point in the history

  30. Avoid code duplication

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    fdf8157 View commit details
    Browse the repository at this point in the history

  31. Avoid unnecessary recv copying

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    db90178 View commit details
    Browse the repository at this point in the history

  32. Improve IPC channel documentation

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    236cd54 View commit details
    Browse the repository at this point in the history

  33. Add process sandbox

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    17c79be View commit details
    Browse the repository at this point in the history

  34. Allow munmap and mremap in sandbox

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    1b3331f View commit details
    Browse the repository at this point in the history

  35. Check endianness in sandbox seccomp

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    7ea7100 View commit details
    Browse the repository at this point in the history

  36. Check MAP_ANONYMOUS in sandbox

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    b98aca7 View commit details
    Browse the repository at this point in the history

  37. Allow getting the time and exiting in the sandbox

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    1bf4a99 View commit details
    Browse the repository at this point in the history

  38. Add CSM set_node etc.

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    a0ee3cc View commit details
    Browse the repository at this point in the history

  39. Partially implement some CSM callbacks

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    c568b98 View commit details
    Browse the repository at this point in the history

  40. Add CSM on_sending_message

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    163193c View commit details
    Browse the repository at this point in the history

  41. Partially add more callbacks

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    726de72 View commit details
    Browse the repository at this point in the history

  42. Separate C2S and S2C message enums

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    a11f372 View commit details
    Browse the repository at this point in the history

  43. Implement CSM receiving chat messages

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    6be759b View commit details
    Browse the repository at this point in the history

  44. Add on_hp_modification

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    9f8d6d3 View commit details
    Browse the repository at this point in the history

  45. Add mod channel stuff

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    4dbd6cf View commit details
    Browse the repository at this point in the history

  46. Fix compilation

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    ec7785b View commit details
    Browse the repository at this point in the history

  47. Add inventory opening to CSM callbacks

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    237cfba View commit details
    Browse the repository at this point in the history

  48. Implement runInventoryOpen

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    322ad07 View commit details
    Browse the repository at this point in the history

  49. Add missing checks to run functions

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    70db759 View commit details
    Browse the repository at this point in the history

  50. Implement CSM on_item_use

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    a05435e View commit details
    Browse the repository at this point in the history

  51. Add CSM on_placenode

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    884b006 View commit details
    Browse the repository at this point in the history

  52. Add CSM punchnode and dignode

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    f17651d View commit details
    Browse the repository at this point in the history

  53. Avoid some code duplication

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    53af829 View commit details
    Browse the repository at this point in the history

  54. Add CSM on_damage_taken

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    5234759 View commit details
    Browse the repository at this point in the history

  55. Add CSM on_death

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    db3e1f3 View commit details
    Browse the repository at this point in the history

  56. Remove CSM on_chatcommand for now 

    It had to be called by on_sending_message
    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    8292520 View commit details
    Browse the repository at this point in the history

  57. Avoid bool in S2C message 

    bool may cause UB if it is not 0 or 1.
    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    61b57af View commit details
    Browse the repository at this point in the history

  58. Implement CSM node metadata 

    Inventory access is not implemented.
    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    4cf754b View commit details
    Browse the repository at this point in the history

  59. Extend CSM node meta size to 32 bits 

    This matches node meta serialization elsewhere.
    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    5730cc0 View commit details
    Browse the repository at this point in the history

  60. Fix forward declarations

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    2bf353b View commit details
    Browse the repository at this point in the history

  61. Fix sandbox includes

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    968b7c5 View commit details
    Browse the repository at this point in the history

  62. Get SSCSM working on Mac and hopefully other Unix

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    c7b46aa View commit details
    Browse the repository at this point in the history

  63. Fix CSM errors

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    22ed2b9 View commit details
    Browse the repository at this point in the history

  64. Close all fds in sandbox

    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    3d5d9b0 View commit details
    Browse the repository at this point in the history

  65. Add sandbox for Mac 

    The API is deprecated, but apparently Chromium still uses it:
https://chromium.googlesource.com/chromium/src/+/master/sandbox/mac/seatbelt.cc#117

"Pure computation" seems to allow memory allocation.

sandbox.* was renamed to process_sandbox.* to avoid name conflicts.
    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    4654159 View commit details
    Browse the repository at this point in the history

  66. Remove seccomp write fd checks 

    All other fds are closed now, so the checks are unnecessary.
    @TurkeyMcMac
    TurkeyMcMac committed Jan 15, 2023
    Copy the full SHA
    01ed821 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2023

  1. Get CSM IPC working on Windows (Wine at least)

    @TurkeyMcMac
    TurkeyMcMac committed Jan 17, 2023
    Copy the full SHA
    b0c9dec View commit details
    Browse the repository at this point in the history

  2. Fix Windows exe_path size

    @TurkeyMcMac
    TurkeyMcMac committed Jan 17, 2023
    Copy the full SHA
    9987eab View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2023

  1. Fix improper post call 

    Damn that type conversion!
    @TurkeyMcMac
    TurkeyMcMac committed Jan 18, 2023
    Copy the full SHA
    d70136a View commit details
    Browse the repository at this point in the history

  2. Check ReleaseSemaphore return value

    @TurkeyMcMac
    TurkeyMcMac committed Jan 18, 2023
    Copy the full SHA
    2148c20 View commit details
    Browse the repository at this point in the history

  3. Add Windows sandbox 

    This doesn't seem to work on Wine.
    @TurkeyMcMac
    TurkeyMcMac committed Jan 18, 2023
    Copy the full SHA
    dbb311f View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2023

  1. Use fork+exec to launch CSM process 

    This is more portable (Android).
    @TurkeyMcMac
    TurkeyMcMac committed Jan 19, 2023
    Copy the full SHA
    9a4aed6 View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2023

  1. Revert "Use fork+exec to launch CSM process" 

    This reverts commit 9a4aed6.
    @TurkeyMcMac
    TurkeyMcMac committed Jan 20, 2023
    Copy the full SHA
    091fcba View commit details
    Browse the repository at this point in the history

  2. Use envp

    @TurkeyMcMac
    TurkeyMcMac committed Jan 20, 2023
    Copy the full SHA
    3d06312 View commit details
    Browse the repository at this point in the history

  3. Pass shm fd to CSM process

    @TurkeyMcMac
    TurkeyMcMac committed Jan 20, 2023
    Copy the full SHA
    4c2de09 View commit details
    Browse the repository at this point in the history

  4. Fix IPC on non-x86

    @TurkeyMcMac
    TurkeyMcMac committed Jan 20, 2023
    Copy the full SHA
    87b5e73 View commit details
    Browse the repository at this point in the history

  5. Fix IPC on non-x86 again 

    It may or may not have worked before.
    @TurkeyMcMac
    TurkeyMcMac committed Jan 20, 2023
    Copy the full SHA
    51feef3 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2023

  1. Safely print CSM logs

    @TurkeyMcMac
    TurkeyMcMac committed Jan 22, 2023
    Copy the full SHA
    4f6a213 View commit details
    Browse the repository at this point in the history

  2. Set empty environment for CSM process on Windows

    @TurkeyMcMac
    TurkeyMcMac committed Jan 22, 2023
    Copy the full SHA
    6f4746c View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2023

  1. Use better serialization

    @TurkeyMcMac
    TurkeyMcMac committed Jan 23, 2023
    Copy the full SHA
    ac21b53 View commit details
    Browse the repository at this point in the history

  2. Hopefully fix MSVC build

    @TurkeyMcMac
    TurkeyMcMac committed Jan 23, 2023
    Copy the full SHA
    e750c7f View commit details
    Browse the repository at this point in the history

  3. Avoid use of extension

    @TurkeyMcMac
    TurkeyMcMac committed Jan 23, 2023
    Copy the full SHA
    fc30dd1 View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2023

  1. Fix tuple serialization

    @TurkeyMcMac
    TurkeyMcMac committed Jan 24, 2023
    Copy the full SHA
    603474c View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2023

  1. Avoid unnecessary memory copying

    @TurkeyMcMac
    TurkeyMcMac committed Jan 25, 2023
    Copy the full SHA
    67736b6 View commit details
    Browse the repository at this point in the history

  2. Speed up string serialization

    @TurkeyMcMac
    TurkeyMcMac committed Jan 25, 2023
    Copy the full SHA
    26ebdfd View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2023

  1. Fix CSM metadata messages

    @TurkeyMcMac
    TurkeyMcMac committed Jan 28, 2023
    Copy the full SHA
    fdb4d03 View commit details
    Browse the repository at this point in the history

  2. Get SSCSM mostly working on Android 

    Log timestamps aren't working.
    @TurkeyMcMac
    TurkeyMcMac committed Jan 28, 2023
    Copy the full SHA
    21c2496 View commit details
    Browse the repository at this point in the history

  3. Install linux headers in dockerfile

    @TurkeyMcMac
    TurkeyMcMac committed Jan 28, 2023
    Copy the full SHA
    6ae5852 View commit details
    Browse the repository at this point in the history

  4. Update README instructions 

    Hopefully I got everything correct.
    @TurkeyMcMac
    TurkeyMcMac committed Jan 28, 2023
    Copy the full SHA
    3ec9f5f View commit details
    Browse the repository at this point in the history

  5. Allow setting of debug.getinfo

    @TurkeyMcMac
    TurkeyMcMac committed Jan 28, 2023
    Copy the full SHA
    906e515 View commit details
    Browse the repository at this point in the history

  6. Fix __linux__ being written as __linux

    @TurkeyMcMac
    TurkeyMcMac committed Jan 28, 2023
    Copy the full SHA
    106e4fb View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2023

  1. Expand android self exec receive buffer

    @TurkeyMcMac
    TurkeyMcMac committed Jan 29, 2023
    Copy the full SHA
    cbae673 View commit details
    Browse the repository at this point in the history

  2. Try to fix GCC 5 build

    @TurkeyMcMac
    TurkeyMcMac committed Jan 29, 2023
    Copy the full SHA
    6f1fc1a View commit details
    Browse the repository at this point in the history

  3. Add self exec mutex

    @TurkeyMcMac
    TurkeyMcMac committed Jan 29, 2023
    Copy the full SHA
    10b8070 View commit details
    Browse the repository at this point in the history

  4. Allow more time functions in sandbox

    @TurkeyMcMac
    TurkeyMcMac committed Jan 29, 2023
    Copy the full SHA
    90c20c8 View commit details
    Browse the repository at this point in the history

  5. Set timezone in CSM process

    @TurkeyMcMac
    TurkeyMcMac committed Jan 29, 2023
    Copy the full SHA
    494641e View commit details
    Browse the repository at this point in the history

  6. Clear android self exec environment 

    This matches how posix_spawn is used.
    @TurkeyMcMac
    TurkeyMcMac committed Jan 29, 2023
    Copy the full SHA
    740cb40 View commit details
    Browse the repository at this point in the history

  7. Make extra time syscall checks conditional

    @TurkeyMcMac
    TurkeyMcMac committed Jan 29, 2023
    Copy the full SHA
    e8f0c2e View commit details
    Browse the repository at this point in the history

  8. Add include

    @TurkeyMcMac
    TurkeyMcMac committed Jan 29, 2023
    Copy the full SHA
    02f194a View commit details
    Browse the repository at this point in the history

  9. Add IPC test

    @TurkeyMcMac
    TurkeyMcMac committed Jan 29, 2023
    Copy the full SHA
    ff496fe View commit details
    Browse the repository at this point in the history

  10. Add struct serialize tests

    @TurkeyMcMac
    TurkeyMcMac committed Jan 29, 2023
    Copy the full SHA
    dc2df0b View commit details
    Browse the repository at this point in the history

  11. Limit CSM run time

    @TurkeyMcMac
    TurkeyMcMac committed Jan 29, 2023
    Copy the full SHA
    28926e8 View commit details
    Browse the repository at this point in the history

  12. Simplify code

    @TurkeyMcMac
    TurkeyMcMac committed Jan 29, 2023
    Copy the full SHA
    895b954 View commit details
    Browse the repository at this point in the history